commit 7709eb433499a8451e8a16c028ce95dc7d914d9c
author Jian Li <pyguni@gmail.com> Wed May 08 15:58:04 2019 +0900
committer Jian Li <pyguni@gmail.com> Thu Aug 29 16:10:32 2019 +0900
tree c0e7ce4d7a0d6d06f00562e3b9dea733f46d1580
parent 5a9c2bbe306ffeade783ebb6c7aac42f303c1462

Refer to external bridge and gateway IP from k8s node store

Change-Id: I7dab97ead59e3746b67e6e3bedc3a2c6fea41bf1

apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java

diff --git a/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java b/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java
index d93c8dc..166b528 100644
--- a/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java
+++ b/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java
@@ -49,6 +49,18 @@
     private static final IpAddress MANAGEMENT_IP = IpAddress.valueOf("10.10.10.10");
     private static final IpAddress DATA_IP = IpAddress.valueOf("20.20.20.20");
 
+    private static final String BRIDGE_INTF_1 = "eth1";
+    private static final String BRIDGE_INTF_2 = "eth2";
+
+    private static final IpAddress EXT_BRIDGE_IP_1 = IpAddress.valueOf("10.10.10.5");
+    private static final IpAddress EXT_BRIDGE_IP_2 = IpAddress.valueOf("20.20.20.5");
+
+    private static final IpAddress EXT_GATEWAY_IP_1 = IpAddress.valueOf("10.10.10.1");
+    private static final IpAddress EXT_GATEWAY_IP_2 = IpAddress.valueOf("20.20.20.1");
+
+    private static final String POD_CIDR_1 = "10.10.0.0/24";
+    private static final String POD_CIDR_2 = "20.20.0.0/24";
+
     private K8sNode refNode;
 
     private static final K8sNode K8S_NODE_1 = createNode(
@@ -56,22 +68,34 @@
             MINION,
             DEVICE_1,
             DEVICE_1,
+            BRIDGE_INTF_1,
             TEST_IP,
-            INIT);
+            INIT,
+            EXT_BRIDGE_IP_1,
+            EXT_GATEWAY_IP_1,
+            POD_CIDR_1);
     private static final K8sNode K8S_NODE_2 = createNode(
             HOSTNAME_1,
             MINION,
             DEVICE_1,
             DEVICE_1,
+            BRIDGE_INTF_1,
             TEST_IP,
-            INIT);
+            INIT,
+            EXT_BRIDGE_IP_1,
+            EXT_GATEWAY_IP_1,
+            POD_CIDR_1);
     private static final K8sNode K8S_NODE_3 = createNode(
             HOSTNAME_2,
             MINION,
             DEVICE_2,
             DEVICE_2,
+            BRIDGE_INTF_2,
             TEST_IP,
-            INIT);
+            INIT,
+            EXT_BRIDGE_IP_2,
+            EXT_GATEWAY_IP_2,
+            POD_CIDR_2);
 
     /**
      * Initial setup for this unit test.
@@ -85,7 +109,11 @@
                 .dataIp(DATA_IP)
                 .intgBridge(DEVICE_1.id())
                 .extBridge(DEVICE_1.id())
+                .extIntf(BRIDGE_INTF_1)
                 .state(COMPLETE)
+                .extBridgeIp(EXT_BRIDGE_IP_1)
+                .extGatewayIp(EXT_GATEWAY_IP_1)
+                .podCidr(POD_CIDR_1)
                 .build();
     }
 
@@ -140,9 +168,13 @@
                 .type(MINION)
                 .intgBridge(DEVICE_1.id())
                 .extBridge(DEVICE_1.id())
+                .extIntf(BRIDGE_INTF_1)
                 .managementIp(TEST_IP)
                 .dataIp(TEST_IP)
                 .state(INIT)
+                .extBridgeIp(EXT_BRIDGE_IP_1)
+                .extGatewayIp(EXT_GATEWAY_IP_1)
+                .podCidr(POD_CIDR_1)
                 .build();
     }
 
@@ -155,9 +187,13 @@
                 .hostname(HOSTNAME_1)
                 .intgBridge(DEVICE_1.id())
                 .extBridge(DEVICE_1.id())
+                .extIntf(BRIDGE_INTF_1)
                 .managementIp(TEST_IP)
                 .dataIp(TEST_IP)
                 .state(INIT)
+                .extBridgeIp(EXT_BRIDGE_IP_1)
+                .extGatewayIp(EXT_GATEWAY_IP_1)
+                .podCidr(POD_CIDR_1)
                 .build();
     }
 
@@ -172,8 +208,12 @@
                 .type(MINION)
                 .intgBridge(DEVICE_1.id())
                 .extBridge(DEVICE_1.id())
+                .extIntf(BRIDGE_INTF_1)
                 .dataIp(TEST_IP)
                 .state(INIT)
+                .extBridgeIp(EXT_BRIDGE_IP_1)
+                .extGatewayIp(EXT_GATEWAY_IP_1)
+                .podCidr(POD_CIDR_1)
                 .build();
     }
 
@@ -197,15 +237,21 @@
 
     private static K8sNode createNode(String hostname, Type type,
                                       Device intgBridge, Device extBridge,
-                                      IpAddress ipAddr, K8sNodeState state) {
+                                      String bridgeIntf, IpAddress ipAddr,
+                                      K8sNodeState state, IpAddress extBridgeIp,
+                                      IpAddress extGatewayIp, String podCidr) {
         return DefaultK8sNode.builder()
                 .hostname(hostname)
                 .type(type)
                 .intgBridge(intgBridge.id())
                 .extBridge(extBridge.id())
+                .extIntf(bridgeIntf)
                 .managementIp(ipAddr)
                 .dataIp(ipAddr)
                 .state(state)
+                .extBridgeIp(extBridgeIp)
+                .extGatewayIp(extGatewayIp)
+                .podCidr(podCidr)
                 .build();
     }
 }