commit 4cb120b3e0e0fb7404e28eaa458b31696ea0a140
author Daniel Park <dan.mcpark84@gmail.com> Wed Mar 24 12:30:50 2021 +0900
committer Jian Li <pyguni@gmail.com> Wed Mar 24 07:40:27 2021 +0000
tree 9e2d2c79f4755d86c1a49dd0a3e140ea9e5d1af2
parent 5a3e939495c9c8d9623636c25ac7831079b946a6

Implement internal routing capability for tenant network.

Change-Id: Ibe6500e05239ea8c9aa5df2256c4a66a7d087ec4
(cherry picked from commit 150b962ecd78646d5a18e4611dc16495596a364a)

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

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java
index 47bf5cc..d88520a 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java
@@ -101,6 +101,8 @@
 import static org.onosproject.kubevirtnetworking.api.Constants.TENANT_TO_TUNNEL_PREFIX;
 import static org.onosproject.kubevirtnetworking.api.Constants.TUNNEL_DEFAULT_TABLE;
 import static org.onosproject.kubevirtnetworking.api.Constants.TUNNEL_TO_TENANT_PREFIX;
+import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.FLAT;
+import static org.onosproject.kubevirtnetworking.api.KubevirtNetwork.Type.VLAN;
 import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.gatewayNodeForSpecifiedRouter;
 import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.getRouterForKubevirtNetwork;
 import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.getRouterForKubevirtPort;
@@ -430,6 +432,7 @@
                     setDefaultGatewayRuleToWorkerNodeTunBridge(router, network,
                             electedGateway.intgBridge(), node, install);
                 });
+                setGatewayProviderInterNetworkRoutingWithinSameRouter(network, router, electedGateway, install);
                 break;
             case FLAT:
             case VLAN:
@@ -679,27 +682,69 @@
             return;
         }
 
-        TrafficSelector.Builder sBuilder = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4)
-                .matchEthDst(routerMacAddress)
-                .matchIPSrc(IpPrefix.valueOf(srcNetwork.cidr()))
-                .matchIPDst(IpPrefix.valueOf(dstPort.ipAddress(), 32));
+        TrafficSelector.Builder sBuilder;
+        TrafficTreatment treatment;
 
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setEthSrc(routerMacAddress)
-                .setEthDst(dstPort.macAddress())
-                .transition(FORWARDING_TABLE)
-                .build();
+        if (srcNetwork.type() == FLAT || srcNetwork.type() == VLAN) {
+            sBuilder = DefaultTrafficSelector.builder()
+                    .matchEthType(Ethernet.TYPE_IPV4)
+                    .matchEthDst(routerMacAddress)
+                    .matchIPSrc(IpPrefix.valueOf(srcNetwork.cidr()))
+                    .matchIPDst(IpPrefix.valueOf(dstPort.ipAddress(), 32));
 
-        flowService.setRule(
-                appId,
-                gwDevice.id(),
-                sBuilder.build(),
-                treatment,
-                PRIORITY_INTERNAL_ROUTING_RULE,
-                PRE_FLAT_TABLE,
-                install
-        );
+            treatment = DefaultTrafficTreatment.builder()
+                    .setEthSrc(routerMacAddress)
+                    .setEthDst(dstPort.macAddress())
+                    .transition(FORWARDING_TABLE)
+                    .build();
+
+            flowService.setRule(
+                    appId,
+                    gwDevice.id(),
+                    sBuilder.build(),
+                    treatment,
+                    PRIORITY_INTERNAL_ROUTING_RULE,
+                    PRE_FLAT_TABLE,
+                    install);
+        } else {
+            KubevirtNetwork dstNetwork = kubevirtNetworkService.network(dstPort.networkId());
+            if (dstNetwork == null) {
+                return;
+            }
+
+            KubevirtNode dstPortWorkerNode = kubevirtNodeService.node(dstPort.deviceId());
+            if (dstPortWorkerNode == null) {
+                return;
+            }
+
+            sBuilder = DefaultTrafficSelector.builder()
+                    .matchEthType(Ethernet.TYPE_IPV4)
+                    .matchEthDst(routerMacAddress)
+                    .matchTunnelId(Long.parseLong(srcNetwork.segmentId()))
+                    .matchIPSrc(IpPrefix.valueOf(srcNetwork.cidr()))
+                    .matchIPDst(IpPrefix.valueOf(dstPort.ipAddress(), 32));
+
+            treatment = DefaultTrafficTreatment.builder()
+                    .setTunnelId(Long.parseLong(dstNetwork.segmentId()))
+                    .setEthSrc(routerMacAddress)
+                    .setEthDst(dstPort.macAddress())
+                    .extension(buildExtension(
+                            deviceService,
+                            gatewayNode.tunBridge(),
+                            dstPortWorkerNode.dataIp().getIp4Address()),
+                            gatewayNode.tunBridge())
+                    .setOutput(PortNumber.IN_PORT)
+                    .build();
+
+            flowService.setRule(
+                    appId,
+                    gatewayNode.tunBridge(),
+                    sBuilder.build(),
+                    treatment,
+                    PRIORITY_INTERNAL_ROUTING_RULE,
+                    TUNNEL_DEFAULT_TABLE,
+                    install);
+        }
     }
 
     private void setGatewayArpRuleForProviderInternalNetwork(KubevirtRouter router, KubevirtNetwork network,