Delete redundant tests in Network, Port and Subnet handlers

This removes redundant tests according to Neutron*Northbound.java.
HTTP_OK is returned now if the neutron resource can be created, updated
or deleted.

Change-Id: I621121f020123653da8ef87fef62a27ab951629e
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
index 38aa7e7f568e582e5b12f6ad817f6da59de866fb..02913f0ffefd66f1a7a49b3ae233839e57215f27 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
@@ -72,7 +72,7 @@ public class NetworkHandler extends AbstractHandler
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         }
 
-        return HttpURLConnection.HTTP_CREATED;
+        return HttpURLConnection.HTTP_OK;
     }
 
     /**
@@ -82,14 +82,6 @@ public class NetworkHandler extends AbstractHandler
      */
     @Override
     public void neutronNetworkCreated(NeutronNetwork network) {
-        int result = HttpURLConnection.HTTP_BAD_REQUEST;
-        logger.trace("neutronNetworkCreated: network: {}", network);
-        result = canCreateNetwork(network);
-        if (result != HttpURLConnection.HTTP_CREATED) {
-            logger.debug("Network creation failed {} ", result);
-            return;
-        }
-
         enqueueEvent(new NorthboundEvent(network, Action.ADD));
     }
     private void doNeutronNetworkCreated(NeutronNetwork network) {
@@ -114,7 +106,6 @@ public class NetworkHandler extends AbstractHandler
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         }
 
-        logger.trace("canUpdateNetwork: network delta {} --- original {}", delta, original);
         return HttpURLConnection.HTTP_OK;
     }
 
@@ -155,13 +146,6 @@ public class NetworkHandler extends AbstractHandler
     private void doNeutronNetworkDeleted(NeutronNetwork network) {
         neutronL3Adapter.handleNeutronNetworkEvent(network, Action.DELETE);
 
-        int result = canDeleteNetwork(network);
-        logger.trace("canDeleteNetwork: network: {}", network);
-        if  (result != HttpURLConnection.HTTP_OK) {
-            logger.error(" deleteNetwork validation failed for result - {} ",
-                    result);
-            return;
-        }
         /* Is this the last Neutron tenant network */
         List <NeutronNetwork> networks;
         if (neutronNetworkCache != null) {

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
index 4a2e5c19939ef77907a4c80267f757513c450c64..78d9928fb36a7362e7f4951e46dfdcdc26d1532c 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
@@ -56,7 +56,7 @@ public class PortHandler extends AbstractHandler
      */
     @Override
     public int canCreatePort(NeutronPort port) {
-        return HttpURLConnection.HTTP_CREATED;
+        return HttpURLConnection.HTTP_OK;
     }
 
     /**
@@ -66,12 +66,6 @@ public class PortHandler extends AbstractHandler
      */
     @Override
     public void neutronPortCreated(NeutronPort neutronPort) {
-        int result = canCreatePort(neutronPort);
-        if (result != HttpURLConnection.HTTP_CREATED) {
-            logger.error(" Port create validation failed result - {} ", result);
-            return;
-        }
-
         enqueueEvent(new NorthboundEvent(neutronPort, Action.ADD));
     }
     private void doNeutronPortCreated(NeutronPort neutronPort) {
@@ -95,16 +89,7 @@ public class PortHandler extends AbstractHandler
     @Override
     public int canUpdatePort(NeutronPort delta,
                              NeutronPort original) {
-        int result = HttpURLConnection.HTTP_OK;
-        /**
-         * To basic validation of the request
-         */
-
-        if ((original == null) || (delta == null)) {
-            logger.error("port object not specified");
-            return HttpURLConnection.HTTP_BAD_REQUEST;
-        }
-        return result;
+        return HttpURLConnection.HTTP_OK;
     }
 
     /**
@@ -140,13 +125,6 @@ public class PortHandler extends AbstractHandler
      */
     @Override
     public void neutronPortDeleted(NeutronPort neutronPort) {
-
-        int result = canDeletePort(neutronPort);
-        if  (result != HttpURLConnection.HTTP_OK) {
-            logger.error(" deletePort validation failed - result {} ", result);
-            return;
-        }
-
         enqueueEvent(new NorthboundEvent(neutronPort, Action.DELETE));
     }
     private void doNeutronPortDeleted(NeutronPort neutronPort) {

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java
index f0529e46cc1958310e44520d1cebc085fb14f1be..e45c919784a59c35eb9a954feeb037dc97191e48 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java
@@ -30,7 +30,7 @@ public class SubnetHandler extends AbstractHandler implements INeutronSubnetAwar
 
     @Override
     public int canCreateSubnet(NeutronSubnet subnet) {
-        return HttpURLConnection.HTTP_CREATED;
+        return HttpURLConnection.HTTP_OK;
     }
 
     @Override
@@ -40,7 +40,7 @@ public class SubnetHandler extends AbstractHandler implements INeutronSubnetAwar
 
     @Override
     public int canUpdateSubnet(NeutronSubnet delta, NeutronSubnet original) {
-        return HttpURLConnection.HTTP_CREATED;
+        return HttpURLConnection.HTTP_OK;
     }
 
     @Override
@@ -50,8 +50,7 @@ public class SubnetHandler extends AbstractHandler implements INeutronSubnetAwar
 
     @Override
     public int canDeleteSubnet(NeutronSubnet subnet) {
-        // TODO Auto-generated method stub
-        return HttpURLConnection.HTTP_CREATED;
+        return HttpURLConnection.HTTP_OK;
     }
 
     @Override

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java
index 2582b9e9c8d57edb7615a93077f4ac7566b8293b..aaf882f9306c38205b1828388c70c704ed6784aa 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandlerTest.java
@@ -73,7 +73,7 @@ public class NetworkHandlerTest {
                                     .thenReturn(true)
                                     .thenReturn(false);
         assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_NOT_ACCEPTABLE, networkHandler.canCreateNetwork(neutronNetwork));
-        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_CREATED, networkHandler.canCreateNetwork(neutronNetwork));
+        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, networkHandler.canCreateNetwork(neutronNetwork));
     }
 
     /**
@@ -144,7 +144,6 @@ public class NetworkHandlerTest {
         when(ev.getAction()).thenReturn(Action.DELETE);
         networkHandlerSpy.processEvent(ev);
         verify(neutronL3Adapter, times(1)).handleNeutronNetworkEvent(any(NeutronNetwork.class), same(Action.DELETE));
-        verify(networkHandlerSpy, times(1)).canDeleteNetwork(any(NeutronNetwork.class));
         verify(tenantNetworkManager, times(1)).networkDeleted(anyString());
     }
 }

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandlerTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandlerTest.java
index 5136f63d6f92fc5b0c9840cf21b5914b7a77cdd5..9c76e077d7c57d7dd52db1c43a45a5632a961cd3 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandlerTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandlerTest.java
@@ -61,13 +61,12 @@ public class PortHandlerTest {
 
     @Test
     public void testCanCreatePort() {
-        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_CREATED, portHandler.canCreatePort(mock(NeutronPort.class)));
+        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, portHandler.canCreatePort(mock(NeutronPort.class)));
     }
 
     @Test
     public void testCanUpdatePort() {
         assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, portHandler.canUpdatePort(mock(NeutronPort.class), mock(NeutronPort.class)));
-        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_BAD_REQUEST, portHandler.canUpdatePort(null, null));
     }
 
     @Test

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandlerTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandlerTest.java
index 6bccefe822487c268fb0fd20e6192ceba8878d93..4ccc4ee9b4b421bca9eb1f79dcf927648a075647 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandlerTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandlerTest.java
@@ -37,17 +37,17 @@ public class SubnetHandlerTest {
 
     @Test
     public void testCanCreateSubnet() {
-        assertEquals("Error, canCreateSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_CREATED, subnetHandler.canCreateSubnet(mock(NeutronSubnet.class)));
+        assertEquals("Error, canCreateSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, subnetHandler.canCreateSubnet(mock(NeutronSubnet.class)));
     }
 
     @Test
     public void testCanUpdateSubnet() {
-        assertEquals("Error, canUpdateSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_CREATED, subnetHandler.canUpdateSubnet(mock(NeutronSubnet.class), mock(NeutronSubnet.class)));
+        assertEquals("Error, canUpdateSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, subnetHandler.canUpdateSubnet(mock(NeutronSubnet.class), mock(NeutronSubnet.class)));
     }
 
     @Test
     public void testCanDeleteSubnet() {
-        assertEquals("Error, canDeleteSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_CREATED, subnetHandler.canDeleteSubnet(mock(NeutronSubnet.class)));
+        assertEquals("Error, canDeleteSubnet() did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, subnetHandler.canDeleteSubnet(mock(NeutronSubnet.class)));
     }
 
     @Test