diff options
Diffstat (limited to 'testcases/VIM/OpenStack/CI/libraries')
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py | 31 | ||||
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 59 |
2 files changed, 52 insertions, 38 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py index 6aa6ee064..4dc1e16d5 100755 --- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py @@ -67,6 +67,7 @@ parser.add_argument("-z", "--sanity", args = parser.parse_args() client_dict = {} +network_dict = {} if args.verbose: RALLY_STDERR = subprocess.STDOUT @@ -103,8 +104,11 @@ RESULTS_DIR = functest_yaml.get("general").get("directories").get( TEMPEST_CONF_FILE = functest_yaml.get("general").get("directories").get( "dir_results") + '/tempest/tempest.conf' TEST_DB = functest_yaml.get("results").get("test_db_url") -PRIVATE_NETWORK = functest_yaml.get("general").get("openstack").get( - "neutron_private_net_name") + +PRIVATE_NET_NAME = functest_yaml.get("rally").get("network_name") +PRIVATE_SUBNET_NAME = functest_yaml.get("rally").get("subnet_name") +PRIVATE_SUBNET_CIDR = functest_yaml.get("rally").get("subnet_cidr") +ROUTER_NAME = functest_yaml.get("rally").get("router_name") GLANCE_IMAGE_NAME = functest_yaml.get("general").get("openstack").get( "image_name") @@ -209,8 +213,7 @@ def build_task_args(test_file_name): else: task_args['floating_network'] = '' - net_id = openstack_utils.get_network_id(client_dict['neutron'], - PRIVATE_NETWORK) + net_id = network_dict['net_id'] task_args['netid'] = str(net_id) task_args['live_migration'] = live_migration_supported() @@ -379,6 +382,7 @@ def run_task(test_name): def main(): global SUMMARY + global network_dict # configure script if not (args.test_name in tests): logger.error('argument not valid') @@ -438,6 +442,25 @@ def main(): % (GLANCE_IMAGE_NAME, image_id)) image_exists = True + logger.debug("Creating network '%s'..." % PRIVATE_NET_NAME) + network_dict = openstack_utils.create_network_full(logger, + client_dict['neutron'], + PRIVATE_NET_NAME, + PRIVATE_SUBNET_NAME, + ROUTER_NAME, + PRIVATE_SUBNET_CIDR) + if not network_dict: + logger.error("Failed to create network...") + exit(-1) + else: + if not openstack_utils.update_neutron_net(client_dict['neutron'], + network_dict['net_id'], + shared=True): + logger.error("Failed to update network...") + exit(-1) + else: + logger.debug("Network '%s' available..." % PRIVATE_NET_NAME) + if args.test_name == "all": for test_name in tests: if not (test_name == 'all' or diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 02d9b331a..4c8e61a72 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -20,7 +20,6 @@ import re import requests import shutil import subprocess -import sys import time import yaml import ConfigParser @@ -68,14 +67,16 @@ f.close() TEST_DB = functest_yaml.get("results").get("test_db_url") MODE = "smoke" +PRIVATE_NET_NAME = functest_yaml.get("tempest").get("private_net_name") +PRIVATE_SUBNET_NAME = functest_yaml.get("tempest").get("private_subnet_name") +PRIVATE_SUBNET_CIDR = functest_yaml.get("tempest").get("private_subnet_cidr") +ROUTER_NAME = functest_yaml.get("tempest").get("router_name") TENANT_NAME = functest_yaml.get("tempest").get("identity").get("tenant_name") TENANT_DESCRIPTION = functest_yaml.get("tempest").get("identity").get( "tenant_description") USER_NAME = functest_yaml.get("tempest").get("identity").get("user_name") USER_PASSWORD = functest_yaml.get("tempest").get("identity").get( "user_password") -SSH_USER_REGEX = functest_yaml.get("tempest").get("input-scenario").get( - "ssh_user_regex") DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name") RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get( "dir_rally_inst") @@ -133,7 +134,7 @@ def push_results_to_db(case, payload, criteria): def create_tempest_resources(): ks_creds = os_utils.get_credentials("keystone") - logger.info("Creating tenant and user for Tempest suite") + logger.debug("Creating tenant and user for Tempest suite") keystone = ksclient.Client(**ks_creds) tenant_id = os_utils.create_tenant(keystone, TENANT_NAME, @@ -146,25 +147,26 @@ def create_tempest_resources(): if user_id == '': logger.error("Error : Failed to create %s user" % USER_NAME) - -def free_tempest_resources(): - ks_creds = os_utils.get_credentials("keystone") - logger.info("Deleting tenant and user for Tempest suite)") - keystone = ksclient.Client(**ks_creds) - - user_id = os_utils.get_user_id(keystone, USER_NAME) - if user_id == '': - logger.error("Error : Failed to get id of %s user" % USER_NAME) - else: - if not os_utils.delete_user(keystone, user_id): - logger.error("Error : Failed to delete %s user" % USER_NAME) - - tenant_id = os_utils.get_tenant_id(keystone, TENANT_NAME) - if tenant_id == '': - logger.error("Error : Failed to get id of %s tenant" % TENANT_NAME) + logger.debug("Creating private network for Tempest suite") + creds_neutron = os_utils.get_credentials("neutron") + neutron_client = neutronclient.Client(**creds_neutron) + network_dic = os_utils.create_network_full(logger, + neutron_client, + PRIVATE_NET_NAME, + PRIVATE_SUBNET_NAME, + ROUTER_NAME, + PRIVATE_SUBNET_CIDR) + if network_dic: + if not os_utils.update_neutron_net(neutron_client, + network_dic['net_id'], + shared=True): + logger.error("Failed to update private network...") + exit(-1) + else: + logger.debug("Network '%s' is available..." % PRIVATE_NET_NAME) else: - if not os_utils.delete_tenant(keystone, tenant_id): - logger.error("Error : Failed to delete %s tenant" % TENANT_NAME) + logger.error("Private network creation failed") + exit(-1) def configure_tempest(mode): @@ -207,16 +209,7 @@ def configure_tempest(mode): logger.debug("Updating selected tempest.conf parameters...") config = ConfigParser.RawConfigParser() config.read(tempest_conf_file) - private_net_name = "" - creds_neutron = os_utils.get_credentials("neutron") - neutron_client = neutronclient.Client(**creds_neutron) - private_net = os_utils.get_private_net(neutron_client) - if private_net is None: - logger.error("No shared private networks found.") - sys.exit(1) - else: - private_net_name = private_net['name'] - config.set('compute', 'fixed_network_name', private_net_name) + config.set('compute', 'fixed_network_name', PRIVATE_NET_NAME) config.set('identity', 'tenant_name', TENANT_NAME) config.set('identity', 'username', USER_NAME) config.set('identity', 'password', USER_PASSWORD) @@ -331,8 +324,6 @@ def main(): if args.noclean: exit(0) - free_tempest_resources() - if __name__ == '__main__': main() |