Less restriction on shared networks: it can be allowed on externals
authorFlavio Fernandes <ffernand@redhat.com>
Tue, 29 Sep 2015 14:57:03 +0000 (10:57 -0400)
committerFlavio Fernandes <ffernand@redhat.com>
Tue, 29 Sep 2015 15:23:01 +0000 (11:23 -0400)
Change-Id: I0a66758731eb35a73623c6f663792b9dffbfec08
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java

index b867ef3200bc3fcd00b26c179548a8adce18fa50..a0066c90f49dc674830cfa217f702bca8557a6c7 100644 (file)
@@ -55,8 +55,8 @@ public class NetworkHandler extends AbstractHandler implements INeutronNetworkAw
      */
     @Override
     public int canCreateNetwork(NeutronNetwork network) {
-        if (network.isShared()) {
-            LOG.error(" Network shared attribute not supported ");
+        if (network.isShared() && !network.getRouterExternal()) {
+            LOG.error("Shared attribute is only supported on external networks");
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         }
 
@@ -89,8 +89,8 @@ public class NetworkHandler extends AbstractHandler implements INeutronNetworkAw
     @Override
     public int canUpdateNetwork(NeutronNetwork delta,
                                 NeutronNetwork original) {
-        if (delta.isShared()) {
-            LOG.error(" Network shared attribute not supported ");
+        if (delta.isShared() && !delta.getRouterExternal()) {
+            LOG.error("Shared attribute is only supported on external networks");
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         }