From d11b1b3a50af1c8ff86f1f6b269fadffe32c34ab Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Thu, 14 Sep 2017 11:23:56 +0300 Subject: Refactor resource creation and cleanup in rally Use SNAPS to create and delete resources. Change-Id: Ic4d390382acea2be196e8a7518cb8cce25276a45 Signed-off-by: Juha Kosonen --- functest/opnfv_tests/openstack/rally/rally.py | 112 ++++++++++++++++++-------- 1 file changed, 79 insertions(+), 33 deletions(-) (limited to 'functest/opnfv_tests') diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 8c482545..5aba3882 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -18,6 +18,7 @@ import os import re import subprocess import time +import uuid import iniparse import pkg_resources @@ -25,13 +26,19 @@ import yaml from functest.core import testcase from functest.energy import energy +from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils.constants import CONST -import functest.utils.openstack_utils as os_utils + +from snaps.openstack.create_image import ImageSettings +from snaps.openstack.create_network import NetworkSettings, SubnetSettings +from snaps.openstack.create_router import RouterSettings +from snaps.openstack.tests import openstack_tests +from snaps.openstack.utils import deploy_utils LOGGER = logging.getLogger(__name__) -class RallyBase(testcase.OSGCTestCase): +class RallyBase(testcase.TestCase): """Base class form Rally testcases implementation.""" TESTS = ['authenticate', 'glance', 'ceilometer', 'cinder', 'heat', @@ -42,6 +49,7 @@ class RallyBase(testcase.OSGCTestCase): CONST.__getattribute__('dir_functest_images'), GLANCE_IMAGE_FILENAME) GLANCE_IMAGE_FORMAT = CONST.__getattribute__('openstack_image_disk_format') + GLANCE_IMAGE_USERNAME = CONST.__getattribute__('openstack_image_username') GLANCE_IMAGE_EXTRA_PROPERTIES = {} if hasattr(CONST, 'openstack_extra_properties'): GLANCE_IMAGE_EXTRA_PROPERTIES = CONST.__getattribute__( @@ -74,16 +82,30 @@ class RallyBase(testcase.OSGCTestCase): def __init__(self, **kwargs): """Initialize RallyBase object.""" super(RallyBase, self).__init__(**kwargs) + if 'os_creds' in kwargs: + self.os_creds = kwargs['os_creds'] + else: + creds_override = None + if hasattr(CONST, 'snaps_os_creds_override'): + creds_override = CONST.__getattribute__( + 'snaps_os_creds_override') + + self.os_creds = openstack_tests.get_credentials( + os_env_file=CONST.__getattribute__('openstack_creds'), + overrides=creds_override) + + self.guid = '' + if CONST.__getattribute__('rally_unique_names'): + self.guid = '-' + str(uuid.uuid4()) + + self.creators = [] self.mode = '' self.summary = [] self.scenario_dir = '' - self.nova_client = os_utils.get_nova_client() - self.neutron_client = os_utils.get_neutron_client() - self.network_dict = {} + self.ext_net_name = None + self.priv_net_id = None self.smoke = None self.test_name = None - self.image_exists = None - self.image_id = None self.start_time = None self.result = None self.details = None @@ -103,13 +125,13 @@ class RallyBase(testcase.OSGCTestCase): task_args['concurrency'] = self.CONCURRENCY task_args['smoke'] = self.smoke - ext_net = os_utils.get_external_net(self.neutron_client) + ext_net = self.ext_net_name if ext_net: task_args['floating_network'] = str(ext_net) else: task_args['floating_network'] = '' - net_id = self.network_dict['net_id'] + net_id = self.priv_net_id if net_id: task_args['netid'] = str(net_id) else: @@ -445,25 +467,49 @@ class RallyBase(testcase.OSGCTestCase): if self.test_name not in self.TESTS: raise Exception("Test name '%s' is invalid" % self.test_name) + image_name = self.GLANCE_IMAGE_NAME + self.guid + network_name = self.RALLY_PRIVATE_NET_NAME + self.guid + subnet_name = self.RALLY_PRIVATE_SUBNET_NAME + self.guid + router_name = self.RALLY_ROUTER_NAME + self.guid + self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds) + LOGGER.debug('Getting or creating image...') - self.image_exists, self.image_id = os_utils.get_or_create_image( - self.GLANCE_IMAGE_NAME, - self.GLANCE_IMAGE_PATH, - self.GLANCE_IMAGE_FORMAT, - self.GLANCE_IMAGE_EXTRA_PROPERTIES) - if self.image_id is None: + image_creator = deploy_utils.create_image( + self.os_creds, ImageSettings( + name=image_name, + image_file=self.GLANCE_IMAGE_PATH, + img_format=self.GLANCE_IMAGE_FORMAT, + image_user=self.GLANCE_IMAGE_USERNAME, + public=True, + extra_properties=self.GLANCE_IMAGE_EXTRA_PROPERTIES)) + if image_creator is None: raise Exception("Failed to get or create image '%s'" % - self.GLANCE_IMAGE_NAME) - - LOGGER.debug("Creating network '%s'...", self.RALLY_PRIVATE_NET_NAME) - self.network_dict = os_utils.create_shared_network_full( - self.RALLY_PRIVATE_NET_NAME, - self.RALLY_PRIVATE_SUBNET_NAME, - self.RALLY_ROUTER_NAME, - self.RALLY_PRIVATE_SUBNET_CIDR) - if self.network_dict is None: - raise Exception("Failed to create shared network '%s'" % - self.RALLY_PRIVATE_NET_NAME) + image_name) + self.creators.append(image_creator) + + LOGGER.debug("Creating network '%s'...", network_name) + network_creator = deploy_utils.create_network( + self.os_creds, NetworkSettings( + name=network_name, + shared=True, + subnet_settings=[SubnetSettings( + name=subnet_name, + cidr=self.RALLY_PRIVATE_SUBNET_CIDR) + ])) + if network_creator is None: + raise Exception("Failed to create private network") + self.priv_net_id = network_creator.get_network().id + self.creators.append(network_creator) + + LOGGER.debug("Creating router '%s'...", router_name) + router_creator = deploy_utils.create_router( + self.os_creds, RouterSettings( + name=router_name, + external_gateway=self.ext_net_name, + internal_subnets=[subnet_name])) + if router_creator is None: + raise Exception("Failed to create router") + self.creators.append(router_creator) def _run_tests(self): if self.test_name == 'all': @@ -545,12 +591,11 @@ class RallyBase(testcase.OSGCTestCase): self.case_name, success_rate) def _clean_up(self): - if not self.image_exists: - LOGGER.debug("Deleting image '%s' with ID '%s'...", - self.GLANCE_IMAGE_NAME, self.image_id) - if not os_utils.delete_glance_image(self.nova_client, - self.image_id): - LOGGER.error("Error deleting the glance image") + for creator in reversed(self.creators): + try: + creator.clean() + except Exception as e: + LOGGER.error('Unexpected error cleaning - %s', e) @energy.enable_recording def run(self, **kwargs): @@ -560,11 +605,12 @@ class RallyBase(testcase.OSGCTestCase): self._prepare_env() self._run_tests() self._generate_report() - self._clean_up() res = testcase.TestCase.EX_OK except Exception as exc: # pylint: disable=broad-except LOGGER.error('Error with run: %s', exc) res = testcase.TestCase.EX_RUN_ERROR + finally: + self._clean_up() self.stop_time = time.time() return res -- cgit 1.2.3-korg