Add default route option to kubevirt network
Change-Id: Ia2a2d9b34ec3c493e04d56c544c22812e32d524a
(cherry picked from commit d95d3524caff5449aded4ff9397c3ed717fc91e6)
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkCodecTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkCodecTest.java
index 492847a..667ca4b 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkCodecTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkCodecTest.java
@@ -96,6 +96,7 @@
.name("net-1")
.type(KubevirtNetwork.Type.FLAT)
.gatewayIp(IpAddress.valueOf("10.10.10.1"))
+ .defaultRoute(true)
.mtu(1500)
.cidr("10.10.10.0/24")
.hostRoutes(ImmutableSet.of(hostRoute1, hostRoute2))
@@ -121,6 +122,7 @@
assertThat(network.type().name(), is("FLAT"));
assertThat(network.cidr(), is("10.10.0.0/24"));
assertThat(network.gatewayIp().toString(), is("10.10.0.1"));
+ assertThat(network.defaultRoute(), is(true));
assertThat(network.ipPool().start().toString(), is("10.10.10.100"));
assertThat(network.ipPool().end().toString(), is("10.10.10.200"));
assertThat(network.dnses().size(), is(1));
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkJsonMatcher.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkJsonMatcher.java
index 4a67e07..7cbc587 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkJsonMatcher.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/codec/KubevirtNetworkJsonMatcher.java
@@ -35,6 +35,7 @@
private static final String MTU = "mtu";
private static final String SEGMENT_ID = "segmentId";
private static final String GATEWAY_IP = "gatewayIp";
+ private static final String DEFAULT_ROUTE = "defaultRoute";
private static final String CIDR = "cidr";
private static final String HOST_ROUTES = "hostRoutes";
private static final String IP_POOL = "ipPool";
@@ -86,6 +87,14 @@
return false;
}
+ // check default route
+ boolean jsonDefaultRoute = jsonNode.get(DEFAULT_ROUTE).asBoolean();
+ boolean defaultRoute = network.defaultRoute();
+ if (jsonDefaultRoute != defaultRoute) {
+ description.appendText("Default route was " + jsonDefaultRoute);
+ return false;
+ }
+
// check CIDR
String jsonCidr = jsonNode.get(CIDR).asText();
String cidr = network.cidr();
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManagerTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManagerTest.java
index 1d0c676..5474433 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManagerTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManagerTest.java
@@ -61,6 +61,7 @@
private static final Integer MTU = 1500;
private static final String SEGMENT_ID = "1";
private static final IpAddress GATEWAY_IP = IpAddress.valueOf("10.10.10.1");
+ private static final boolean DEFAULT_ROUTE = true;
private static final String CIDR = "10.10.10.0/24";
private static final IpAddress IP_POOL_START = IpAddress.valueOf("10.10.10.100");
private static final IpAddress IP_POOL_END = IpAddress.valueOf("10.10.10.200");
@@ -72,6 +73,7 @@
.mtu(MTU)
.segmentId(SEGMENT_ID)
.gatewayIp(GATEWAY_IP)
+ .defaultRoute(DEFAULT_ROUTE)
.cidr(CIDR)
.ipPool(new KubevirtIpPool(IP_POOL_START, IP_POOL_END))
.hostRoutes(ImmutableSet.of())
@@ -84,6 +86,7 @@
.mtu(MTU)
.segmentId(SEGMENT_ID)
.gatewayIp(GATEWAY_IP)
+ .defaultRoute(DEFAULT_ROUTE)
.cidr(CIDR)
.ipPool(new KubevirtIpPool(IP_POOL_START, IP_POOL_END))
.hostRoutes(ImmutableSet.of())
diff --git a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResourceTest.java b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResourceTest.java
index 8a06018..b453dad 100644
--- a/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResourceTest.java
+++ b/apps/kubevirt-networking/app/src/test/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkWebResourceTest.java
@@ -88,6 +88,7 @@
.cidr("10.10.10.0/24")
.mtu(1500)
.gatewayIp(IpAddress.valueOf("10.10.10.1"))
+ .defaultRoute(true)
.ipPool(new KubevirtIpPool(IpAddress.valueOf("10.10.10.100"),
IpAddress.valueOf("10.10.10.200")))
.build();