summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-01-27 00:06:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-27 00:06:23 +0000
commitef83a281d91e7fd8da4c5aa2fdac631b414d9fe6 (patch)
treed595ea8b01c58635035b1cc236babffcb6309286
parenta10e5b40342e50183fd883e8279bcbe395f2c63f (diff)
parentdcfecb40d796ba35f713c1f922f1b9353cfc64d6 (diff)
Merge "Stop using urljoin when adding v3" into stable/gambia
-rw-r--r--functest/opnfv_tests/openstack/vmtp/vmtp.py4
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py4
2 files changed, 2 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index 6bad9aec2..3462ec063 100644
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -29,7 +29,6 @@ import tempfile
import time
import yaml
-import six
from xtesting.core import testcase
from functest.core import singlevm
@@ -138,8 +137,7 @@ class Vmtp(singlevm.VmReady2):
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')
+ new_env["OS_AUTH_URL"] = "{}/v3".format(new_env["OS_AUTH_URL"])
try:
del new_env['OS_TENANT_NAME']
del new_env['OS_TENANT_ID']
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index ad4591fd6..ea09084df 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -19,7 +19,6 @@ import sys
from copy import deepcopy
import pkg_resources
-import six
from functest.core import singlevm
from functest.utils import config
@@ -140,8 +139,7 @@ class JujuEpc(singlevm.VmReady2):
try:
self.public_auth_url = self.get_public_auth_url(self.orig_cloud)
if not self.public_auth_url.endswith(('v3', 'v3/')):
- self.public_auth_url = six.moves.urllib.parse.urljoin(
- self.public_auth_url, 'v3')
+ self.public_auth_url = "{}/v3".format(self.public_auth_url)
except Exception: # pylint: disable=broad-except
self.public_auth_url = None
self.sec = None