Add VM name field to floating IP CRD of kubevirt
Change-Id: I493199f0e2a5c0b7b5fffc65c513bb4feeb2eb10
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpCodecTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpCodecTest.java
index f8b5d14..216f3e0 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpCodecTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpCodecTest.java
@@ -74,6 +74,7 @@
.networkName("flat-1")
.floatingIp(IpAddress.valueOf("10.10.10.10"))
.podName("pod-1")
+ .vmName("vm-1")
.fixedIp(IpAddress.valueOf("20.20.20.20"))
.build();
@@ -90,6 +91,7 @@
assertEquals("flat-1", floatingIp.networkName());
assertEquals("10.10.10.10", floatingIp.floatingIp().toString());
assertEquals("pod-1", floatingIp.podName());
+ assertEquals("vm-1", floatingIp.vmName());
assertEquals("20.20.20.20", floatingIp.fixedIp().toString());
}
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpJsonMatcher.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpJsonMatcher.java
index ccfb76c..41d8cfe 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpJsonMatcher.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtFloatingIpJsonMatcher.java
@@ -30,6 +30,7 @@
private static final String ROUTER_NAME = "routerName";
private static final String NETWORK_NAME = "networkName";
private static final String POD_NAME = "podName";
+ private static final String VM_NAME = "vmName";
private static final String FLOATING_IP = "floatingIp";
private static final String FIXED_IP = "fixedIp";
@@ -81,6 +82,15 @@
}
}
+ JsonNode jsonVmName = jsonNode.get(VM_NAME);
+ if (jsonVmName != null) {
+ if (!floatingIp.vmName().equals(jsonVmName.asText())) {
+ description.appendText("VM name was " + jsonVmName);
+ return false;
+ }
+ }
+
+
// check fixed IP
JsonNode jsonFixedIp = jsonNode.get(FIXED_IP);
if (jsonFixedIp != null) {