Add VM name field in kubevirt port object, expose via CLI and REST
Change-Id: I0ac84073fa7692862314fdf8862b4e3a256dd2d8
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortCodecTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortCodecTest.java
index e928b90..5c21a28 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortCodecTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortCodecTest.java
@@ -72,6 +72,7 @@
@Test
public void testKubevirtPortEncode() {
KubevirtPort port = DefaultKubevirtPort.builder()
+ .vmName("test-vm-1")
.networkId("net-1")
.macAddress(MacAddress.valueOf("11:22:33:44:55:66"))
.ipAddress(IpAddress.valueOf("10.10.10.100"))
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortJsonMatcher.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortJsonMatcher.java
index e9fa500..1fc6207 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortJsonMatcher.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtPortJsonMatcher.java
@@ -30,6 +30,7 @@
private final KubevirtPort port;
+ private static final String VM_NAME = "vmName";
private static final String NETWORK_ID = "networkId";
private static final String MAC_ADDRESS = "macAddress";
private static final String IP_ADDRESS = "ipAddress";
@@ -42,6 +43,14 @@
@Override
protected boolean matchesSafely(JsonNode jsonNode, Description description) {
+ // check VM name
+ String jsonVmName = jsonNode.get(VM_NAME).asText();
+ String vmName = port.vmName();
+ if (!jsonVmName.equals(vmName)) {
+ description.appendText("VM name was " + jsonVmName);
+ return false;
+ }
+
// check network ID
String jsonNetworkId = jsonNode.get(NETWORK_ID).asText();
String networkId = port.networkId();
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtPortManagerTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtPortManagerTest.java
index e6e4219..d9a9f77 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtPortManagerTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtPortManagerTest.java
@@ -57,6 +57,7 @@
private static final String PORT_MAC = "00:11:22:33:44:55";
private static final KubevirtPort PORT = DefaultKubevirtPort.builder()
+ .vmName("test-vm-1")
.networkId(NETWORK_ID)
.deviceId(DeviceId.deviceId("dev-1"))
.ipAddress(IpAddress.valueOf("20.20.20.20"))
@@ -64,6 +65,7 @@
.portNumber(PortNumber.portNumber("1"))
.build();
private static final KubevirtPort PORT_UPDATED = DefaultKubevirtPort.builder()
+ .vmName("test-vm-1")
.networkId(UPDATED_ID)
.deviceId(DeviceId.deviceId("dev-1"))
.ipAddress(IpAddress.valueOf("20.20.20.20"))