Supports Mm5 Interface in KubevirtNode app.
- Adds datacenter and cluster id parameter to KubevirtApiConfig
- Implements related REST API web resource
Change-Id: Ib1b6cbc1dbbe11def4d97d78c2e74b5eeec560dc
diff --git a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodecTest.java b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodecTest.java
index 16af906..06dfd48 100644
--- a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodecTest.java
+++ b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodecTest.java
@@ -89,7 +89,10 @@
.serviceFqdn("kubevirt.edgestack.svc.cluster.local")
.apiServerFqdn("kubernetes.default.svc.cluster.local")
.controllerIp(IpAddress.valueOf("127.0.0.1"))
+ .datacenterId("BD")
+ .clusterId("BD-MEH-CT01")
.build();
+
ObjectNode configJson = kubevirtApiConfigCodec.encode(config, context);
assertThat(configJson, matchesKubevirtApiConfig(config));
}
@@ -113,6 +116,9 @@
assertEquals("kubevirt.edgestack.svc.cluster.local", config.serviceFqdn());
assertEquals("kubernetes.default.svc.cluster.local", config.apiServerFqdn());
assertEquals("127.0.0.1", config.controllerIp().toString());
+ assertEquals("BD", config.datacenterId());
+ assertEquals("BD-MEH-CT01", config.clusterId());
+
}
private KubevirtApiConfig getKubevirtApiConfig(String resourceName) throws IOException {
diff --git a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManagerTest.java b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManagerTest.java
index 0e5db34..98a6b1e 100644
--- a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManagerTest.java
+++ b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManagerTest.java
@@ -74,12 +74,16 @@
.ipAddress(IpAddress.valueOf("10.10.10.2"))
.port(6443)
.state(DISCONNECTED)
+ .datacenterId("BD")
+ .clusterId("BD-MEH-CT01")
.build();
apiConfig2 = DefaultKubevirtApiConfig.builder()
.scheme(KubevirtApiConfig.Scheme.HTTP)
.ipAddress(IpAddress.valueOf("10.10.10.3"))
.port(6443)
.state(DISCONNECTED)
+ .datacenterId("BD")
+ .clusterId("BD-MEH-CT01")
.build();
configStore = new DistributedKubevirtApiConfigStore();
diff --git a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResourceTest.java b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResourceTest.java
index e6d1034..5a72b49 100644
--- a/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResourceTest.java
+++ b/apps/kubevirt-node/app/src/test/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResourceTest.java
@@ -87,6 +87,8 @@
.caCertData("caCertData")
.clientCertData("clientCertData")
.clientKeyData("clientKeyData")
+ .datacenterId("DB")
+ .clusterId("BD-MEH-CT01")
.build();
}
diff --git a/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/codec/KubevirtApiConfig.json b/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/codec/KubevirtApiConfig.json
index b95c29a..5f48d0a 100644
--- a/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/codec/KubevirtApiConfig.json
+++ b/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/codec/KubevirtApiConfig.json
@@ -8,5 +8,7 @@
"clientKeyData": "clientKeyData",
"serviceFqdn": "kubevirt.edgestack.svc.cluster.local",
"apiServerFqdn": "kubernetes.default.svc.cluster.local",
- "controllerIp": "127.0.0.1"
+ "controllerIp": "127.0.0.1",
+ "datacenterId": "BD",
+ "clusterId": "BD-MEH-CT01"
}
\ No newline at end of file
diff --git a/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/web/kubevirt-api-config.json b/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/web/kubevirt-api-config.json
index 7a5c5f5..b256cc4 100644
--- a/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/web/kubevirt-api-config.json
+++ b/apps/kubevirt-node/app/src/test/resources/org/onosproject/kubevirtnode/web/kubevirt-api-config.json
@@ -6,5 +6,7 @@
"caCertData": "caCertData",
"clientCertData": "clientCertData",
"clientKeyData": "clientKeyData",
- "controllerIp": "127.0.0.1"
+ "controllerIp": "127.0.0.1",
+ "datacenterId": "BD",
+ "clusterId": "BD-MEH-CT01"
}
\ No newline at end of file