commit fb64d8866524c1f95b87bb7c57fe187ff81fac40
author Jian Li <pyguni@gmail.com> Tue Nov 27 10:57:40 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Nov 27 08:24:17 2018 +0000
tree 9fc36d4fd2e1325768a8b2327944b3d00a4a3a5a
parent 1e9cb73ba5dc307ae2b3f3c590749de6d5aaff08

Fix: do not install default rules in gateway node

1. do not proceed without selectedGatewayNode having valid value

Change-Id: Ib092ab69360f7d985c5e52d9001a8e5f446cf6dc

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index 2b48baa..c122213 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -327,6 +327,7 @@
 
         if (selectedGatewayNode == null) {
             log.warn(ERR_FLOW + "no gateway node selected");
+            return;
         }
 
         switch (osNet.getNetworkType()) {
@@ -335,10 +336,6 @@
                     log.warn(ERR_FLOW + "no tunnel port");
                     return;
                 }
-                if (selectedGatewayNode == null) {
-                    log.warn(ERR_FLOW + "no gateway node");
-                    return;
-                }
                 sBuilder.matchTunnelId(Long.parseLong(osNet.getProviderSegID()));
                 tBuilder.extension(buildExtension(
                         deviceService,