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/OpenstackRoutingHandler.java

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
index 7d722ec..4cace0f 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java
@@ -49,7 +49,6 @@
 import org.onosproject.openstacknode.OpenstackNodeEvent;
 import org.onosproject.openstacknode.OpenstackNodeListener;
 import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
 import org.openstack4j.model.network.ExternalGateway;
 import org.openstack4j.model.network.Network;
 import org.openstack4j.model.network.Router;
@@ -96,9 +95,6 @@
     protected OpenstackNodeService osNodeService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ScalableGatewayService gatewayService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected OpenstackNetworkService osNetworkService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -195,14 +191,14 @@
                 .forEach(osNode -> {
                     setRulesToGateway(
                             osNode.intBridge(),
-                            gatewayService.getGatewayGroupId(osNode.intBridge()),
+                            osNodeService.gatewayGroupId(osNode.intBridge()),
                             Long.valueOf(osNet.getProviderSegID()),
                             IpPrefix.valueOf(osSubnet.getCidr()),
                             install);
                 });
 
         // take the first outgoing packet to controller for source NAT
-        gatewayService.getGatewayDeviceIds()
+        osNodeService.gatewayDeviceIds()
                 .forEach(gwDeviceId -> setRulesToController(
                         gwDeviceId,
                         Long.valueOf(osNet.getProviderSegID()),
@@ -225,13 +221,13 @@
                 .filter(osNode -> osNode.type() == COMPUTE)
                 .forEach(osNode -> setRulesToGatewayWithDstIp(
                         osNode.intBridge(),
-                        gatewayService.getGatewayGroupId(osNode.intBridge()),
+                        osNodeService.gatewayGroupId(osNode.intBridge()),
                         Long.valueOf(network.getProviderSegID()),
                         IpAddress.valueOf(osSubnet.getGateway()),
                         install));
 
         IpAddress gatewayIp = IpAddress.valueOf(osSubnet.getGateway());
-        gatewayService.getGatewayDeviceIds()
+        osNodeService.gatewayDeviceIds()
                 .forEach(gwDeviceId -> setGatewayIcmpRule(
                         gatewayIp,
                         gwDeviceId,