commit 32b42208e0bf4fee0e05291f4dcd12178be7b794
author daniel park <dan.park@sk.com> Wed Mar 14 16:53:44 2018 +0900
committer Jian Li <pyguni@gmail.com> Wed Mar 21 08:31:23 2018 +0000
tree 365ebdb56d4672c1a5b450ae297d47966e799e2f
parent ed9bace5148d58f38851075579242e4a8f5ca241

[ONOS-7444] Optimize SONA gw doesn't use vrouter app and quagga anymore
- Done: Deriving MAC address from external peer router, SNAT, Floating IP-based routing, SNAT with VLAN,
        Floating IP-based routing with VLAN
- Todo: GW loadbalancing

Change-Id: Ic3dee387e8b6215b5398691665135a00475a306c

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
index 657d7a0..e6be7ef 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java
@@ -35,7 +35,7 @@
 import org.onosproject.net.packet.PacketProcessor;
 import org.onosproject.net.packet.PacketService;
 import org.onosproject.openstacknetworking.api.Constants;
-import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
+import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
 import org.onosproject.openstacknetworking.api.OpenstackRouterService;
 import org.onosproject.openstacknode.api.OpenstackNode;
 import org.onosproject.openstacknode.api.OpenstackNodeService;
@@ -68,7 +68,7 @@
     protected PacketService packetService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenstackNetworkService osNetworkService;
+    protected OpenstackNetworkAdminService osNetworkAdminService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected OpenstackRouterService osRouterService;
@@ -114,7 +114,7 @@
 
             //In case target ip is for associated floating ip, sets target mac to vm's.
             if (floatingIP != null && floatingIP.getPortId() != null) {
-                targetMac = MacAddress.valueOf(osNetworkService.port(floatingIP.getPortId()).getMacAddress());
+                targetMac = MacAddress.valueOf(osNetworkAdminService.port(floatingIP.getPortId()).getMacAddress());
             }
 
             if (isExternalGatewaySourceIp(targetIp.getIp4Address())) {
@@ -147,7 +147,7 @@
             try {
                 if (receivedPortNum.equals(
                         osNodeService.node(context.inPacket().receivedFrom().deviceId()).uplinkPortNum())) {
-                    osNetworkService.updateExternalPeerRouterMac(
+                    osNetworkAdminService.updateExternalPeerRouterMac(
                             Ip4Address.valueOf(arp.getSenderProtocolAddress()),
                             MacAddress.valueOf(arp.getSenderHardwareAddress()));
                 }
@@ -185,7 +185,7 @@
     }
 
     private boolean isExternalGatewaySourceIp(IpAddress targetIp) {
-        return osNetworkService.ports().stream()
+        return osNetworkAdminService.ports().stream()
                 .filter(osPort -> Objects.equals(osPort.getDeviceOwner(),
                         DEVICE_OWNER_ROUTER_GW))
                 .flatMap(osPort -> osPort.getFixedIps().stream())