Enabled registration for all rpc services

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/ModelDrivenSwitch.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/ModelDrivenSwitch.java
index 624006ef52e20d932fc541a2be3cd60c1af4c522..f2aa554c9b3538c0002508c3613f019699fe4e42 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/ModelDrivenSwitch.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/ModelDrivenSwitch.java
@@ -40,8 +40,8 @@ public interface ModelDrivenSwitch extends //
         SalFlowService, //
         SalMeterService, //
         PacketProcessingService, //
-        OpendaylightGroupStatisticsService,
-        OpendaylightMeterStatisticsService,
+        OpendaylightGroupStatisticsService, //
+        OpendaylightMeterStatisticsService, //
         Identifiable<InstanceIdentifier<Node>> {
 
     CompositeObjectRegistration<ModelDrivenSwitch> register(ProviderContext ctx);

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/AbstractModelDrivenSwitch.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/AbstractModelDrivenSwitch.java
index a0f72da8f67fe135a8afe27f42f7547751605870..ffaddf73168034c46fd4f54bcc2d66e803d45aa3 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/AbstractModelDrivenSwitch.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/AbstractModelDrivenSwitch.java
@@ -63,17 +63,17 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
         flowRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(flowRegistration);
 
-        //meterRegistration = ctx.addRoutedRpcImplementation(SalMeterService.class, this);
-        //meterRegistration.registerPath(NodeContext.class, getIdentifier());
-        //builder.add(meterRegistration);
+        meterRegistration = ctx.addRoutedRpcImplementation(SalMeterService.class, this);
+        meterRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(meterRegistration);
 
-        //groupRegistration = ctx.addRoutedRpcImplementation(SalGroupService.class, this);
-        //groupRegistration.registerPath(NodeContext.class, getIdentifier());
-        //builder.add(groupRegistration);
+        groupRegistration = ctx.addRoutedRpcImplementation(SalGroupService.class, this);
+        groupRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(groupRegistration);
 
-        //packetRegistration = ctx.addRoutedRpcImplementation(PacketProcessingService.class, this);
-        //packetRegistration.registerPath(NodeContext.class, getIdentifier());
-        //builder.add(packetRegistration);
+        packetRegistration = ctx.addRoutedRpcImplementation(PacketProcessingService.class, this);
+        packetRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(packetRegistration);
         
         groupStatisticsRegistration = ctx.addRoutedRpcImplementation(OpendaylightGroupStatisticsService.class, this);
         groupStatisticsRegistration.registerPath(NodeContext.class, getIdentifier());

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
index 03a1cfb65be0cad1b2e5282f280b5a8033288dc6..c50fb9a0a7a49e690ba7d483d52097226b1e5680 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java
@@ -596,7 +596,7 @@ public class ModelDrivenSwitchImpl extends AbstractModelDrivenSwitch {
         //Generate xid to associate it with the request
         Long xid = this.getSessionContext().getNextXid();
 
-        LOG.debug("Prepare statistics request for group ({}) - Transaction id - {}",input.getId().toString(),xid);
+        LOG.debug("Prepare statistics request for node {} group ({}) - Transaction id - {}",input.getNode(),input.getGroupId(),xid);
 
         // Create multipart request header
         MultipartRequestInputBuilder mprInput = new MultipartRequestInputBuilder();