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 81b3bd3a550f9f0a8e40053fc8ffa2e2d33dd876..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,8 +9,8 @@ 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;
@@ -43,11 +43,11 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
     private RoutedRpcRegistration<SalTableService> tableRegistration;
 
     private RoutedRpcRegistration<SalMeterService> meterRegistration;
+    
+    private RoutedRpcRegistration<SalPortService> portRegistration;
 
     private RoutedRpcRegistration<PacketProcessingService> packetRegistration;
 
-    private RoutedRpcRegistration<SalPortService> portRegistration;
-    
     private RoutedRpcRegistration<OpendaylightFlowStatisticsService> flowStatisticsRegistration;
 
     private RoutedRpcRegistration<OpendaylightGroupStatisticsService> groupStatisticsRegistration;
@@ -80,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());
@@ -93,11 +97,6 @@ public abstract class AbstractModelDrivenSwitch implements ModelDrivenSwitch {
         tableRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(tableRegistration);
 
-        portRegistration = ctx.addRoutedRpcImplementation(SalPortService.class, this);
-        portRegistration.registerPath(NodeContext.class, getIdentifier());
-        builder.add(portRegistration);
-
-
         packetRegistration = ctx.addRoutedRpcImplementation(PacketProcessingService.class, this);
         packetRegistration.registerPath(NodeContext.class, getIdentifier());
         builder.add(packetRegistration);