From 01cb2b343c0de7c67a4640d4d3794d924b68c6b9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 18 Dec 2017 09:47:39 +0100 Subject: Switch to public keystone endpoint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also reorders imports and removes dead code. Change-Id: I1e7bd03a4bc07df4705c9beed83a37a022ddbd52 Signed-off-by: Cédric Ollivier --- .../opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 30 +++++++++++----------- functest/opnfv_tests/vnf/ims/orchestra_openims.py | 26 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index 4593a1b8b..3db53e35e 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -17,6 +17,13 @@ import time import pkg_resources import yaml +import functest.core.vnf as vnf +import functest.utils.openstack_utils as os_utils +from functest.opnfv_tests.openstack.snaps import snaps_utils +from functest.utils.constants import CONST + +from org.openbaton.cli.errors.errors import NfvoException +from org.openbaton.cli.agents.agents import MainAgent from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig @@ -24,7 +31,7 @@ from snaps.config.router import RouterConfig from snaps.config.security_group import ( Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig) from snaps.config.vm_inst import VmInstanceConfig - +from snaps.openstack.utils import keystone_utils from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_instance import OpenStackVmInstance @@ -32,15 +39,6 @@ from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import OpenStackSecurityGroup -from functest.opnfv_tests.openstack.snaps import snaps_utils - -import functest.core.vnf as vnf -import functest.utils.openstack_utils as os_utils -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 " # ---------------------------------------------------------- @@ -209,11 +207,14 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): self.logger.info("Additional pre-configuration steps") + public_auth_url = keystone_utils.get_endpoint( + self.snaps_creds, 'identity') + 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() @@ -356,7 +357,6 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): my_floating_ips = [] # Filter Floating IPs with tenant id for floating_ip in floating_ips: - # self.logger.info("Floating IP: %s", floating_ip) if floating_ip.get('tenant_id') == tenant_id: my_floating_ips.append(floating_ip.get('floating_ip_address')) # Select if Floating IP exist else create new one @@ -649,19 +649,19 @@ class ClearwaterImsVnf(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): try: self.logger.info("Cleaning %s", str(resource)) resource.clean() - except Exception as exc: + except Exception as exc: # pylint: disable=broad-except self.logger.error('Unexpected error cleaning - %s', exc) super(ClearwaterImsVnf, self).clean() diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index fcb65e734..d609a0fba 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -17,6 +17,12 @@ import time import pkg_resources import yaml +import functest.core.vnf as vnf +import functest.utils.openstack_utils as os_utils +from functest.utils.constants import CONST + +from org.openbaton.cli.errors.errors import NfvoException +from org.openbaton.cli.agents.agents import MainAgent from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.network import NetworkConfig, PortConfig, SubnetConfig @@ -24,7 +30,7 @@ from snaps.config.router import RouterConfig from snaps.config.security_group import ( Direction, Protocol, SecurityGroupConfig, SecurityGroupRuleConfig) from snaps.config.vm_inst import VmInstanceConfig - +from snaps.openstack.utils import keystone_utils from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_security_group import OpenStackSecurityGroup @@ -34,13 +40,6 @@ from snaps.openstack.create_instance import OpenStackVmInstance from functest.opnfv_tests.openstack.snaps import snaps_utils -import functest.core.vnf as vnf -import functest.utils.openstack_utils as os_utils -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 " # ---------------------------------------------------------- @@ -202,12 +201,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() @@ -659,8 +661,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) @@ -672,13 +672,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): -- cgit 1.2.3-korg