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
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
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 <michael.pauls@fokus.fraunhofer.de>"
# ----------------------------------------------------------
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']
+ "tenant": self.snaps_creds.project_name,
+ "username": self.snaps_creds.username,
+ "password": self.snaps_creds.password,
+ "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
self.logger.info("Waiting for Open Baton NFVO to be up and running...")
timeout = 0
- while timeout < 45:
+ while timeout < 20:
if servertest(
self.mano['details']['fip'].ip,
"8080"):
time.sleep(60)
timeout += 1
- if timeout >= 45:
+ if timeout >= 20:
duration = time.time() - start_time
self.details["orchestrator"].update(
status='FAIL', duration=duration)
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()