Bug 1764 - moved Session related interfaces to openflowplugin-api

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / AbstractModelDrivenSwitch.java

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 fbe73c9ea9a771344a25df8678f51b2ea81b85d3..1bfa98f43285b279816189dd6813a4f21f264613 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
@@ -9,10 +9,11 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal;
 
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.openflowplugin.openflow.md.ModelDrivenSwitch;
-import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
+import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitch;
+import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.OpendaylightFlowStatisticsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.OpendaylightFlowTableStatisticsService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.SalGroupService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
@@ -20,6 +21,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.SalPortService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.OpendaylightQueueStatisticsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.SalTableService;
 import org.opendaylight.yangtools.concepts.CompositeObjectRegistration;
 import org.opendaylight.yangtools.concepts.CompositeObjectRegistration.CompositeObjectRegistrationBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -34,17 +39,27 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
     private RoutedRpcRegistration<SalFlowService> flowRegistration;
 
     private RoutedRpcRegistration<SalGroupService> groupRegistration;
+    
+    private RoutedRpcRegistration<SalTableService> tableRegistration;
 
     private RoutedRpcRegistration<SalMeterService> meterRegistration;
+    
+    private RoutedRpcRegistration<SalPortService> portRegistration;
 
     private RoutedRpcRegistration<PacketProcessingService> packetRegistration;
-    
+
     private RoutedRpcRegistration<OpendaylightFlowStatisticsService> flowStatisticsRegistration;
 
     private RoutedRpcRegistration<OpendaylightGroupStatisticsService> groupStatisticsRegistration;
 
     private RoutedRpcRegistration<OpendaylightMeterStatisticsService> meterStatisticsRegistration;
 
+    private RoutedRpcRegistration<OpendaylightPortStatisticsService> portStatisticsRegistration;
+
+    private RoutedRpcRegistration<OpendaylightFlowTableStatisticsService> flowTableStatisticsRegistration;
+
+    private RoutedRpcRegistration<OpendaylightQueueStatisticsService> queueStatisticsRegistration;
+
     protected final SessionContext sessionContext;
 
     protected AbstractModelDrivenSwitch(InstanceIdentifier<Node> identifier,SessionContext conductor) {
@@ -65,6 +80,10 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
         flowRegistration = ctx.addRoutedRpcImplementation(SalFlowService.class, this);
         flowRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(flowRegistration);
+        
+        portRegistration = ctx.addRoutedRpcImplementation(SalPortService.class, this);
+        portRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(portRegistration);
 
         meterRegistration = ctx.addRoutedRpcImplementation(SalMeterService.class, this);
         meterRegistration.registerPath(NodeContext.class, getIdentifier());
@@ -73,6 +92,10 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
         groupRegistration = ctx.addRoutedRpcImplementation(SalGroupService.class, this);
         groupRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(groupRegistration);
+        
+        tableRegistration = ctx.addRoutedRpcImplementation(SalTableService.class, this);
+        tableRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(tableRegistration);
 
         packetRegistration = ctx.addRoutedRpcImplementation(PacketProcessingService.class, this);
         packetRegistration.registerPath(NodeContext.class, getIdentifier());
@@ -90,6 +113,18 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
         meterStatisticsRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(meterStatisticsRegistration);
 
+        portStatisticsRegistration = ctx.addRoutedRpcImplementation(OpendaylightPortStatisticsService.class, this);
+        portStatisticsRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(portStatisticsRegistration);
+
+        flowTableStatisticsRegistration = ctx.addRoutedRpcImplementation(OpendaylightFlowTableStatisticsService.class, this);
+        flowTableStatisticsRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(flowTableStatisticsRegistration);
+        
+        queueStatisticsRegistration = ctx.addRoutedRpcImplementation(OpendaylightQueueStatisticsService.class, this);
+        queueStatisticsRegistration.registerPath(NodeContext.class, getIdentifier());
+        builder.add(queueStatisticsRegistration);
+
         return builder.toInstance();
     }