commit efbc0389347b26198a0b70897a8081f1d6363127
author sangho <sangho@onlab.us> Wed Apr 06 13:35:38 2016 +0900
committer Gerrit Code Review <gerrit@onlab.us> Wed Apr 06 17:50:14 2016 +0000
tree d92bd053ec73f3f5648e9dc0c1e2de7f20e26363
parent 636455078770e3083abb3b4ec1c7d6b7176faa09

[ONOS-4280] Allow to add a subnet to external network after the external network is used in routers

Change-Id: Idc41e64c21b9b36422bba67b48027c8a7f337a70

apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java

diff --git a/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java b/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
index edc340b..b653c5a 100644
--- a/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
+++ b/apps/openstacknetworking/openstackrouting/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java
@@ -233,10 +233,7 @@
     @Override
     public void updateRouter(OpenstackRouter openstackRouter) {
         if (openstackRouter.gatewayExternalInfo().externalFixedIps().size() > 0) {
-            Ip4Address externalIp = openstackRouter.gatewayExternalInfo().externalFixedIps()
-                    .values().stream().findFirst().orElse(null);
-            OpenstackRouter router = getRouterfromExternalIp(externalIp);
-            checkExternalConnection(router, getOpenstackRouterInterface(router));
+            checkExternalConnection(openstackRouter, getOpenstackRouterInterface(openstackRouter));
         } else {
             unsetExternalConnection();
         }