diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2019-01-27 00:35:04 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-01-27 00:35:04 +0000 |
commit | c79a76d766aa7049d55304bab3dc96a283f556e4 (patch) | |
tree | 9cedc96c0b3393cc8991839ad8a00d3c4d7a467e /functest/opnfv_tests/vnf/epc/juju_epc.py | |
parent | 9c9cbd16e0e3bd0ea8d18da4cfc093d651e498a7 (diff) | |
parent | 9e4e6f049fa7d5cce8db61dfa2ebebc55f91c1d8 (diff) |
Merge "Stop using urljoin when adding v3"
Diffstat (limited to 'functest/opnfv_tests/vnf/epc/juju_epc.py')
-rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 4 |
1 files changed, 1 insertions, 3 deletions
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 |