Skip searching network in project if external or shared 79/60079/3
authorCédric Ollivier <cedric.ollivier@orange.com>
Sun, 22 Jul 2018 12:01:00 +0000 (14:01 +0200)
committerCédric Ollivier <cedric.ollivier@orange.com>
Tue, 24 Jul 2018 09:19:34 +0000 (11:19 +0200)
It meets the OpenStack rules:
  - any router can be connected to an external network.
  - any VM can be connected to a shared network

It completes https://gerrit.opnfv.org/gerrit/59865 which partially
skip the lookup.

Then CreateRouterSuccessTests passes when the external network is not
owned by the user running snaps_smoke.

JIRA: SNAPS-320

Change-Id: I2c60363002c6b667f90ff3f5f984eace4fa86c99
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
snaps/config/network.py

index ffafbb6..b142480 100644 (file)
@@ -462,7 +462,7 @@ class PortConfig(object):
         try:
             network = neutron_utils.get_network(
                 neutron, keystone, network_name=self.network_name)
-            if network and (not network.shared or not network.external):
+            if network and not (network.shared or network.external):
                 network = neutron_utils.get_network(
                     neutron, keystone, network_name=self.network_name,
                     project_name=project_name)