From 9e4e6f049fa7d5cce8db61dfa2ebebc55f91c1d8 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 27 Jan 2019 00:06:32 +0100 Subject: Stop using urljoin when adding v3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit urljoin works here only if url ends by /. It replaces identity by v3 when running vs devstack. Change-Id: Id896f2b54dfcabadaad1137deef91b1cb07c697d Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/vnf/epc/juju_epc.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'functest/opnfv_tests/vnf') 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 -- cgit 1.2.3-korg