diff options
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 109 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 63 |
2 files changed, 115 insertions, 57 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index dc08aa25..18549974 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -43,6 +43,88 @@ CI_INSTALLER_IP = CONST.INSTALLER_IP logger = ft_logger.Logger("Tempest").getLogger() +def create_tempest_resources(use_custom_images=False, + use_custom_flavors=False): + keystone_client = os_utils.get_keystone_client() + + logger.debug("Creating tenant and user for Tempest suite") + tenant_id = os_utils.create_tenant( + keystone_client, + CONST.tempest_identity_tenant_name, + CONST.tempest_identity_tenant_description) + if not tenant_id: + logger.error("Failed to create %s tenant" + % CONST.tempest_identity_tenant_name) + + user_id = os_utils.create_user(keystone_client, + CONST.tempest_identity_user_name, + CONST.tempest_identity_user_password, + None, tenant_id) + if not user_id: + logger.error("Failed to create %s user" % + CONST.tempest_identity_user_name) + + logger.debug("Creating private network for Tempest suite") + network_dic = os_utils.create_shared_network_full( + CONST.tempest_private_net_name, + CONST.tempest_private_subnet_name, + CONST.tempest_router_name, + CONST.tempest_private_subnet_cidr) + if network_dic is None: + raise Exception('Failed to create private network') + + image_id = "" + image_id_alt = "" + flavor_id = "" + flavor_id_alt = "" + + if CONST.tempest_use_custom_images or use_custom_images: + # adding alternative image should be trivial should we need it + logger.debug("Creating image for Tempest suite") + _, image_id = os_utils.get_or_create_image( + CONST.openstack_image_name, GLANCE_IMAGE_PATH, + CONST.openstack_image_disk_format) + if image_id is None: + raise Exception('Failed to create image') + + if use_custom_images: + logger.debug("Creating 2nd image for Tempest suite") + _, image_id_alt = os_utils.get_or_create_image( + CONST.openstack_image_name_alt, GLANCE_IMAGE_PATH, + CONST.openstack_image_disk_format) + if image_id_alt is None: + raise Exception('Failed to create image') + + if CONST.tempest_use_custom_flavors or use_custom_flavors: + # adding alternative flavor should be trivial should we need it + logger.debug("Creating flavor for Tempest suite") + _, flavor_id = os_utils.get_or_create_flavor( + CONST.openstack_flavor_name, + CONST.openstack_flavor_ram, + CONST.openstack_flavor_disk, + CONST.openstack_flavor_vcpus) + if flavor_id is None: + raise Exception('Failed to create flavor') + + if use_custom_flavors: + logger.debug("Creating 2nd flavor for tempest_defcore") + _, flavor_id_alt = os_utils.get_or_create_flavor( + CONST.openstack_flavor_name_alt, + CONST.openstack_flavor_ram, + CONST.openstack_flavor_disk, + CONST.openstack_flavor_vcpus) + if flavor_id_alt is None: + raise Exception('Failed to create flavor') + + img_flavor_dict = {} + img_flavor_dict['image_id'] = image_id + img_flavor_dict['image_id_alt'] = image_id_alt + img_flavor_dict['flavor_id'] = flavor_id + img_flavor_dict['flavor_id_alt'] = flavor_id_alt + + return img_flavor_dict + + def get_verifier_id(): """ Returns verifer id for current Tempest @@ -141,6 +223,33 @@ def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None, configure_tempest_multisite_params(conf_file) +def configure_tempest_defcore(deployment_dir, img_flavor_dict): + """ + Add/update needed parameters into tempest.conf file + """ + conf_file = configure_verifier(deployment_dir) + configure_tempest_update_params(conf_file, + img_flavor_dict.get("image_id"), + img_flavor_dict.get("flavor_id")) + + logger.debug("Updating selected tempest.conf parameters for defcore...") + config = ConfigParser.RawConfigParser() + config.read(conf_file) + config.set('compute', 'image_ref', img_flavor_dict.get("image_id")) + config.set('compute', 'image_ref_alt', + img_flavor_dict['image_id_alt']) + config.set('compute', 'flavor_ref', img_flavor_dict.get("flavor_id")) + config.set('compute', 'flavor_ref_alt', + img_flavor_dict['flavor_id_alt']) + + with open(conf_file, 'wb') as config_file: + config.write(config_file) + + confpath = os.path.join(CONST.dir_functest_test, + CONST.refstack_tempest_conf_path) + shutil.copyfile(conf_file, confpath) + + def configure_tempest_update_params(tempest_conf_file, IMAGE_ID=None, FLAVOR_ID=None): """ diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index a6ce4ee6..d3b15926 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -21,7 +21,6 @@ from functest.opnfv_tests.openstack.tempest import conf_utils from functest.utils.constants import CONST import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils -import functest.utils.openstack_utils as os_utils """ logging configuration """ logger = ft_logger.Logger("Tempest").getLogger() @@ -33,8 +32,6 @@ class TempestCommon(testcase_base.TestcaseBase): super(TempestCommon, self).__init__() self.MODE = "" self.OPTION = "" - self.FLAVOR_ID = None - self.IMAGE_ID = None self.VERIFIER_ID = conf_utils.get_verifier_id() self.VERIFIER_REPO_DIR = conf_utils.get_verifier_repo_dir( self.VERIFIER_ID) @@ -48,55 +45,6 @@ class TempestCommon(testcase_base.TestcaseBase): with open(filename) as src: return [line.strip() for line in src.readlines()] - def create_tempest_resources(self): - keystone_client = os_utils.get_keystone_client() - - logger.debug("Creating tenant and user for Tempest suite") - tenant_id = os_utils.create_tenant( - keystone_client, - CONST.tempest_identity_tenant_name, - CONST.tempest_identity_tenant_description) - if not tenant_id: - logger.error("Failed to create %s tenant" - % CONST.tempest_identity_tenant_name) - - user_id = os_utils.create_user(keystone_client, - CONST.tempest_identity_user_name, - CONST.tempest_identity_user_password, - None, tenant_id) - if not user_id: - logger.error("Failed to create %s user" % - CONST.tempest_identity_user_name) - - logger.debug("Creating private network for Tempest suite") - network_dic = os_utils.create_shared_network_full( - CONST.tempest_private_net_name, - CONST.tempest_private_subnet_name, - CONST.tempest_router_name, - CONST.tempest_private_subnet_cidr) - if network_dic is None: - raise Exception('Failed to create private network') - - if CONST.tempest_use_custom_images: - # adding alternative image should be trivial should we need it - logger.debug("Creating image for Tempest suite") - _, self.IMAGE_ID = os_utils.get_or_create_image( - CONST.openstack_image_name, conf_utils.GLANCE_IMAGE_PATH, - CONST.openstack_image_disk_format) - if self.IMAGE_ID is None: - raise Exception('Failed to create image') - - if CONST.tempest_use_custom_flavors: - # adding alternative flavor should be trivial should we need it - logger.debug("Creating flavor for Tempest suite") - _, self.FLAVOR_ID = os_utils.get_or_create_flavor( - CONST.openstack_flavor_name, - CONST.openstack_flavor_ram, - CONST.openstack_flavor_disk, - CONST.openstack_flavor_vcpus) - if self.FLAVOR_ID is None: - raise Exception('Failed to create flavor') - def generate_test_list(self, verifier_repo_dir): logger.debug("Generating test case list...") if self.MODE == 'defcore': @@ -265,11 +213,12 @@ class TempestCommon(testcase_base.TestcaseBase): os.makedirs(conf_utils.TEMPEST_RESULTS_DIR) try: - self.create_tempest_resources() - conf_utils.configure_tempest(self.DEPLOYMENT_DIR, - self.IMAGE_ID, - self.FLAVOR_ID, - self.MODE) + image_and_flavor = conf_utils.create_tempest_resources() + conf_utils.configure_tempest( + self.DEPLOYMENT_DIR, + IMAGE_ID=image_and_flavor.get("image_id"), + FLAVOR_ID=image_and_flavor.get("flavor_id"), + MODE=self.MODE) self.generate_test_list(self.VERIFIER_REPO_DIR) self.apply_tempest_blacklist() self.run_verifier_tests() |