aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
diff options
context:
space:
mode:
authorCédric Ollivier <ollivier.cedric@gmail.com>2018-07-09 22:39:42 +0200
committerCédric Ollivier <ollivier.cedric@gmail.com>2018-07-10 13:53:53 +0200
commit8b2f524f0f17f06bf1de02e0165230bad218132b (patch)
tree13be55076e9159d12baaff581df37922101ec87f /functest/opnfv_tests/vnf/router/cloudify_vrouter.py
parent036cb7d9075f7eee45e7533d8c37a5b89e6c6dd5 (diff)
Force region to RegionOne if OS_REGION_NAME is unset
tempest still selects the first one if unset [1]. JIRA: FUNCTEST-990 [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: I238d47173c2c4aa1db694028e4d44b80b0e280f1 Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/router/cloudify_vrouter.py')
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index a88200339..e56f23cfc 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -335,7 +335,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.vnf['inputs'].update(dict(
keystone_project_domain_name=snaps_creds.project_domain_name))
self.vnf['inputs'].update(dict(
- region=snaps_creds.region_name))
+ region=snaps_creds.region_name if snaps_creds.region_name else (
+ 'RegionOne')))
self.vnf['inputs'].update(dict(
keystone_url=keystone_utils.get_endpoint(
snaps_creds, 'identity')))