commit 121ddfe9d50cab1a49f095e2ae77d385c823ff8f
author Jian Li <pyguni@gmail.com> Tue Aug 27 02:07:05 2019 +0900
committer Jian Li <pyguni@gmail.com> Fri Aug 30 10:59:42 2019 +0900
tree 95c9ae105819bd01d88eca0eaa923bc0f06e9f49
parent 1ea0271488233e7de93f7de3e44bee56d1adafdf

Fix: allow to invoke service IP from local k8s node

Change-Id: I8c39703f35319bb51bbd175e7ff717d5e6ec5250

apps/k8s-node/app/src/main/java/org/onosproject/k8snode/cli/K8sNodeCheckCommand.java

diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/cli/K8sNodeCheckCommand.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/cli/K8sNodeCheckCommand.java
index 69c64b9..f421de0 100644
--- a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/cli/K8sNodeCheckCommand.java
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/cli/K8sNodeCheckCommand.java
@@ -32,6 +32,9 @@
 import static org.onosproject.k8snode.api.Constants.GRE_TUNNEL;
 import static org.onosproject.k8snode.api.Constants.INTEGRATION_BRIDGE;
 import static org.onosproject.k8snode.api.Constants.INTEGRATION_TO_EXTERNAL_BRIDGE;
+import static org.onosproject.k8snode.api.Constants.INTEGRATION_TO_LOCAL_BRIDGE;
+import static org.onosproject.k8snode.api.Constants.LOCAL_BRIDGE;
+import static org.onosproject.k8snode.api.Constants.LOCAL_TO_INTEGRATION_BRIDGE;
 import static org.onosproject.k8snode.api.Constants.PHYSICAL_EXTERNAL_BRIDGE;
 import static org.onosproject.k8snode.api.Constants.VXLAN_TUNNEL;
 import static org.onosproject.net.AnnotationKeys.PORT_NAME;
@@ -74,6 +77,7 @@
                     intgBridge.annotations());
             printPortState(deviceService, node.intgBridge(), INTEGRATION_BRIDGE);
             printPortState(deviceService, node.intgBridge(), INTEGRATION_TO_EXTERNAL_BRIDGE);
+            printPortState(deviceService, node.intgBridge(), INTEGRATION_TO_LOCAL_BRIDGE);
             if (node.dataIp() != null) {
                 printPortState(deviceService, node.intgBridge(), VXLAN_TUNNEL);
                 printPortState(deviceService, node.intgBridge(), GRE_TUNNEL);
@@ -103,6 +107,19 @@
                     EXTERNAL_BRIDGE,
                     node.extBridge());
         }
+
+        print("[Local Bridge Status]");
+        Device localBridge = deviceService.getDevice(node.localBridge());
+        if (localBridge != null) {
+            print("%s %s=%s available=%s %s",
+                    deviceService.isAvailable(localBridge.id()) ? MSG_OK : MSG_ERROR,
+                    LOCAL_BRIDGE,
+                    localBridge.id(),
+                    deviceService.isAvailable(localBridge.id()),
+                    localBridge.annotations());
+            printPortState(deviceService, node.localBridge(), LOCAL_BRIDGE);
+            printPortState(deviceService, node.localBridge(), LOCAL_TO_INTEGRATION_BRIDGE);
+        }
     }
 
     private void printPortState(DeviceService deviceService,