summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-22 14:01:00 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-24 11:19:34 +0200
commit821d86248054017ea8ac40b99759df71fa639e3b (patch)
tree3e3d2e3ab76a1a69815a3f5efcb29bdd52b3ec07
parent90ca47a7027f37d7528ec0b022306ba6472fd412 (diff)
Skip searching network in project if external or shared
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>
-rw-r--r--snaps/config/network.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/snaps/config/network.py b/snaps/config/network.py
index ffafbb6..b142480 100644
--- a/snaps/config/network.py
+++ b/snaps/config/network.py
@@ -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)