commit 4b3436a259c45b11c3ee43ee1b45b5999833a96f
author Jian Li <pyguni@gmail.com> Wed Mar 23 13:07:19 2022 +0900
committer Jian Li <pyguni@gmail.com> Tue Mar 29 07:52:20 2022 +0000
tree acada9bf1cd350b79f29f05696d3e0d305acd771
parent 16ff3291a836ffcb18d52459fd891b01b5dbd9ad

Support STT tunneling protocol at kubevirt networking app

Change-Id: Icbef76dbfb842ce1cf6893bf18ee80c4b1b26006

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

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtLbHandler.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtLbHandler.java
index ba352eb..55b84f1 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtLbHandler.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtLbHandler.java
@@ -83,6 +83,7 @@
 import static org.onosproject.kubevirtnetworking.api.Constants.TUNNEL_DEFAULT_TABLE;
 import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.GENEVE;
 import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.GRE;
+import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.STT;
 import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.VXLAN;
 import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.buildGarpPacket;
 import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.externalPatchPortNum;
@@ -237,7 +238,7 @@
             setLbDownstreamRules(loadBalancer, router, gateway, true);
             setLbUpstreamRules(loadBalancer, router, gateway, true);
 
-            if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
+            if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE || network.type() == STT) {
                 setLbDownStreamRulesForTunBridge(loadBalancer, gateway, true);
             }
         }
@@ -274,7 +275,8 @@
 
             setLbDownstreamRules(old, oldRouter, oldGateway, false);
             setLbUpstreamRules(old, oldRouter, oldGateway, false);
-            if (oldNetwork.type() == VXLAN || oldNetwork.type() == GENEVE || oldNetwork.type() == GRE) {
+            if (oldNetwork.type() == VXLAN || oldNetwork.type() == GENEVE ||
+                    oldNetwork.type() == GRE || oldNetwork.type() == STT) {
                 setLbDownStreamRulesForTunBridge(loadBalancer, oldGateway, false);
             }
             setBucketsToGroup(old, oldGateway, false);
@@ -310,7 +312,8 @@
             setBucketsToGroup(loadBalancer, gateway, true);
             setLbDownstreamRules(loadBalancer, router, gateway, true);
             setLbUpstreamRules(loadBalancer, router, gateway, true);
-            if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
+            if (network.type() == VXLAN || network.type() == GENEVE ||
+                    network.type() == GRE || network.type() == STT) {
                 setLbDownStreamRulesForTunBridge(loadBalancer, gateway, true);
             }
         }
@@ -350,7 +353,7 @@
             setBucketsToGroup(loadBalancer, gateway, false);
             setLbGroup(loadBalancer, gateway, false);
 
-            if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
+            if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE || network.type() == STT) {
                 setLbDownStreamRulesForTunBridge(loadBalancer, gateway, false);
             }
         }
@@ -747,7 +750,8 @@
                 setLbUpstreamRules(loadBalancer, router, gatewayNode, true);
 
                 KubevirtNetwork network = networkService.network(loadBalancer.networkId());
-                if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
+                if (network.type() == VXLAN || network.type() == GENEVE ||
+                        network.type() == GRE || network.type() == STT) {
                     setLbDownStreamRulesForTunBridge(loadBalancer, gatewayNode, true);
                 }
 
@@ -781,7 +785,8 @@
                 setLbGroup(loadBalancer, gatewayNode, false);
 
                 KubevirtNetwork network = networkService.network(loadBalancer.networkId());
-                if (network.type() == VXLAN || network.type() == GENEVE || network.type() == GRE) {
+                if (network.type() == VXLAN || network.type() == GENEVE ||
+                        network.type() == GRE || network.type() == STT) {
                     setLbDownStreamRulesForTunBridge(loadBalancer, gatewayNode, false);
                 }