Prevent the network shared attribute from being updated

This modifies canUpdateNetwork() to check the network shared
attribute.

Change-Id: Ie875c4cc437c27f6b202e4e26dc1acd1aeff41f8
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 521ed27130c1a708aad35ef8f1173f0e4bef3b6c..38aa7e7f568e582e5b12f6ad817f6da59de866fb 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
@@ -109,6 +109,11 @@ public class NetworkHandler extends AbstractHandler
     @Override
     public int canUpdateNetwork(NeutronNetwork delta,
                                 NeutronNetwork original) {
+        if (delta.isShared()) {
+            logger.error(" Network shared attribute not supported ");
+            return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
+        }
+
         logger.trace("canUpdateNetwork: network delta {} --- original {}", delta, original);
         return HttpURLConnection.HTTP_OK;
     }

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 8d97e860724e64720c5fc3644eee22d861cbad21..2582b9e9c8d57edb7615a93077f4ac7566b8293b 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
@@ -81,6 +81,10 @@ public class NetworkHandlerTest {
      */
     @Test
     public void testCanUpdateNetwork() {
+        when(neutronNetwork.isShared())
+                                    .thenReturn(true)
+                                    .thenReturn(false);
+        assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_NOT_ACCEPTABLE, networkHandler.canUpdateNetwork(neutronNetwork, neutronNetwork));
         assertEquals("Error, did not return the correct HTTP flag", HttpURLConnection.HTTP_OK, networkHandler.canUpdateNetwork(neutronNetwork, neutronNetwork));
     }