summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-10-23 17:09:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-23 17:09:19 +0000
commit41a82f98b3afa096a3a3399c780e975a79e2324a (patch)
treee973b5b2b70e904dcd2e9baa32e92797b3430032
parentaf258063fb4453a6daba2bef59738f59c76d0f77 (diff)
parent5ac878fe7cccbfe5cb829488d0aedc307dd42885 (diff)
Merge "Overprotect vmtp vs unversioned OS_AUTH_URL"
-rw-r--r--functest/opnfv_tests/openstack/vmtp/vmtp.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index 8831078db..d37e344ce 100644
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -29,6 +29,7 @@ import tempfile
import time
import yaml
+import six
from xtesting.core import testcase
from functest.core import singlevm
@@ -129,6 +130,9 @@ class Vmtp(singlevm.VmReady2):
OS_PROJECT_NAME=self.project.project.name,
OS_PROJECT_ID=self.project.project.id,
OS_PASSWORD=self.project.password)
+ if not new_env["OS_AUTH_URL"].endswith(('v3', 'v3/')):
+ new_env["OS_AUTH_URL"] = six.moves.urllib.parse.urljoin(
+ new_env["OS_AUTH_URL"], 'v3')
try:
del new_env['OS_TENANT_NAME']
del new_env['OS_TENANT_ID']