diff options
| -rwxr-xr-x | ci/prepare_env.py | 24 | ||||
| -rw-r--r-- | cli/commands/cli_os.py | 9 | ||||
| -rw-r--r-- | cli/commands/cli_testcase.py | 5 | ||||
| -rw-r--r-- | cli/commands/cli_tier.py | 5 | ||||
| -rw-r--r-- | testcases/Controllers/ONOS/Teston/adapters/foundation.py | 54 | ||||
| -rwxr-xr-x | testcases/Controllers/ONOS/Teston/onosfunctest.py | 42 | ||||
| -rwxr-xr-x | testcases/OpenStack/examples/create_instance_and_ip.py | 45 | ||||
| -rwxr-xr-x | testcases/OpenStack/rally/run_rally-cert.py | 74 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/gen_tempest_conf.py | 4 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 68 | ||||
| -rw-r--r-- | testcases/OpenStack/vPing/vping_util.py | 47 | ||||
| -rwxr-xr-x | testcases/features/copper.py | 8 | ||||
| -rwxr-xr-x | testcases/features/doctor.py | 8 | ||||
| -rwxr-xr-x | testcases/features/domino.py | 36 | ||||
| -rwxr-xr-x | testcases/features/promise.py | 54 | ||||
| -rwxr-xr-x | testcases/vnf/vIMS/vIMS.py | 96 | ||||
| -rwxr-xr-x | testcases/vnf/vRNC/parser.py | 8 | ||||
| -rw-r--r-- | utils/functest_utils.py | 25 | ||||
| -rwxr-xr-x | utils/openstack_clean.py | 4 | ||||
| -rwxr-xr-x | utils/openstack_snapshot.py | 4 |
20 files changed, 310 insertions, 310 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 49b3ea75e..63a0ad4a8 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -48,21 +48,21 @@ CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"] CONFIG_PATCH_PATH = os.path.join(os.path.dirname( CONFIG_FUNCTEST_PATH), "config_patch.yaml") -functest_yaml = ft_utils.get_functest_yaml() - with open(CONFIG_PATCH_PATH) as f: functest_patch_yaml = yaml.safe_load(f) -FUNCTEST_CONF_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_conf") +FUNCTEST_CONF_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_conf') + -FUNCTEST_DATA_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_data") -FUNCTEST_RESULTS_DIR = functest_yaml.get("general").get( - "directories").get("dir_results") -DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name") -TEMPEST_REPO_DIR = functest_yaml.get("general").get( - "directories").get("dir_repo_tempest") +FUNCTEST_DATA_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') +FUNCTEST_RESULTS_DIR = \ + ft_utils.get_functest_config('general.directories.dir_results') +DEPLOYMENT_MAME = \ + ft_utils.get_functest_config('rally.deployment_name') +TEMPEST_REPO_DIR = \ + ft_utils.get_functest_config('general.directories.dir_repo_tempest') ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" @@ -191,7 +191,7 @@ def patch_config_file(): for key in functest_patch_yaml: if key in CI_SCENARIO: new_functest_yaml = dict(ft_utils.merge_dicts( - functest_yaml, functest_patch_yaml[key])) + ft_utils.get_functest_yaml(), functest_patch_yaml[key])) updated = True if updated: diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py index fc027d5fe..4324ae44d 100644 --- a/cli/commands/cli_os.py +++ b/cli/commands/cli_os.py @@ -16,13 +16,12 @@ import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot -functest_yaml = ft_utils.get_functest_yaml() -FUNCTEST_CONF_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_conf") +FUNCTEST_CONF_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_conf') RC_FILE = os.getenv('creds') -OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml( - "general.openstack.snapshot_file") +OS_SNAPSHOT_FILE = \ + ft_utils.get_functest_config("general.openstack.snapshot_file") class CliOpenStack: diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index 5cfe99881..510d740ba 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -17,10 +17,9 @@ import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation -functest_yaml = ft_utils.get_functest_yaml() -FUNCTEST_CONF_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_conf") +FUNCTEST_CONF_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_conf') ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" FUNCTEST_REPO = ft_utils.FUNCTEST_REPO diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py index ee45d8438..aa0541981 100644 --- a/cli/commands/cli_tier.py +++ b/cli/commands/cli_tier.py @@ -16,10 +16,9 @@ import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils -functest_yaml = ft_utils.get_functest_yaml() -FUNCTEST_CONF_DIR = functest_yaml.get("general").get( - "directories").get("dir_functest_conf") +FUNCTEST_CONF_DIR = \ + ft_utils.get_functest_config('general.directories.dir_functest_conf') ENV_FILE = FUNCTEST_CONF_DIR + "/env_active" FUNCTEST_REPO = ft_utils.FUNCTEST_REPO diff --git a/testcases/Controllers/ONOS/Teston/adapters/foundation.py b/testcases/Controllers/ONOS/Teston/adapters/foundation.py index 90eb14490..5c42c35e8 100644 --- a/testcases/Controllers/ONOS/Teston/adapters/foundation.py +++ b/testcases/Controllers/ONOS/Teston/adapters/foundation.py @@ -16,7 +16,6 @@ import logging import os import re import time -import yaml import functest.utils.functest_utils as ft_utils @@ -55,35 +54,30 @@ class foundation: """ Get Default Parameters value """ - with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: - functest_yaml = yaml.safe_load(f) - - self.Result_DB = str(functest_yaml.get("results").get("test_db_url")) - self.masterusername = str(functest_yaml.get("ONOS").get("general"). - get('onosbench_username')) - self.masterpassword = str(functest_yaml.get("ONOS").get("general"). - get("onosbench_password")) - self.agentusername = str(functest_yaml.get("ONOS").get("general"). - get("onoscli_username")) - self.agentpassword = str(functest_yaml.get("ONOS").get("general"). - get("onoscli_password")) - self.runtimeout = functest_yaml.get("ONOS").get("general").get( - "runtimeout") - self.OCT = str(functest_yaml.get("ONOS").get("environment").get("OCT")) - self.OC1 = str(functest_yaml.get("ONOS").get("environment").get("OC1")) - self.OC2 = str(functest_yaml.get("ONOS").get("environment").get("OC2")) - self.OC3 = str(functest_yaml.get("ONOS").get("environment").get("OC3")) - self.OCN = str(functest_yaml.get("ONOS").get("environment").get("OCN")) - self.OCN2 = str(functest_yaml.get("ONOS"). - get("environment").get("OCN2")) - self.installer_master = str(functest_yaml.get("ONOS"). - get("environment").get("installer_master")) - self.installer_master_username = str(functest_yaml.get("ONOS"). - get("environment"). - get("installer_master_username")) - self.installer_master_password = str(functest_yaml.get("ONOS"). - get("environment"). - get("installer_master_password")) + self.Result_DB = str( + ft_utils.get_functest_config('results.test_db_url')) + self.masterusername = str( + ft_utils.get_functest_config('ONOS.general.onosbench_username')) + self.masterpassword = str( + ft_utils.get_functest_config('ONOS.general.onosbench_password')) + self.agentusername = str( + ft_utils.get_functest_config('ONOS.general.onoscli_username')) + self.agentpassword = str( + ft_utils.get_functest_config('ONOS.general.onoscli_password')) + self.runtimeout = \ + ft_utils.get_functest_config('ONOS.general.runtimeout') + self.OCT = str(ft_utils.get_functest_config('ONOS.environment.OCT')) + self.OC1 = str(ft_utils.get_functest_config('ONOS.environment.OC1')) + self.OC2 = str(ft_utils.get_functest_config('ONOS.environment.OC2')) + self.OC3 = str(ft_utils.get_functest_config('ONOS.environment.OC3')) + self.OCN = str(ft_utils.get_functest_config('ONOS.environment.OCN')) + self.OCN2 = str(ft_utils.get_functest_config('ONOS.environment.OCN2')) + self.installer_master = str( + ft_utils.get_functest_config('ONOS.environment.installer_master')) + self.installer_master_username = str(ft_utils.get_functest_config( + 'ONOS.environment.installer_master_username')) + self.installer_master_password = str(ft_utils.get_functest_config( + 'ONOS.environment.installer_master_password')) self.hosts = [self.OC1, self.OCN, self.OCN2] self.localhost = self.OCT diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py index a5c225edc..c8045fd12 100755 --- a/testcases/Controllers/ONOS/Teston/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -23,7 +23,7 @@ import argparse from neutronclient.v2_0 import client as neutronclient import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as functest_utils +import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as openstack_utils parser = argparse.ArgumentParser() @@ -35,12 +35,11 @@ args = parser.parse_args() logger = ft_logger.Logger("onos").getLogger() # onos parameters -TEST_DB = functest_utils.get_parameter_from_yaml( - "results.test_db_url") -ONOS_REPO_PATH = functest_utils.get_parameter_from_yaml( - "general.directories.dir_repos") -ONOS_CONF_DIR = functest_utils.get_parameter_from_yaml( - "general.directories.dir_functest_conf") +TEST_DB = ft_utils.get_functest_config("results.test_db_url") +ONOS_REPO_PATH = \ + ft_utils.get_functest_config("general.directories.dir_repos") +ONOS_CONF_DIR = \ + ft_utils.get_functest_config("general.directories.dir_functest_conf") ONOSCI_PATH = ONOS_REPO_PATH + "/" starttime = datetime.datetime.now() @@ -49,15 +48,14 @@ HOME = os.environ['HOME'] + "/" INSTALLER_TYPE = os.environ['INSTALLER_TYPE'] DEPLOY_SCENARIO = os.environ['DEPLOY_SCENARIO'] ONOSCI_PATH = ONOS_REPO_PATH + "/" -GLANCE_IMAGE_NAME = functest_utils.get_parameter_from_yaml( - "onos_sfc.image_name") -GLANCE_IMAGE_FILENAME = functest_utils.get_parameter_from_yaml( - "onos_sfc.image_file_name") -GLANCE_IMAGE_PATH = functest_utils.get_parameter_from_yaml( - "general.directories.dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME -SFC_PATH = functest_utils.FUNCTEST_REPO + "/" + \ - functest_utils.get_parameter_from_yaml( - "general.directories.dir_onos_sfc") +GLANCE_IMAGE_NAME = ft_utils.get_functest_config("onos_sfc.image_name") +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config("onos_sfc.image_file_name") +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config("general.directories.dir_functest_data") + \ + "/" + GLANCE_IMAGE_FILENAME +SFC_PATH = ft_utils.FUNCTEST_REPO + "/" + \ + ft_utils.get_functest_config("general.directories.dir_onos_sfc") def RunScript(testname): @@ -244,12 +242,12 @@ def OnosTest(): except: logger.error("Unable to set ONOS criteria") - functest_utils.push_results_to_db("functest", - "onos", - start_time, - stop_time, - status, - result) + ft_utils.push_results_to_db("functest", + "onos", + start_time, + stop_time, + status, + result) except: logger.error("Error pushing results into Database") diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py index 3d41e5dde..50cdf8a57 100755 --- a/testcases/OpenStack/examples/create_instance_and_ip.py +++ b/testcases/OpenStack/examples/create_instance_and_ip.py @@ -32,33 +32,30 @@ HOME = os.environ['HOME'] + "/" VM_BOOT_TIMEOUT = 180 -INSTANCE_NAME = ft_utils.get_parameter_from_yaml("example.example_vm_name") -FLAVOR = ft_utils.get_parameter_from_yaml("example.example_flavor") -IMAGE_NAME = ft_utils.get_parameter_from_yaml("example.example_image_name") -IMAGE_FILENAME = ft_utils.get_parameter_from_yaml( - "general.openstack.image_file_name") -IMAGE_FORMAT = ft_utils.get_parameter_from_yaml( - "general.openstack.image_disk_format") -IMAGE_PATH = ft_utils.get_parameter_from_yaml( - "general.directories.dir_functest_data") + "/" + IMAGE_FILENAME +INSTANCE_NAME = ft_utils.get_functest_config("example.example_vm_name") +FLAVOR = ft_utils.get_functest_config("example.example_flavor") +IMAGE_NAME = ft_utils.get_functest_config("example.example_image_name") +IMAGE_FILENAME = \ + ft_utils.get_functest_config("general.openstack.image_file_name") +IMAGE_FORMAT = \ + ft_utils.get_functest_config("general.openstack.image_disk_format") +IMAGE_PATH = \ + ft_utils.get_functest_config("general.directories.dir_functest_data") + \ + "/" + IMAGE_FILENAME # NEUTRON Private Network parameters -NET_NAME = ft_utils.get_parameter_from_yaml( - "example.example_private_net_name") -SUBNET_NAME = ft_utils.get_parameter_from_yaml( - "example.example_private_subnet_name") -SUBNET_CIDR = ft_utils.get_parameter_from_yaml( - "example.example_private_subnet_cidr") -ROUTER_NAME = ft_utils.get_parameter_from_yaml( - "example.example_router_name") - -SECGROUP_NAME = ft_utils.get_parameter_from_yaml( - "example.example_sg_name") -SECGROUP_DESCR = ft_utils.get_parameter_from_yaml( - "example.example_sg_descr") - -TEST_DB = ft_utils.get_parameter_from_yaml("results.test_db_url") +NET_NAME = ft_utils.get_functest_config("example.example_private_net_name") +SUBNET_NAME = \ + ft_utils.get_functest_config("example.example_private_subnet_name") +SUBNET_CIDR = \ + ft_utils.get_functest_config("example.example_private_subnet_cidr") +ROUTER_NAME = ft_utils.get_functest_config("example.example_router_name") + +SECGROUP_NAME = ft_utils.get_functest_config("example.example_sg_name") +SECGROUP_DESCR = ft_utils.get_functest_config("example.example_sg_descr") + +TEST_DB = ft_utils.get_functest_config("results.test_db_url") def main(): diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 536b4a5c2..29fd0a334 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -26,7 +26,7 @@ import iniparse import yaml import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as functest_utils +import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', @@ -72,11 +72,9 @@ else: logger = ft_logger.Logger("run_rally").getLogger() -functest_yaml = functest_utils.get_functest_yaml() - HOME = os.environ['HOME'] + "/" -RALLY_DIR = functest_utils.FUNCTEST_REPO + '/' + \ - functest_yaml.get("general").get("directories").get("dir_rally") +RALLY_DIR = ft_utils.FUNCTEST_REPO + '/' + \ + ft_utils.get_functest_config('general.directories.dir_rally') TEMPLATE_DIR = RALLY_DIR + "scenario/templates" SUPPORT_DIR = RALLY_DIR + "scenario/support" TEMP_DIR = RALLY_DIR + "var" @@ -88,25 +86,27 @@ TENANTS_AMOUNT = 3 ITERATIONS_AMOUNT = 10 CONCURRENCY = 4 -RESULTS_DIR = functest_yaml.get("general").get("directories").get( - "dir_rally_res") -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_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") -GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get("openstack").get( - "image_file_name") -GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get("openstack").get( - "image_disk_format") -GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get( - "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME +RESULTS_DIR = \ + ft_utils.get_functest_config('general.directories.dir_rally_res') +TEMPEST_CONF_FILE = \ + ft_utils.get_functest_config('general.directories.dir_results') + \ + '/tempest/tempest.conf' +TEST_DB = ft_utils.get_functest_config('results.test_db_url') + +PRIVATE_NET_NAME = ft_utils.get_functest_config('rally.network_name') +PRIVATE_SUBNET_NAME = ft_utils.get_functest_config('rally.subnet_name') +PRIVATE_SUBNET_CIDR = ft_utils.get_functest_config('rally.subnet_cidr') +ROUTER_NAME = ft_utils.get_functest_config('rally.router_name') + +GLANCE_IMAGE_NAME = \ + ft_utils.get_functest_config('general.openstack.image_name') +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config('general.openstack.image_file_name') +GLANCE_IMAGE_FORMAT = \ + ft_utils.get_functest_config('general.openstack.image_disk_format') +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') + \ + "/" + GLANCE_IMAGE_FILENAME CINDER_VOLUME_TYPE_NAME = "volume_test" @@ -409,12 +409,12 @@ def run_task(test_name): if args.report: stop_time = time.time() logger.debug("Push Rally detailed results into DB") - functest_utils.push_results_to_db("functest", - "Rally_details", - start_time, - stop_time, - status, - json_data) + ft_utils.push_results_to_db("functest", + "Rally_details", + start_time, + stop_time, + status, + json_data) def main(): @@ -533,7 +533,7 @@ def main(): case_name = "rally_full" # Evaluation of the success criteria - status = functest_utils.check_success_rate(case_name, success_rate) + status = ft_utils.check_success_rate(case_name, success_rate) exit_code = -1 if status == "PASS": @@ -541,12 +541,12 @@ def main(): if args.report: logger.debug("Pushing Rally summary into DB...") - functest_utils.push_results_to_db("functest", - case_name, - start_time, - stop_time, - status, - payload) + ft_utils.push_results_to_db("functest", + case_name, + start_time, + stop_time, + status, + payload) if args.noclean: exit(exit_code) diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py index 688a92402..ca671d00d 100755 --- a/testcases/OpenStack/tempest/gen_tempest_conf.py +++ b/testcases/OpenStack/tempest/gen_tempest_conf.py @@ -55,10 +55,10 @@ def configure_tempest_multisite(deployment_dir): kingbird_conf_path = "/etc/kingbird/kingbird.conf" installer_type = os.getenv('INSTALLER_TYPE', 'Unknown') installer_ip = os.getenv('INSTALLER_IP', 'Unknown') - installer_username = ft_utils.get_parameter_from_yaml( + installer_username = ft_utils.get_functest_config( "multisite." + installer_type + "_environment.installer_username") - installer_password = ft_utils.get_parameter_from_yaml( + installer_password = ft_utils.get_functest_config( "multisite." + installer_type + "_environment.installer_password") diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index c426eb63e..2f24e96de 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -58,39 +58,49 @@ args = parser.parse_args() """ logging configuration """ logger = ft_logger.Logger("run_tempest").getLogger() -functest_yaml = ft_utils.get_functest_yaml() -TEST_DB = functest_yaml.get("results").get("test_db_url") +TEST_DB = ft_utils.get_functest_config('results.test_db_url') MODE = "smoke" -GLANCE_IMAGE_NAME = functest_yaml.get("general").get( - "openstack").get("image_name") -GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get( - "openstack").get("image_file_name") -GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get( - "openstack").get("image_disk_format") -GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get( - "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME -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_TIMEOUT = functest_yaml.get("tempest").get("validation").get( - "ssh_timeout") -DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name") -RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get( - "dir_rally_inst") -RESULTS_DIR = functest_yaml.get("general").get("directories").get( - "dir_results") +GLANCE_IMAGE_NAME = \ + ft_utils.get_functest_config('general.openstack.image_name') +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config('general.openstack.image_file_name') +GLANCE_IMAGE_FORMAT = \ + ft_utils.get_functest_config('general.openstack.image_disk_format') +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') + \ + "/" + GLANCE_IMAGE_FILENAME + +PRIVATE_NET_NAME = \ + ft_utils.get_functest_config('tempest.private_net_name') +PRIVATE_SUBNET_NAME = \ + ft_utils.get_functest_config('tempest.private_subnet_name') +PRIVATE_SUBNET_CIDR = \ + ft_utils.get_functest_config('tempest.private_subnet_cidr') +ROUTER_NAME = \ + ft_utils.get_functest_config('tempest.router_name') +TENANT_NAME = \ + ft_utils.get_functest_config('tempest.identity.tenant_name') +TENANT_DESCRIPTION = \ + ft_utils.get_functest_config('tempest.identity.tenant_description') +USER_NAME = \ + ft_utils.get_functest_config('tempest.identity.user_name') +USER_PASSWORD = \ + ft_utils.get_functest_config('tempest.identity.user_password') +SSH_TIMEOUT = \ + ft_utils.get_functest_config('tempest.validation.ssh_timeout') +DEPLOYMENT_MAME = \ + ft_utils.get_functest_config('rally.deployment_name') +RALLY_INSTALLATION_DIR = \ + ft_utils.get_functest_config('general.directories.dir_rally_inst') + +RESULTS_DIR = \ + ft_utils.get_functest_config('general.directories.dir_results') TEMPEST_RESULTS_DIR = RESULTS_DIR + '/tempest' -TEST_LIST_DIR = functest_yaml.get("general").get("directories").get( - "dir_tempest_cases") + REPO_PATH = ft_utils.FUNCTEST_REPO + '/' +TEST_LIST_DIR = \ + ft_utils.get_functest_config('general.directories.dir_tempest_cases') TEMPEST_CUSTOM = REPO_PATH + TEST_LIST_DIR + 'test_list.txt' TEMPEST_BLACKLIST = REPO_PATH + TEST_LIST_DIR + 'blacklist.txt' TEMPEST_DEFCORE = REPO_PATH + TEST_LIST_DIR + 'defcore_req.txt' diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index e85476e66..cf5a28dbd 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -9,39 +9,38 @@ from scp import SCPClient import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils - FUNCTEST_REPO = ft_utils.FUNCTEST_REPO -functest_yaml = ft_utils.get_functest_yaml() -NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1") -NAME_VM_2 = functest_yaml.get("vping").get("vm_name_2") +NAME_VM_1 = ft_utils.get_functest_config('vping.vm_name_1') +NAME_VM_2 = ft_utils.get_functest_config('vping.vm_name_2') VM_BOOT_TIMEOUT = 180 VM_DELETE_TIMEOUT = 100 -PING_TIMEOUT = functest_yaml.get("vping").get("ping_timeout") +PING_TIMEOUT = ft_utils.get_functest_config('vping.ping_timeout') + +GLANCE_IMAGE_NAME = ft_utils.get_functest_config('vping.image_name') +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config('general.openstack.image_file_name') +GLANCE_IMAGE_FORMAT = \ + ft_utils.get_functest_config('general.openstack.image_disk_format') +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') + \ + "/" + GLANCE_IMAGE_FILENAME -GLANCE_IMAGE_NAME = functest_yaml.get("vping").get("image_name") -GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get( - "openstack").get("image_file_name") -GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get( - "openstack").get("image_disk_format") -GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get( - "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME -FLAVOR = functest_yaml.get("vping").get("vm_flavor") +FLAVOR = ft_utils.get_functest_config('vping.vm_flavor') # NEUTRON Private Network parameters -PRIVATE_NET_NAME = functest_yaml.get("vping").get( - "vping_private_net_name") -PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get( - "vping_private_subnet_name") -PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get( - "vping_private_subnet_cidr") -ROUTER_NAME = functest_yaml.get("vping").get( - "vping_router_name") - -SECGROUP_NAME = functest_yaml.get("vping").get("vping_sg_name") -SECGROUP_DESCR = functest_yaml.get("vping").get("vping_sg_descr") +PRIVATE_NET_NAME = \ + ft_utils.get_functest_config('vping.vping_private_net_name') +PRIVATE_SUBNET_NAME = \ + ft_utils.get_functest_config('vping.vping_private_subnet_name') +PRIVATE_SUBNET_CIDR = \ + ft_utils.get_functest_config('vping.vping_private_subnet_cidr') +ROUTER_NAME = ft_utils.get_functest_config('vping.vping_router_name') + +SECGROUP_NAME = ft_utils.get_functest_config('vping.vping_sg_name') +SECGROUP_DESCR = ft_utils.get_functest_config('vping.vping_sg_descr') neutron_client = None diff --git a/testcases/features/copper.py b/testcases/features/copper.py index 50319d965..be6744a95 100755 --- a/testcases/features/copper.py +++ b/testcases/features/copper.py @@ -28,10 +28,10 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -COPPER_REPO = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_repo_copper') -RESULTS_DIR = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_results') +COPPER_REPO = \ + functest_utils.get_functest_config('general.directories.dir_repo_copper') +RESULTS_DIR = \ + functest_utils.get_functest_config('general.directories.dir_results') logger = ft_logger.Logger("copper").getLogger() diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index badcfe605..6c26875d3 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -29,10 +29,10 @@ args = parser.parse_args() functest_yaml = functest_utils.get_functest_yaml() -DOCTOR_REPO = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_repo_doctor') -RESULTS_DIR = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_results') +DOCTOR_REPO = \ + functest_utils.get_functest_config('general.directories.dir_repo_doctor') +RESULTS_DIR = \ + functest_utils.get_functest_config('general.directories.dir_results') logger = ft_logger.Logger("doctor").getLogger() diff --git a/testcases/features/domino.py b/testcases/features/domino.py index 7835c5ce8..75351a56e 100755 --- a/testcases/features/domino.py +++ b/testcases/features/domino.py @@ -18,7 +18,7 @@ import argparse import time import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as functest_utils +import functest.utils.functest_utils as ft_utils parser = argparse.ArgumentParser() @@ -27,12 +27,11 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -functest_yaml = functest_utils.get_functest_yaml() -dirs = functest_yaml.get('general').get('directories') -DOMINO_REPO = dirs.get('dir_repo_domino') -RESULTS_DIR = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_results') +DOMINO_REPO = \ + ft_utils.get_functest_config('general.directories.dir_repo_domino') +RESULTS_DIR = \ + ft_utils.get_functest_config('general.directories.dir_results') logger = ft_logger.Logger("domino").getLogger() @@ -42,9 +41,9 @@ def main(): log_file = RESULTS_DIR + "/domino.log" start_time = time.time() - ret = functest_utils.execute_command(cmd, - exit_on_error=False, - output_file=log_file) + ret = ft_utils.execute_command(cmd, + exit_on_error=False, + output_file=log_file) stop_time = time.time() duration = round(stop_time - start_time, 1) @@ -70,17 +69,18 @@ def main(): elif details['status'] == "SKIPPED": status = "SKIP" - functest_utils.logger_test_results("Domino", - "domino-multinode", - status, details) + ft_utils.logger_test_results("Domino", + "domino-multinode", + status, + details) if args.report: if status is not "SKIP": - functest_utils.push_results_to_db("domino", - "domino-multinode", - start_time, - stop_time, - status, - details) + ft_utils.push_results_to_db("domino", + "domino-multinode", + start_time, + stop_time, + status, + details) logger.info("Domino results pushed to DB") diff --git a/testcases/features/promise.py b/testcases/features/promise.py index 5b23614d6..cce0f5dc1 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -32,34 +32,34 @@ parser.add_argument("-r", "--report", args = parser.parse_args() -dirs = ft_utils.get_parameter_from_yaml('general.directories') +dirs = ft_utils.get_functest_config('general.directories') PROMISE_REPO = dirs.get('dir_repo_promise') -RESULTS_DIR = ft_utils.get_parameter_from_yaml( - 'general.directories.dir_results') - -TENANT_NAME = ft_utils.get_parameter_from_yaml('promise.tenant_name') -TENANT_DESCRIPTION = ft_utils.get_parameter_from_yaml( - 'promise.tenant_description') -USER_NAME = ft_utils.get_parameter_from_yaml('promise.user_name') -USER_PWD = ft_utils.get_parameter_from_yaml('promise.user_pwd') -IMAGE_NAME = ft_utils.get_parameter_from_yaml('promise.image_name') -FLAVOR_NAME = ft_utils.get_parameter_from_yaml('promise.flavor_name') -FLAVOR_VCPUS = ft_utils.get_parameter_from_yaml('promise.flavor_vcpus') -FLAVOR_RAM = ft_utils.get_parameter_from_yaml('promise.flavor_ram') -FLAVOR_DISK = ft_utils.get_parameter_from_yaml('promise.flavor_disk') - - -GLANCE_IMAGE_FILENAME = ft_utils.get_parameter_from_yaml( - 'general.openstack.image_file_name') -GLANCE_IMAGE_FORMAT = ft_utils.get_parameter_from_yaml( - 'general.openstack.image_disk_format') -GLANCE_IMAGE_PATH = ft_utils.get_parameter_from_yaml( - 'general.directories.dir_functest_data') + "/" + GLANCE_IMAGE_FILENAME - -NET_NAME = ft_utils.get_parameter_from_yaml('promise.network_name') -SUBNET_NAME = ft_utils.get_parameter_from_yaml('promise.subnet_name') -SUBNET_CIDR = ft_utils.get_parameter_from_yaml('promise.subnet_cidr') -ROUTER_NAME = ft_utils.get_parameter_from_yaml('promise.router_name') +RESULTS_DIR = ft_utils.get_functest_config('general.directories.dir_results') + +TENANT_NAME = ft_utils.get_functest_config('promise.tenant_name') +TENANT_DESCRIPTION = \ + ft_utils.get_functest_config('promise.tenant_description') +USER_NAME = ft_utils.get_functest_config('promise.user_name') +USER_PWD = ft_utils.get_functest_config('promise.user_pwd') +IMAGE_NAME = ft_utils.get_functest_config('promise.image_name') +FLAVOR_NAME = ft_utils.get_functest_config('promise.flavor_name') +FLAVOR_VCPUS = ft_utils.get_functest_config('promise.flavor_vcpus') +FLAVOR_RAM = ft_utils.get_functest_config('promise.flavor_ram') +FLAVOR_DISK = ft_utils.get_functest_config('promise.flavor_disk') + + +GLANCE_IMAGE_FILENAME = \ + ft_utils.get_functest_config('general.openstack.image_file_name') +GLANCE_IMAGE_FORMAT = \ + ft_utils.get_functest_config('general.openstack.image_disk_format') +GLANCE_IMAGE_PATH = \ + ft_utils.get_functest_config('general.directories.dir_functest_data') + \ + "/" + GLANCE_IMAGE_FILENAME + +NET_NAME = ft_utils.get_functest_config('promise.network_name') +SUBNET_NAME = ft_utils.get_functest_config('promise.subnet_name') +SUBNET_CIDR = ft_utils.get_functest_config('promise.subnet_cidr') +ROUTER_NAME = ft_utils.get_functest_config('promise.router_name') """ logging configuration """ diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py index c9b1c9ce6..50aa715f4 100755 --- a/testcases/vnf/vIMS/vIMS.py +++ b/testcases/vnf/vIMS/vIMS.py @@ -25,7 +25,7 @@ import requests from neutronclient.v2_0 import client as ntclient import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as functest_utils +import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils from clearwater import clearwater from orchestrator import orchestrator @@ -47,34 +47,40 @@ args = parser.parse_args() logger = ft_logger.Logger("vIMS").getLogger() -functest_yaml = functest_utils.get_functest_yaml() - # Cloudify parameters -VIMS_DIR = (functest_utils.FUNCTEST_REPO + '/' + - functest_yaml.get("general").get("directories").get("dir_vIMS")) -VIMS_DATA_DIR = functest_yaml.get("general").get( - "directories").get("dir_vIMS_data") + "/" -VIMS_TEST_DIR = functest_yaml.get("general").get( - "directories").get("dir_repo_vims_test") + "/" -DB_URL = functest_yaml.get("results").get("test_db_url") - -TENANT_NAME = functest_yaml.get("vIMS").get("general").get("tenant_name") -TENANT_DESCRIPTION = functest_yaml.get("vIMS").get( - "general").get("tenant_description") -IMAGES = functest_yaml.get("vIMS").get("general").get("images") - -CFY_MANAGER_BLUEPRINT = functest_yaml.get( - "vIMS").get("cloudify").get("blueprint") -CFY_MANAGER_REQUIERMENTS = functest_yaml.get( - "vIMS").get("cloudify").get("requierments") -CFY_INPUTS = functest_yaml.get("vIMS").get("cloudify").get("inputs") - -CW_BLUEPRINT = functest_yaml.get("vIMS").get("clearwater").get("blueprint") -CW_DEPLOYMENT_NAME = functest_yaml.get("vIMS").get( - "clearwater").get("deployment-name") -CW_INPUTS = functest_yaml.get("vIMS").get("clearwater").get("inputs") -CW_REQUIERMENTS = functest_yaml.get("vIMS").get( - "clearwater").get("requierments") +VIMS_DIR = ft_utils.FUNCTEST_REPO + '/' + \ + ft_utils.get_functest_config('general.directories.dir_vIMS') + +VIMS_DATA_DIR = \ + ft_utils.get_functest_config('general.directories.dir_vIMS_data') + \ + '/' +VIMS_TEST_DIR = \ + ft_utils.get_functest_config('general.directories.dir_repo_vims_test') + \ + '/' +DB_URL = \ + ft_utils.get_functest_config('results.test_db_url') + +TENANT_NAME = \ + ft_utils.get_functest_config('vIMS.general.tenant_name') +TENANT_DESCRIPTION = \ + ft_utils.get_functest_config('vIMS.general.tenant_description') +IMAGES = \ + ft_utils.get_functest_config('vIMS.general.images') + +CFY_MANAGER_BLUEPRINT = \ + ft_utils.get_functest_config('vIMS.cloudify.blueprint') +CFY_MANAGER_REQUIERMENTS = \ + ft_utils.get_functest_config('vIMS.cloudify.requierments') +CFY_INPUTS = ft_utils.get_functest_config('vIMS.cloudify.inputs') + +CW_BLUEPRINT = \ + ft_utils.get_functest_config('vIMS.clearwater.blueprint') +CW_DEPLOYMENT_NAME = \ + ft_utils.get_functest_config('vIMS.clearwater.deployment-name') +CW_INPUTS = \ + ft_utils.get_functest_config('vIMS.clearwater.inputs') +CW_REQUIERMENTS = \ + ft_utils.get_functest_config('vIMS.clearwater.requierments') CFY_DEPLOYMENT_DURATION = 0 CW_DEPLOYMENT_DURATION = 0 @@ -90,7 +96,7 @@ def download_and_add_image_on_glance(glance, image_name, image_url): if not os.path.exists(dest_path): os.makedirs(dest_path) file_name = image_url.rsplit('/')[-1] - if not functest_utils.download_url(image_url, dest_path): + if not ft_utils.download_url(image_url, dest_path): logger.error("Failed to download image %s" % file_name) return False @@ -111,12 +117,12 @@ def step_failure(step_name, error_msg): stop_time = time.time() if step_name == "sig_test": status = "PASS" - functest_utils.push_results_to_db("functest", - "vims", - TESTCASE_START_TIME, - stop_time, - status, - RESULTS) + ft_utils.push_results_to_db("functest", + "vims", + TESTCASE_START_TIME, + stop_time, + status, + RESULTS) exit(-1) @@ -182,7 +188,7 @@ def test_clearwater(): logger.info("vIMS functional test Start Time:'%s'" % ( datetime.datetime.fromtimestamp(start_time_ts).strftime( '%Y-%m-%d %H:%M:%S'))) - nameservers = functest_utils.get_resolvconf_ns() + nameservers = ft_utils.get_resolvconf_ns() resolvconf = "" for ns in nameservers: resolvconf += "\nnameserver " + ns @@ -232,12 +238,12 @@ def test_clearwater(): except: logger.error("Unable to set test status") - functest_utils.push_results_to_db("functest", - "vims", - TESTCASE_START_TIME, - end_time_ts, - status, - RESULTS) + ft_utils.push_results_to_db("functest", + "vims", + TESTCASE_START_TIME, + end_time_ts, + status, + RESULTS) try: os.remove(VIMS_TEST_DIR + "temp.json") @@ -385,7 +391,7 @@ def main(): cfy.set_external_network_name(ext_net) - ns = functest_utils.get_resolvconf_ns() + ns = ft_utils.get_resolvconf_ns() if ns: cfy.set_nameservers(ns) @@ -396,10 +402,10 @@ def main(): logger.info("Prepare virtualenv for cloudify-cli") cmd = "chmod +x " + VIMS_DIR + "create_venv.sh" - functest_utils.execute_command(cmd) + ft_utils.execute_command(cmd) time.sleep(3) cmd = VIMS_DIR + "create_venv.sh " + VIMS_DATA_DIR - functest_utils.execute_command(cmd) + ft_utils.execute_command(cmd) cfy.download_manager_blueprint( CFY_MANAGER_BLUEPRINT['url'], CFY_MANAGER_BLUEPRINT['branch']) diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py index 5ff207c14..0320b104d 100755 --- a/testcases/vnf/vRNC/parser.py +++ b/testcases/vnf/vRNC/parser.py @@ -27,10 +27,10 @@ parser.add_argument("-r", "--report", action="store_true") args = parser.parse_args() -PARSER_REPO = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_repo_parser') -RESULTS_DIR = functest_utils.get_parameter_from_yaml( - 'general.directories.dir_results') +PARSER_REPO = \ + functest_utils.get_functest_config('general.directories.dir_repo_parser') +RESULTS_DIR = \ + functest_utils.get_functest_config('general.directories.dir_results') logger = ft_logger.Logger("parser").getLogger() diff --git a/utils/functest_utils.py b/utils/functest_utils.py index 644ad1a1b..c6141d09c 100644 --- a/utils/functest_utils.py +++ b/utils/functest_utils.py @@ -152,9 +152,7 @@ def get_db_url(): """ Returns DB URL """ - functest_yaml = get_functest_yaml() - db_url = functest_yaml.get("results").get("test_db_url") - return db_url + return get_functest_config('results.test_db_url') def logger_test_results(project, case_name, status, details): @@ -331,10 +329,8 @@ def get_deployment_dir(): """ Returns current Rally deployment directory """ - functest_yaml = get_functest_yaml() - deployment_name = functest_yaml.get("rally").get("deployment_name") - rally_dir = functest_yaml.get("general").get("directories").get( - "dir_rally_inst") + deployment_name = get_functest_config('rally.deployment_name') + rally_dir = get_functest_config('general.directories.dir_rally_inst') cmd = ("rally deployment list | awk '/" + deployment_name + "/ {print $2}'") p = subprocess.Popen(cmd, shell=True, @@ -366,18 +362,16 @@ def get_criteria_by_test(testname): # YAML UTILS # # ----------------------------------------------------------- -def get_parameter_from_yaml(parameter, file=None): +def get_parameter_from_yaml(parameter, file): """ - Returns the value of a given parameter in config_functest.yaml + Returns the value of a given parameter in file.yaml parameter must be given in string format with dots Example: general.openstack.image_name """ - if file is None: - file = os.environ["CONFIG_FUNCTEST_YAML"] with open(file) as f: - functest_yaml = yaml.safe_load(f) + file_yaml = yaml.safe_load(f) f.close() - value = functest_yaml + value = file_yaml for element in parameter.split("."): value = value.get(element) if value is None: @@ -386,6 +380,11 @@ def get_parameter_from_yaml(parameter, file=None): return value +def get_functest_config(parameter): + yaml_ = os.environ["CONFIG_FUNCTEST_YAML"] + return get_parameter_from_yaml(parameter, yaml_) + + def check_success_rate(case_name, success_rate): success_rate = float(success_rate) criteria = get_criteria_by_test(case_name) diff --git a/utils/openstack_clean.py b/utils/openstack_clean.py index ef26be1f3..bf582dea2 100755 --- a/utils/openstack_clean.py +++ b/utils/openstack_clean.py @@ -29,8 +29,8 @@ import yaml logger = ft_logger.Logger("openstack_clean").getLogger() -OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml( - "general.openstack.snapshot_file") +OS_SNAPSHOT_FILE = \ + ft_utils.get_functest_config("general.openstack.snapshot_file") def separator(): diff --git a/utils/openstack_snapshot.py b/utils/openstack_snapshot.py index 236cf74e5..560cadbdb 100755 --- a/utils/openstack_snapshot.py +++ b/utils/openstack_snapshot.py @@ -29,8 +29,8 @@ import yaml logger = ft_logger.Logger("openstack_snapshot").getLogger() -OS_SNAPSHOT_FILE = ft_utils.get_parameter_from_yaml( - "general.openstack.snapshot_file") +OS_SNAPSHOT_FILE = \ + ft_utils.get_functest_config("general.openstack.snapshot_file") def separator(): |