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/cli/UpdateExternalPeerRouterVlanCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
index e0aae53..3dc14a7 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
@@ -23,7 +23,7 @@
 import org.onlab.packet.VlanId;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
-import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
+import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
 import org.onosproject.openstacknetworking.api.OpenstackRouterService;
 import org.openstack4j.model.network.Network;
 import org.openstack4j.model.network.Router;
@@ -51,29 +51,29 @@
 
     @Override
     protected void execute() {
-        OpenstackNetworkService osNetService = AbstractShellCommand.get(OpenstackNetworkService.class);
+        OpenstackNetworkAdminService osNetAdminService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
         OpenstackRouterService osRouterService = AbstractShellCommand.get(OpenstackRouterService.class);
 
         IpAddress externalPeerIpAddress = IpAddress.valueOf(
                 IpAddress.Version.INET, Ip4Address.valueOf(ipAddress).toOctets());
 
-        if (osNetService.externalPeerRouters().isEmpty()) {
+        if (osNetAdminService.externalPeerRouters().isEmpty()) {
             print(NO_ELEMENT);
             return;
-        } else if (osNetService.externalPeerRouters().stream()
+        } else if (osNetAdminService.externalPeerRouters().stream()
                 .noneMatch(router -> router.externalPeerRouterIp().toString().equals(ipAddress))) {
             print(NO_ELEMENT);
             return;
         }
 
-        Subnet subnet = osNetService.subnets().stream()
+        Subnet subnet = osNetAdminService.subnets().stream()
                 .filter(s -> s.getGateway().equals(ipAddress))
                 .findAny().orElse(null);
         if (subnet == null) {
             return;
         }
 
-        Network network = osNetService.network(subnet.getNetworkId());
+        Network network = osNetAdminService.network(subnet.getNetworkId());
         if (network == null) {
             return;
         }
@@ -88,11 +88,11 @@
 
         try {
             if (vlanId.equals(NONE)) {
-                osNetService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.NONE);
-                osNetService.deriveExternalPeerRouterMac(router.getExternalGatewayInfo(), router, VlanId.NONE);
+                osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.NONE);
+                osNetAdminService.deriveExternalPeerRouterMac(router.getExternalGatewayInfo(), router, VlanId.NONE);
             } else {
-                osNetService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.vlanId(vlanId));
-                osNetService.deriveExternalPeerRouterMac(
+                osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.vlanId(vlanId));
+                osNetAdminService.deriveExternalPeerRouterMac(
                         router.getExternalGatewayInfo(), router, VlanId.vlanId(vlanId));
 
             }
@@ -101,7 +101,7 @@
         }
 
         print(FORMAT, "Router IP", "Mac Address", "VLAN ID");
-        List<ExternalPeerRouter> routers = Lists.newArrayList(osNetService.externalPeerRouters());
+        List<ExternalPeerRouter> routers = Lists.newArrayList(osNetAdminService.externalPeerRouters());
 
         for (ExternalPeerRouter r: routers) {
             print(FORMAT, r.externalPeerRouterIp(),