Merge "Enabled registration for all rpc services"
authorAbhijit Kumbhare <abhijitk@us.ibm.com>
Thu, 28 Nov 2013 15:58:51 +0000 (15:58 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 28 Nov 2013 15:58:51 +0000 (15:58 +0000)
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/ModelDrivenSwitch.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/AbstractModelDrivenSwitch.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImpl.java

index 32b839a195db9985615e8f8ae5faf8be259bbcb6..da4954cb4017312cb09f1213d17d72cf23f11420 100644 (file)
@@ -45,8 +45,8 @@ public interface ModelDrivenSwitch extends //
         SalMeterService, //
         SalPortService, //
         PacketProcessingService, //
-        OpendaylightGroupStatisticsService,
-        OpendaylightMeterStatisticsService,
+        OpendaylightGroupStatisticsService, //
+        OpendaylightMeterStatisticsService, //
         Identifiable<InstanceIdentifier<Node>> {
 
     CompositeObjectRegistration<ModelDrivenSwitch> register(ProviderContext ctx);
index a0f72da8f67fe135a8afe27f42f7547751605870..ffaddf73168034c46fd4f54bcc2d66e803d45aa3 100644 (file)
@@ -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());
index 38905f67c239974647433eb7352c50599ae58ef9..dc95d490f313914ce37b441ccc36ddb33a3f1b6a 100644 (file)
@@ -604,7 +604,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();