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
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()
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
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()
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 (
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
from org.openbaton.cli.errors.errors import NfvoException
from org.openbaton.cli.agents.agents import MainAgent
-
__author__ = "Pauls, Michael <michael.pauls@fokus.fraunhofer.de>"
# ----------------------------------------------------------
#
"""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()
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)
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):