Fix the Openflowplugin{Meter,Group}TestServiceProviders

Change-Id: I672fd9df6983bac97cb711d13ec2683903824548
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.xtend b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.xtend
index 6904baca39b7114cc2ae81625266cd36318add84..93f56a32bbafa9063dc97f605bf44e87aff4ecbe 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.xtend
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.xtend
@@ -30,7 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.Add
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.RemoveGroupInput
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupInput
 
-class OpenflowpluginTestServiceProvider implements AutoCloseable, SalGroupService {
+class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, SalGroupService {
 
 
     static val LOG = LoggerFactory.getLogger(OpenflowpluginTestServiceProvider);
@@ -74,9 +74,9 @@ class OpenflowpluginTestServiceProvider implements AutoCloseable, SalGroupServic
     }
     
     
-    def CompositeObjectRegistration<OpenflowpluginTestServiceProvider> register(ProviderContext ctx) {
+    def CompositeObjectRegistration<OpenflowpluginGroupTestServiceProvider> register(ProviderContext ctx) {
         val builder = CompositeObjectRegistration
-                .<OpenflowpluginTestServiceProvider> builderFor(this);
+                .<OpenflowpluginGroupTestServiceProvider> builderFor(this);
 
         groupRegistration = ctx.addRoutedRpcImplementation(SalGroupService, this);
         val nodeIndentifier = InstanceIdentifier.builder(Nodes).child(Node, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)));

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.xtend b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.xtend
index 95b5be3966f10c5d4ed518080e3f9cf1038fe2ec..4ca1daf7c24aed7da64042fb12c6c25de8bd98e4 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.xtend
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.xtend
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.concepts.CompositeObjectRegistration
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier
 import org.slf4j.LoggerFactory
 
-class OpenflowpluginTestServiceProvider implements AutoCloseable, SalMeterService {
+class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, SalMeterService {
 
 
     static val LOG = LoggerFactory.getLogger(OpenflowpluginTestServiceProvider);
@@ -68,9 +68,9 @@ class OpenflowpluginTestServiceProvider implements AutoCloseable, SalMeterServic
     }
     
     
-    def CompositeObjectRegistration<OpenflowpluginTestServiceProvider> register(ProviderContext ctx) {
+    def CompositeObjectRegistration<OpenflowpluginMeterTestServiceProvider> register(ProviderContext ctx) {
         val builder = CompositeObjectRegistration
-                .<OpenflowpluginTestServiceProvider> builderFor(this);
+                .<OpenflowpluginMeterTestServiceProvider> builderFor(this);
 
         meterRegistration = ctx.addRoutedRpcImplementation(SalMeterService, this);
         val nodeIndentifier = InstanceIdentifier.builder(Nodes).child(Node, new NodeKey(new NodeId(OpenflowpluginTestActivator.NODE_ID)));