commit cb0a24eccb71ab075b1ab72c95bcd2e439aed1fe
author Jian Li <pyguni@gmail.com> Tue Sep 17 03:30:34 2019 +0900
committer Jian Li <pyguni@gmail.com> Tue Sep 17 03:38:00 2019 +0900
tree 14bc1d38d2b63843220cbf66a91cb6d874e090c8
parent 8ac677c7eda8b0005fbe522b85155d310a75aed8

Fix: do not add/remove SNAT rules when receiving FLAT vport events

Change-Id: Ib30a5d376bcb08b9a6eec595dee49b6607a8f07b

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index 1fa1148..03486c0 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -1459,8 +1459,14 @@
             }
 
             if (getStatefulSnatFlag() && osNode.type() == GATEWAY) {
-                instancePortService.instancePorts().forEach(instPort ->
-                        setGatewayToInstanceDownstreamRule(osNode, instPort, true));
+                instancePortService.instancePorts().forEach(instPort -> {
+                    Type netType = osNetworkAdminService.networkType(instPort.networkId());
+
+                    if (netType == FLAT) {
+                        return;
+                    }
+                    setGatewayToInstanceDownstreamRule(osNode, instPort, true);
+                });
             }
         }
 
@@ -1470,8 +1476,15 @@
             }
 
             if (getStatefulSnatFlag() && osNode.type() == GATEWAY) {
-                instancePortService.instancePorts().forEach(instPort ->
-                        setGatewayToInstanceDownstreamRule(osNode, instPort, false));
+                instancePortService.instancePorts().forEach(instPort -> {
+                    Type netType = osNetworkAdminService.networkType(instPort.networkId());
+
+                    if (netType == FLAT) {
+                        return;
+                    }
+
+                    setGatewayToInstanceDownstreamRule(osNode, instPort, false);
+                });
             }
         }