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

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
index 3f5adee..ea716db 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingIcmpHandler.java
@@ -51,8 +51,6 @@
 import org.onosproject.openstacknode.OpenstackNodeEvent;
 import org.onosproject.openstacknode.OpenstackNodeListener;
 import org.onosproject.openstacknode.OpenstackNodeService;
-import org.onosproject.scalablegateway.api.GatewayNode;
-import org.onosproject.scalablegateway.api.ScalableGatewayService;
 import org.openstack4j.model.network.ExternalGateway;
 import org.openstack4j.model.network.IP;
 import org.openstack4j.model.network.Port;
@@ -100,9 +98,6 @@
     protected MastershipService mastershipService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ScalableGatewayService gatewayService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected OpenstackNodeService osNodeService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -147,7 +142,7 @@
                 .matchIPProtocol(IPv4.PROTOCOL_ICMP)
                 .build();
 
-        gatewayService.getGatewayDeviceIds().forEach(gateway -> {
+        osNodeService.gatewayDeviceIds().forEach(gateway -> {
             packetService.requestPackets(
                     icmpSelector,
                     PacketPriority.CONTROL,
@@ -335,7 +330,7 @@
                 .setPayload(ipPacket);
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setOutput(gatewayService.getUplinkPort(srcDevice))
+                .setOutput(osNodeService.externalPort(srcDevice).get())
                 .build();
 
         OutboundPacket packet = new DefaultOutboundPacket(
@@ -386,7 +381,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;
@@ -423,14 +418,6 @@
                     if (osNode.type() == GATEWAY) {
                         log.info("GATEWAY node {} detected", osNode.hostname());
                         eventExecutor.execute(() -> {
-                            // TODO add events to scalable gateway so that we
-                            // don't need to add gateway here and there
-                            GatewayNode gnode = GatewayNode.builder()
-                                    .gatewayDeviceId(osNode.intBridge())
-                                    .dataIpAddress(osNode.dataIp().get().getIp4Address())
-                                    .uplinkIntf(osNode.externalPortName().get())
-                                    .build();
-                            gatewayService.addGatewayNode(gnode);
                             requestPacket(appId);
                         });
                     }