aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-11-18 16:16:23 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-11-18 16:22:27 +0100
commit09ba0a6fb4913accb82a5fccbb0ca7cf87649ec0 (patch)
tree631c39ff1921addc8169227039a5d36a43ef0833
parent52a05964c81e10c0bde827441fbbaf0bc7ca7bda (diff)
Use EXTERNAL_NETWORK as a fallback if no tenant network
It pleases the networking configuration proposed by Airship. Change-Id: I24bc4613557c61db93d543cde730cd872e0176e0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 5b96694ec402cede3e0ce3b57fa7e7cff281f179)
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index e2b0b07bd..3ffec0cfb 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -130,7 +130,14 @@ class RallyBase(singlevm.VmReady2):
if self.network:
task_args['netid'] = str(self.network.id)
else:
- task_args['netid'] = ''
+ LOGGER.warning(
+ 'No tenant network created. '
+ 'Trying EXTERNAL_NETWORK as a fallback')
+ if env.get("EXTERNAL_NETWORK"):
+ network = self.cloud.get_network(env.get("EXTERNAL_NETWORK"))
+ task_args['netid'] = str(network.id) if network else ''
+ else:
+ task_args['netid'] = ''
return task_args