commit a4d8fba801d1514d01d7a2c1ccfb59722a433583
author Jian Li <pyguni@gmail.com> Thu Sep 10 23:16:50 2020 +0900
committer Jian Li <pyguni@gmail.com> Thu Sep 10 23:47:28 2020 +0900
tree c3cc383565cc01ff366ce5239d994847cab652cf
parent 019ce6a7143620fab32b7b0579aa7381aa102af2

Inter-connect k8s external and openstack integration bridge

Change-Id: Ibd889e9fd4a10a06056b823d6c01254429d5cdc4

apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sHostHandler.java

diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sHostHandler.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sHostHandler.java
index 3827e21..2fc26be 100644
--- a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sHostHandler.java
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DefaultK8sHostHandler.java
@@ -286,10 +286,18 @@
                 DefaultPatchDescription.builder()
                         .deviceId(OS_INTEGRATION_BRIDGE)
                         .ifaceName(k8sNode.osToK8sIntgPatchPortName())
-                        .peer(k8sNode.k8sToOsIntgPatchPortName())
+                        .peer(k8sNode.k8sIntgToOsPatchPortName())
                         .build();
+        ifaceConfig.addPatchMode(k8sNode.osToK8sIntgPatchPortName(), osIntK8sIntPatchDesc);
 
-        ifaceConfig.addPatchMode(k8sNode.tunToIntgPatchPortName(), osIntK8sIntPatchDesc);
+        // openstack integration bridge -> k8s external bridge
+        PatchDescription osIntK8sExPatchDesc =
+                DefaultPatchDescription.builder()
+                        .deviceId(OS_INTEGRATION_BRIDGE)
+                        .ifaceName(k8sNode.osToK8sExtPatchPortName())
+                        .peer(k8sNode.k8sExtToOsPatchPortName())
+                        .build();
+        ifaceConfig.addPatchMode(k8sNode.osToK8sExtPatchPortName(), osIntK8sExPatchDesc);
     }
 
     private void createRouterPatchInterfaces(DeviceId ovsdb, K8sBridge bridge, K8sNode k8sNode) {