ONOS-6382 fail removal of non-existent virtual network with IllegalStateException
Change-Id: I50a81f79660ff6fc63a5426368f2edbcec993155
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
index 44395ef..202046e 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManagerTest.java
@@ -189,6 +189,18 @@
}
/**
+ * Tests removal of a virtual network twice.
+ */
+ @Test(expected = IllegalStateException.class)
+ public void testRemoveVnetTwice() {
+ manager.registerTenantId(TenantId.tenantId(tenantIdValue1));
+ VirtualNetwork virtualNetwork =
+ manager.createVirtualNetwork(TenantId.tenantId(tenantIdValue1));
+ manager.removeVirtualNetwork(virtualNetwork.id());
+ manager.removeVirtualNetwork(virtualNetwork.id());
+ }
+
+ /**
* Tests add and remove of virtual networks.
*/
@Test
@@ -205,10 +217,6 @@
manager.removeVirtualNetwork(virtualNetwork.id());
assertEquals("The expected virtual network size does not match",
--remaining, manager.getVirtualNetworks(TenantId.tenantId(tenantIdValue1)).size());
- // attempt to remove the same virtual network again.
- manager.removeVirtualNetwork(virtualNetwork.id());
- assertEquals("The expected virtual network size does not match",
- remaining, manager.getVirtualNetworks(TenantId.tenantId(tenantIdValue1)).size());
}
virtualNetworks = manager.getVirtualNetworks(TenantId.tenantId(tenantIdValue1));
assertTrue("The virtual network set should be empty.", virtualNetworks.isEmpty());