diff options
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_openims.py')
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_openims.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index 541c78611..4a7e4b968 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -17,7 +17,6 @@ import time import pkg_resources import yaml - from snaps.openstack.create_image import OpenStackImage, ImageSettings from snaps.openstack.create_flavor import OpenStackFlavor, FlavorSettings from snaps.openstack.create_security_group import ( @@ -34,6 +33,7 @@ from snaps.openstack.create_network import ( from snaps.openstack.create_router import OpenStackRouter, RouterSettings from snaps.openstack.create_instance import ( VmInstanceSettings, OpenStackVmInstance) +from snaps.openstack.utils import keystone_utils from functest.opnfv_tests.openstack.snaps import snaps_utils import functest.core.vnf as vnf @@ -43,7 +43,6 @@ from functest.utils.constants import CONST from org.openbaton.cli.errors.errors import NfvoException from org.openbaton.cli.agents.agents import MainAgent - __author__ = "Pauls, Michael <michael.pauls@fokus.fraunhofer.de>" # ---------------------------------------------------------- # @@ -204,12 +203,15 @@ class OpenImsVnf(vnf.VnfOnBoarding): """Prepare testscase (Additional pre-configuration steps).""" super(OpenImsVnf, self).prepare() + public_auth_url = keystone_utils.get_endpoint( + self.snaps_creds, 'identity') + self.logger.info("Additional pre-configuration steps") self.creds = { "tenant": self.tenant_name, "username": self.tenant_name, "password": self.tenant_name, - "auth_url": os_utils.get_credentials()['auth_url'] + "auth_url": public_auth_url } self.prepare_images() self.prepare_flavor() @@ -661,8 +663,6 @@ class OpenImsVnf(vnf.VnfOnBoarding): time.sleep(60) else: self.logger.info("No need to terminate the VNF...") - # os_utils.delete_instance(nova_client=os_utils.get_nova_client(), - # instance_id=self.mano_instance_id) except (NfvoException, KeyError) as exc: self.logger.error('Unexpected error cleaning - %s', exc) @@ -674,13 +674,13 @@ class OpenImsVnf(vnf.VnfOnBoarding): port_name='%s_port' % self.case_name) snaps_utils.neutron_utils.delete_port(neutron_client, port) time.sleep(10) - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except self.logger.error('Unexpected error cleaning - %s', exc) try: self.logger.info("Deleting Open Baton Floating IP...") snaps_utils.neutron_utils.delete_floating_ip( neutron_client, self.mano['details']['fip']) - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except self.logger.error('Unexpected error cleaning - %s', exc) for resource in reversed(self.created_resources): |