diff options
Diffstat (limited to 'functest')
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/cloudify_ims.py | 5 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index d97a0bcd..2fdad3c3 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -22,7 +22,6 @@ from functest.energy import energy from functest.opnfv_tests.openstack.snaps import snaps_utils import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base from functest.utils.constants import CONST -import functest.utils.openstack_utils as os_utils from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig @@ -40,6 +39,7 @@ from snaps.openstack.create_keypairs import OpenStackKeypair from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import OpenStackSecurityGroup +from snaps.openstack.utils import keystone_utils __author__ = "Valentin Boucher <valentin.boucher@orange.com>" @@ -224,7 +224,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): manager_creator.create() self.created_object.append(manager_creator) - public_auth_url = os_utils.get_endpoint('identity') + public_auth_url = keystone_utils.get_endpoint( + self.snaps_creds, 'identity') self.__logger.info("Set creds for cloudify manager") cfy_creds = dict(keystone_username=self.tenant_name, diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py index fc16977e..788a9413 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py @@ -20,8 +20,8 @@ import yaml from functest.opnfv_tests.openstack.snaps import snaps_utils import functest.opnfv_tests.vnf.router.vrouter_base as vrouter_base +from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf from functest.utils.constants import CONST -import functest.utils.openstack_utils as os_utils from git import Repo @@ -43,8 +43,8 @@ from snaps.openstack.create_security_group import OpenStackSecurityGroup from snaps.openstack.create_router import OpenStackRouter import snaps.openstack.utils.glance_utils as glance_utils +from snaps.openstack.utils import keystone_utils -from functest.opnfv_tests.vnf.router.utilvnf import Utilvnf __author__ = "Shuya Nakama <shuya.nakama@okinawaopenlabs.org>" @@ -227,7 +227,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase): manager_creator.create() self.created_object.append(manager_creator) - public_auth_url = os_utils.get_endpoint('identity') + public_auth_url = keystone_utils.get_endpoint( + self.snaps_creds, 'identity') self.__logger.info("Set creds for cloudify manager") cfy_creds = dict(keystone_username=self.tenant_name, @@ -336,7 +337,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase): self.vnf['inputs'].update(dict(keystone_password=self.tenant_name)) self.vnf['inputs'].update(dict(keystone_tenant_name=self.tenant_name)) self.vnf['inputs'].update( - dict(keystone_url=os_utils.get_endpoint('identity'))) + dict(keystone_url=keystone_utils.get_endpoint( + self.snaps_creds, 'identity'))) self.__logger.info("Create VNF Instance") cfy_client.deployments.create(descriptor.get('name'), |