commit 328fb60363e0f05d81439b4c46da818a7bf57556
author Daniel Park <dan.park@sk.com> Mon May 31 13:49:53 2021 +0900
committer Jian Li <pyguni@gmail.com> Mon May 31 07:55:03 2021 +0000
tree c82584b9055ba8af11eb55218053e3a4c5b25d92
parent a5ba88d970e47a179f09dd45d33c8d2307934552

Enhance the RM logic for Kubevirt Networking App in case of virtual network.

Change-Id: I9b38ea0d76ce269cb03bc8a0f7d1883ddb92f51c
(cherry picked from commit d77b4ccb6cd06da7019980add8188b9021f6fcc5)

apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRoutingSnatHandler.java

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRoutingSnatHandler.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRoutingSnatHandler.java
index 5e0aa64..6e46179 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRoutingSnatHandler.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtRoutingSnatHandler.java
@@ -319,19 +319,13 @@
                 install);
 
         if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
-            setDownStreamRulesToGatewayTunBridge(router, network, kubevirtPort, install);
+            setDownStreamRulesToGatewayTunBridge(network, gatewayNode, kubevirtPort, install);
         }
     }
 
-    private void setDownStreamRulesToGatewayTunBridge(KubevirtRouter router,
-                                                      KubevirtNetwork network,
+    private void setDownStreamRulesToGatewayTunBridge(KubevirtNetwork network,
+                                                      KubevirtNode electedGw,
                                                       KubevirtPort port, boolean install) {
-        KubevirtNode electedGw = gatewayNodeForSpecifiedRouter(kubevirtNodeService, router);
-
-        if (electedGw == null) {
-            return;
-        }
-
         KubevirtNode workerNode = kubevirtNodeService.node(port.deviceId());
         if (workerNode == null) {
             return;