diff options
Diffstat (limited to 'functest/opnfv_tests/openstack')
6 files changed, 139 insertions, 103 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 2042b2d1..e92639b2 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,20 @@ 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_flavor import FlavorSettings, OpenStackFlavor +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,11 +50,16 @@ 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__( 'openstack_extra_properties') - FLAVOR_NAME = "m1.tiny" + FLAVOR_NAME = CONST.__getattribute__('rally_flavor_name') + FLAVOR_ALT_NAME = CONST.__getattribute__('rally_flavor_alt_name') + FLAVOR_EXTRA_SPECS = None + if hasattr(CONST, 'flavor_extra_specs'): + FLAVOR_EXTRA_SPECS = CONST.__getattribute__('flavor_extra_specs') RALLY_DIR = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/rally') @@ -66,7 +79,6 @@ class RallyBase(testcase.OSGCTestCase): BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt") TEMP_DIR = os.path.join(RALLY_DIR, "var") - CINDER_VOLUME_TYPE_NAME = "volume_test" RALLY_PRIVATE_NET_NAME = CONST.__getattribute__('rally_network_name') RALLY_PRIVATE_SUBNET_NAME = CONST.__getattribute__('rally_subnet_name') RALLY_PRIVATE_SUBNET_CIDR = CONST.__getattribute__('rally_subnet_cidr') @@ -75,26 +87,42 @@ 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.cinder_client = os_utils.get_cinder_client() - self.network_dict = {} - self.volume_type = None + self.image_name = None + self.ext_net_name = None + self.priv_net_id = None + self.flavor_name = None + self.flavor_alt_name = 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 def _build_task_args(self, test_file_name): task_args = {'service_list': [test_file_name]} - task_args['image_name'] = self.GLANCE_IMAGE_NAME - task_args['flavor_name'] = self.FLAVOR_NAME + task_args['image_name'] = self.image_name + task_args['flavor_name'] = self.flavor_name + task_args['flavor_alt_name'] = self.flavor_alt_name task_args['glance_image_location'] = self.GLANCE_IMAGE_PATH task_args['glance_image_format'] = self.GLANCE_IMAGE_FORMAT task_args['tmpl_dir'] = self.TEMPLATE_DIR @@ -106,13 +134,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: @@ -179,7 +207,7 @@ class RallyBase(testcase.OSGCTestCase): @staticmethod def live_migration_supported(): - """Determine is live migration is supported.""" + """Determine if live migration is supported.""" config = iniparse.ConfigParser() if (config.read(RallyBase.TEMPEST_CONF_FILE) and config.has_section('compute-feature-enabled') and @@ -448,39 +476,68 @@ class RallyBase(testcase.OSGCTestCase): if self.test_name not in self.TESTS: raise Exception("Test name '%s' is invalid" % self.test_name) - volume_types = os_utils.list_volume_types(self.cinder_client, - private=False) - if volume_types: - LOGGER.debug("Using existing volume type(s)...") - else: - LOGGER.debug('Creating volume type...') - self.volume_type = os_utils.create_volume_type( - self.cinder_client, self.CINDER_VOLUME_TYPE_NAME) - if self.volume_type is None: - raise Exception("Failed to create volume type '%s'" % - self.CINDER_VOLUME_TYPE_NAME) - LOGGER.debug("Volume type '%s' is created succesfully.", - self.CINDER_VOLUME_TYPE_NAME) - - 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: - 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) + 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.image_name = self.GLANCE_IMAGE_NAME + self.guid + self.flavor_name = self.FLAVOR_NAME + self.guid + self.flavor_alt_name = self.FLAVOR_ALT_NAME + self.guid + self.ext_net_name = snaps_utils.get_ext_net_name(self.os_creds) + + LOGGER.debug("Creating image '%s'...", self.image_name) + image_creator = deploy_utils.create_image( + self.os_creds, ImageSettings( + name=self.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 create image") + 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) + + LOGGER.debug("Creating flavor '%s'...", self.flavor_name) + flavor_creator = OpenStackFlavor( + self.os_creds, FlavorSettings( + name=self.flavor_name, ram=512, disk=1, vcpus=1, + metadata=self.FLAVOR_EXTRA_SPECS)) + if flavor_creator is None or flavor_creator.create() is None: + raise Exception("Failed to create flavor") + self.creators.append(flavor_creator) + + LOGGER.debug("Creating flavor '%s'...", self.flavor_alt_name) + flavor_alt_creator = OpenStackFlavor( + self.os_creds, FlavorSettings( + name=self.flavor_alt_name, ram=1024, disk=1, vcpus=1, + metadata=self.FLAVOR_EXTRA_SPECS)) + if flavor_alt_creator is None or flavor_alt_creator.create() is None: + raise Exception("Failed to create flavor") + self.creators.append(flavor_alt_creator) def _run_tests(self): if self.test_name == 'all': @@ -562,16 +619,11 @@ class RallyBase(testcase.OSGCTestCase): self.case_name, success_rate) def _clean_up(self): - if self.volume_type: - LOGGER.debug("Deleting volume type '%s'...", self.volume_type) - os_utils.delete_volume_type(self.cinder_client, self.volume_type) - - 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): @@ -581,11 +633,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 diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml index e844e33f..5f46f519 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml @@ -101,7 +101,6 @@ CinderVolumes.create_snapshot_and_attach_volume: - args: - volume_type: false size: min: 1 max: 5 @@ -119,26 +118,6 @@ {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - - - args: - volume_type: true - size: - min: 1 - max: 5 - context: - {% call user_context(tenants_amount, users_amount, use_existing_users) %} - quotas: - {{ unlimited_volumes() }} - servers: - {{ vm_params(image_name,flavor_name,none)|indent(2,true) }} - servers_per_tenant: 2 - auto_assign_nic: true - network: {} - {% endcall %} - runner: - {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} - sla: - {{ no_failures_sla() }} CinderVolumes.create_volume: - diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml index d7622093..8fb5f5ee 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml @@ -215,7 +215,7 @@ args: {{ vm_params(image_name, flavor_name) }} to_flavor: - name: "m1.small" + name: {{ flavor_alt_name }} confirm: true force_delete: false nics: diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 10ffddf5..42befe22 100644 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -1,6 +1,7 @@ #!/usr/bin/env python + # Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# matthew.lijun@huawei.com wangwulin@huawei.com +# # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -10,7 +11,6 @@ from __future__ import division - import argparse import logging import os @@ -29,6 +29,9 @@ from functest.opnfv_tests.openstack.tempest import conf_utils from functest.utils.constants import CONST import functest.utils.functest_utils as ft_utils +__author__ = ("Matthew Li <matthew.lijun@huawei.com>," + "Linda Wang <wangwulin@huawei.com>") + # logging configuration """ LOGGER = logging.getLogger(__name__) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 72ea5ce7..7f7db35e 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -115,17 +115,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id): 'for-deployment-{}'.format(deployment_id)) -def get_repo_tag(repo): - """ - Returns last tag of current branch - """ - cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo)) - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) - tag = p.stdout.readline().rstrip() - - return str(tag) - - def backup_tempest_config(conf_file): """ Copy config file to tempest results directory @@ -227,6 +216,7 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None, if compute_cnt > 1: # enable multinode tests config.set('compute', 'min_compute_nodes', compute_cnt) + config.set('compute-feature-enabled', 'live_migration', True) config.set('identity', 'region', 'RegionOne') if os_utils.is_keystone_v3(): diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 19200142..f4b77936 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -16,6 +16,7 @@ import re import shutil import subprocess import time +import uuid import yaml @@ -315,6 +316,10 @@ class TempestResourcesManager(object): self.os_creds = openstack_tests.get_credentials( os_env_file=CONST.__getattribute__('openstack_creds')) + self.guid = '' + if CONST.__getattribute__('tempest_unique_names'): + self.guid = '-' + str(uuid.uuid4()) + self.creators = list() if hasattr(CONST, 'snaps_images_cirros'): @@ -328,7 +333,7 @@ class TempestResourcesManager(object): if create_project: logger.debug("Creating project (tenant) for Tempest suite") project_name = CONST.__getattribute__( - 'tempest_identity_tenant_name') + 'tempest_identity_tenant_name') + self.guid project_creator = deploy_utils.create_project( self.os_creds, ProjectSettings( name=project_name, @@ -343,7 +348,8 @@ class TempestResourcesManager(object): logger.debug("Creating user for Tempest suite") user_creator = deploy_utils.create_user( self.os_creds, UserSettings( - name=CONST.__getattribute__('tempest_identity_user_name'), + name=CONST.__getattribute__( + 'tempest_identity_user_name') + self.guid, password=CONST.__getattribute__( 'tempest_identity_user_password'), project_name=project_name)) @@ -359,10 +365,12 @@ class TempestResourcesManager(object): logger.debug("Creating private network for Tempest suite") network_creator = deploy_utils.create_network( self.os_creds, NetworkSettings( - name=CONST.__getattribute__('tempest_private_net_name'), + name=CONST.__getattribute__( + 'tempest_private_net_name') + self.guid, project_name=project_name, subnet_settings=[SubnetSettings( - name=CONST.__getattribute__('tempest_private_subnet_name'), + name=CONST.__getattribute__( + 'tempest_private_subnet_name') + self.guid, cidr=CONST.__getattribute__('tempest_private_subnet_cidr')) ])) if network_creator is None or network_creator.get_network() is None: @@ -377,7 +385,8 @@ class TempestResourcesManager(object): if (CONST.__getattribute__('tempest_use_custom_images') or use_custom_images): logger.debug("Creating image for Tempest suite") - image_base_name = CONST.__getattribute__('openstack_image_name') + image_base_name = CONST.__getattribute__( + 'openstack_image_name') + self.guid os_image_settings = openstack_tests.cirros_image_settings( image_base_name, public=True, image_metadata=self.cirros_image_config) @@ -392,7 +401,7 @@ class TempestResourcesManager(object): if use_custom_images: logger.debug("Creating 2nd image for Tempest suite") image_base_name_alt = CONST.__getattribute__( - 'openstack_image_name_alt') + 'openstack_image_name_alt') + self.guid os_image_settings_alt = openstack_tests.cirros_image_settings( image_base_name_alt, public=True, image_metadata=self.cirros_image_config) @@ -413,7 +422,8 @@ class TempestResourcesManager(object): flavor_metadata = create_flavor.MEM_PAGE_SIZE_LARGE flavor_creator = OpenStackFlavor( self.os_creds, FlavorSettings( - name=CONST.__getattribute__('openstack_flavor_name'), + name=CONST.__getattribute__( + 'openstack_flavor_name') + self.guid, ram=CONST.__getattribute__('openstack_flavor_ram'), disk=CONST.__getattribute__('openstack_flavor_disk'), vcpus=CONST.__getattribute__('openstack_flavor_vcpus'), @@ -432,7 +442,8 @@ class TempestResourcesManager(object): flavor_metadata_alt = create_flavor.MEM_PAGE_SIZE_LARGE flavor_creator_alt = OpenStackFlavor( self.os_creds, FlavorSettings( - name=CONST.__getattribute__('openstack_flavor_name_alt'), + name=CONST.__getattribute__( + 'openstack_flavor_name_alt') + self.guid, ram=CONST.__getattribute__('openstack_flavor_ram'), disk=CONST.__getattribute__('openstack_flavor_disk'), vcpus=CONST.__getattribute__('openstack_flavor_vcpus'), |