commit e49eb38cd2157e4e168483eb0bf2389b845c0fdf
author daniel park <dan.park@sk.com> Wed Apr 05 16:48:28 2017 +0900
committer daniel park <dan.park@sk.com> Wed Apr 12 11:14:27 2017 +0900
tree dfeecacc697a9acf81e805c5571f57dede94535d
parent 47f8fb739ce42b6b432896917cda012bd02ec134

[ONOS-6060] Merge scalablegateway app to openstacknode app

Change-Id: I8e152a943f575c2fc0305ae572b5e0150a699d30

apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index a1a1899..eb08cc3 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -50,7 +50,6 @@
 import org.onosproject.openstacknetworking.api.OpenstackRouterService;
 import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
 import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.ConsistentMap;
 import org.onosproject.store.service.DistributedSet;
@@ -118,9 +117,6 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected OpenstackRouterService osRouterService;
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ScalableGatewayService gatewayService;
-
     private final ExecutorService eventExecutor = newSingleThreadExecutor(
             groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
     private final InternalPacketProcessor packetProcessor = new InternalPacketProcessor();
@@ -311,7 +307,7 @@
                 break;
         }
 
-        gatewayService.getGatewayDeviceIds().forEach(deviceId -> {
+        osNodeService.gatewayDeviceIds().forEach(deviceId -> {
             DeviceId srcDeviceId = srcInstPort.deviceId();
             TrafficTreatment.Builder tmpBuilder =
                     DefaultTrafficTreatment.builder(tBuilder.build());
@@ -367,10 +363,10 @@
         }
 
         tBuilder.setIpSrc(externalIp);
-        gatewayService.getGatewayDeviceIds().forEach(deviceId -> {
+        osNodeService.gatewayDeviceIds().forEach(deviceId -> {
             TrafficTreatment.Builder tmpBuilder =
                     DefaultTrafficTreatment.builder(tBuilder.build());
-            tmpBuilder.setOutput(gatewayService.getUplinkPort(deviceId));
+            tmpBuilder.setOutput(osNodeService.externalPort(deviceId).get());
             ForwardingObjective fo = DefaultForwardingObjective.builder()
                     .withSelector(sBuilder.build())
                     .withTreatment(tmpBuilder.build())
@@ -415,7 +411,7 @@
         ethPacketIn.setPayload(iPacket);
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setOutput(gatewayService.getUplinkPort(srcDevice))
+                .setOutput(osNodeService.externalPort(srcDevice).get())
                 .build();
         ethPacketIn.resetChecksum();
         packetService.emit(new DefaultOutboundPacket(
@@ -459,7 +455,7 @@
         public void process(PacketContext context) {
             if (context.isHandled()) {
                 return;
-            } else if (!gatewayService.getGatewayDeviceIds().contains(
+            } else if (!osNodeService.gatewayDeviceIds().contains(
                     context.inPacket().receivedFrom().deviceId())) {
                 // return if the packet is not from gateway nodes
                 return;