From f5c2aaa5ea6dce72fda01a3392d88148264eb02b Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 3 May 2017 14:11:38 +0200 Subject: Replace CONST.* by getattribute/setattr Directories affected: - ci - core and respective unit tests Change-Id: I6a3d5aa68de29fc5a37ae543a067ff797eba33e6 Signed-off-by: jose.lausuch --- functest/ci/generate_report.py | 35 +++++----- functest/ci/prepare_env.py | 146 ++++++++++++++++++++++------------------- functest/ci/run_tests.py | 23 +++---- 3 files changed, 110 insertions(+), 94 deletions(-) (limited to 'functest/ci') diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 7a25fd95..17240e8c 100644 --- a/functest/ci/generate_report.py +++ b/functest/ci/generate_report.py @@ -67,7 +67,7 @@ def print_line(w1, w2='', w3='', w4='', w5=''): '| ' + w2.ljust(COL_2_LEN - 1) + '| ' + w3.ljust(COL_3_LEN - 1) + '| ' + w4.ljust(COL_4_LEN - 1)) - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): str += ('| ' + w5.ljust(COL_5_LEN - 1)) str += '|\n' return str @@ -75,7 +75,7 @@ def print_line(w1, w2='', w3='', w4='', w5=''): def print_line_no_columns(str): TOTAL_LEN = COL_1_LEN + COL_2_LEN + COL_3_LEN + COL_4_LEN + 2 - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): TOTAL_LEN += COL_5_LEN + 1 return ('| ' + str.ljust(TOTAL_LEN) + "|\n") @@ -85,7 +85,7 @@ def print_separator(char="=", delimiter="+"): delimiter + char * COL_2_LEN + delimiter + char * COL_3_LEN + delimiter + char * COL_4_LEN) - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): str += (delimiter + char * COL_5_LEN) str += '+\n' return str @@ -94,7 +94,7 @@ def print_separator(char="=", delimiter="+"): def main(args=[]): executed_test_cases = args - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): results = get_results_from_db() if results is not None: for test in executed_test_cases: @@ -103,15 +103,15 @@ def main(args=[]): "result": data['result']}) TOTAL_LEN = COL_1_LEN + COL_2_LEN + COL_3_LEN + COL_4_LEN - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): TOTAL_LEN += COL_5_LEN MID = TOTAL_LEN / 2 - if CONST.BUILD_TAG is not None: - if re.search("daily", CONST.BUILD_TAG) is not None: - CONST.CI_LOOP = "daily" + if CONST.__getattribute__('BUILD_TAG') is not None: + if re.search("daily", CONST.__getattribute__('BUILD_TAG')) is not None: + CONST.__setattr__('CI_LOOP', 'daily') else: - CONST.CI_LOOP = "weekly" + CONST.__setattr__('CI_LOOP', 'weekly') str = '' str += print_separator('=', delimiter="=") @@ -120,19 +120,20 @@ def main(args=[]): str += print_line_no_columns(' ') str += print_line_no_columns(" Deployment description:") str += print_line_no_columns(" INSTALLER: %s" - % CONST.INSTALLER_TYPE) - if CONST.DEPLOY_SCENARIO is not None: + % CONST.__getattribute__('INSTALLER_TYPE')) + if CONST.__getattribute__('DEPLOY_SCENARIO') is not None: str += print_line_no_columns(" SCENARIO: %s" - % CONST.DEPLOY_SCENARIO) - if CONST.BUILD_TAG is not None: + % CONST.__getattribute__( + 'DEPLOY_SCENARIO')) + if CONST.__getattribute__('BUILD_TAG') is not None: str += print_line_no_columns(" BUILD TAG: %s" - % CONST.BUILD_TAG) - if CONST.CI_LOOP is not None: + % CONST.__getattribute__('BUILD_TAG')) + if CONST.__getattribute__('CI_LOOP') is not None: str += print_line_no_columns(" CI LOOP: %s" - % CONST.CI_LOOP) + % CONST.__getattribute__('CI_LOOP')) str += print_line_no_columns(' ') str += print_separator('=') - if CONST.IS_CI_RUN: + if CONST.__getattribute__('IS_CI_RUN'): str += print_line('TEST CASE', 'TIER', 'DURATION', 'RESULT', 'URL') else: str += print_line('TEST CASE', 'TIER', 'DURATION', 'RESULT') diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 08badf17..9fd07958 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -34,7 +34,7 @@ handler = None pod_arch = None arch_filter = ['aarch64'] -CONFIG_FUNCTEST_PATH = CONST.CONFIG_FUNCTEST_YAML +CONFIG_FUNCTEST_PATH = CONST.__getattribute__('CONFIG_FUNCTEST_YAML') CONFIG_PATCH_PATH = os.path.join(os.path.dirname( CONFIG_FUNCTEST_PATH), "config_patch.yaml") CONFIG_AARCH64_PATCH_PATH = os.path.join(os.path.dirname( @@ -66,63 +66,70 @@ def check_env_variables(): print_separator() logger.info("Checking environment variables...") - if CONST.INSTALLER_TYPE is None: + if CONST.__getattribute__('INSTALLER_TYPE') is None: logger.warning("The env variable 'INSTALLER_TYPE' is not defined.") - CONST.INSTALLER_TYPE = "undefined" + CONST.__setattr__('INSTALLER_TYPE', 'undefined') else: - if CONST.INSTALLER_TYPE not in opnfv_constants.INSTALLERS: + if (CONST.__getattribute__('INSTALLER_TYPE') not in + opnfv_constants.INSTALLERS): logger.warning("INSTALLER_TYPE=%s is not a valid OPNFV installer. " "Available OPNFV Installers are : %s. " "Setting INSTALLER_TYPE=undefined." - % (CONST.INSTALLER_TYPE, + % (CONST.__getattribute__('INSTALLER_TYPE'), opnfv_constants.INSTALLERS)) - CONST.INSTALLER_TYPE = "undefined" + CONST.__setattr__('INSTALLER_TYPE', 'undefined') else: logger.info(" INSTALLER_TYPE=%s" - % CONST.INSTALLER_TYPE) + % CONST.__getattribute__('INSTALLER_TYPE')) - if CONST.INSTALLER_IP is None: + if CONST.__getattribute__('INSTALLER_IP') is None: logger.warning("The env variable 'INSTALLER_IP' is not defined. " "It is needed to fetch the OpenStack credentials. " "If the credentials are not provided to the " "container as a volume, please add this env variable " "to the 'docker run' command.") else: - logger.info(" INSTALLER_IP=%s" % CONST.INSTALLER_IP) + logger.info(" INSTALLER_IP=%s" % + CONST.__getattribute__('INSTALLER_IP')) - if CONST.DEPLOY_SCENARIO is None: + if CONST.__getattribute__('DEPLOY_SCENARIO') is None: logger.warning("The env variable 'DEPLOY_SCENARIO' is not defined. " "Setting CI_SCENARIO=undefined.") - CONST.DEPLOY_SCENARIO = "undefined" + CONST.__setattr__('DEPLOY_SCENARIO', 'undefined') else: - logger.info(" DEPLOY_SCENARIO=%s" % CONST.DEPLOY_SCENARIO) - if CONST.CI_DEBUG: - logger.info(" CI_DEBUG=%s" % CONST.CI_DEBUG) + logger.info(" DEPLOY_SCENARIO=%s" + % CONST.__getattribute__('DEPLOY_SCENARIO')) + if CONST.__getattribute__('CI_DEBUG'): + logger.info(" CI_DEBUG=%s" % CONST.__getattribute__('CI_DEBUG')) - if CONST.NODE_NAME: - logger.info(" NODE_NAME=%s" % CONST.NODE_NAME) + if CONST.__getattribute__('NODE_NAME'): + logger.info(" NODE_NAME=%s" % CONST.__getattribute__('NODE_NAME')) - if CONST.BUILD_TAG: - logger.info(" BUILD_TAG=%s" % CONST.BUILD_TAG) + if CONST.__getattribute__('BUILD_TAG'): + logger.info(" BUILD_TAG=%s" % CONST.__getattribute__('BUILD_TAG')) - if CONST.IS_CI_RUN: - logger.info(" IS_CI_RUN=%s" % CONST.IS_CI_RUN) + if CONST.__getattribute__('IS_CI_RUN'): + logger.info(" IS_CI_RUN=%s" % CONST.__getattribute__('IS_CI_RUN')) def get_deployment_handler(): global handler global pod_arch - installer_params_yaml = os.path.join(CONST.dir_repo_functest, - 'functest/ci/installer_params.yaml') - if (CONST.INSTALLER_IP and CONST.INSTALLER_TYPE and - CONST.INSTALLER_TYPE in opnfv_constants.INSTALLERS): + installer_params_yaml = os.path.join( + CONST.__getattribute__('dir_repo_functest'), + 'functest/ci/installer_params.yaml') + if (CONST.__getattribute__('INSTALLER_IP') and + CONST.__getattribute__('INSTALLER_TYPE') and + CONST.__getattribute__('INSTALLER_TYPE') in + opnfv_constants.INSTALLERS): try: installer_params = ft_utils.get_parameter_from_yaml( - CONST.INSTALLER_TYPE, installer_params_yaml) + CONST.__getattribute__('INSTALLER_TYPE'), + installer_params_yaml) except ValueError as e: logger.debug('Printing deployment info is not supported for %s' % - CONST.INSTALLER_TYPE) + CONST.__getattribute__('INSTALLER_TYPE')) logger.debug(e) else: user = installer_params.get('user', None) @@ -130,8 +137,8 @@ def get_deployment_handler(): pkey = installer_params.get('pkey', None) try: handler = factory.Factory.get_handler( - installer=CONST.INSTALLER_TYPE, - installer_ip=CONST.INSTALLER_IP, + installer=CONST.__getattribute__('INSTALLER_TYPE'), + installer_ip=CONST.__getattribute__('INSTALLER_IP'), installer_user=user, installer_pwd=password, pkey_file=pkey) @@ -144,51 +151,55 @@ def get_deployment_handler(): def create_directories(): print_separator() logger.info("Creating needed directories...") - if not os.path.exists(CONST.dir_functest_conf): - os.makedirs(CONST.dir_functest_conf) - logger.info(" %s created." % CONST.dir_functest_conf) + if not os.path.exists(CONST.__getattribute__('dir_functest_conf')): + os.makedirs(CONST.__getattribute__('dir_functest_conf')) + logger.info(" %s created." % + CONST.__getattribute__('dir_functest_conf')) else: logger.debug(" %s already exists." - % CONST.dir_functest_conf) + % CONST.__getattribute__('dir_functest_conf')) - if not os.path.exists(CONST.dir_functest_data): - os.makedirs(CONST.dir_functest_data) - logger.info(" %s created." % CONST.dir_functest_data) + if not os.path.exists(CONST.__getattribute__('dir_functest_data')): + os.makedirs(CONST.__getattribute__('dir_functest_data')) + logger.info(" %s created." % + CONST.__getattribute__('dir_functest_data')) else: - logger.debug(" %s already exists." - % CONST.dir_functest_data) + logger.debug(" %s already exists." % + CONST.__getattribute__('dir_functest_data')) def source_rc_file(): print_separator() logger.info("Fetching RC file...") - if CONST.openstack_creds is None: + if CONST.__getattribute__('openstack_creds') is None: logger.warning("The environment variable 'creds' must be set and" "pointing to the local RC file. Using default: " "/home/opnfv/functest/conf/openstack.creds ...") - os.path.join(CONST.dir_functest_conf, 'openstack.creds') + os.path.join( + CONST.__getattribute__('dir_functest_conf'), 'openstack.creds') - if not os.path.isfile(CONST.openstack_creds): + if not os.path.isfile(CONST.__getattribute__('openstack_creds')): logger.info("RC file not provided. " "Fetching it from the installer...") - if CONST.INSTALLER_IP is None: - logger.error("The env variable CI_INSTALLER_IP must be provided in" + if CONST.__getattribute__('INSTALLER_IP')is None: + logger.error("The env variable 'INSTALLER_IP' must be provided in" " order to fetch the credentials from the installer.") raise Exception("Missing CI_INSTALLER_IP.") - if CONST.INSTALLER_TYPE not in opnfv_constants.INSTALLERS: + if (CONST.__getattribute__('INSTALLER_TYPE') not in + opnfv_constants.INSTALLERS): logger.error("Cannot fetch credentials. INSTALLER_TYPE=%s is " "not a valid OPNFV installer. Available " "installers are : %s." % - (CONST.INSTALLER_TYPE, + (CONST.__getattribute__('INSTALLER_TYPE'), opnfv_constants.INSTALLERS)) raise Exception("Wrong INSTALLER_TYPE.") cmd = ("/home/opnfv/repos/releng/utils/fetch_os_creds.sh " "-d %s -i %s -a %s" - % (CONST.openstack_creds, - CONST.INSTALLER_TYPE, - CONST.INSTALLER_IP)) + % (CONST.__getattribute__('openstack_creds'), + CONST.__getattribute__('INSTALLER_TYPE'), + CONST.__getattribute__('INSTALLER_IP'))) logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) output = p.communicate()[0] @@ -197,22 +208,23 @@ def source_rc_file(): raise Exception("Failed to fetch credentials from installer.") else: logger.info("RC file provided in %s." - % CONST.openstack_creds) - if os.path.getsize(CONST.openstack_creds) == 0: - raise Exception("The file %s is empty." % CONST.openstack_creds) + % CONST.__getattribute__('openstack_creds')) + if os.path.getsize(CONST.__getattribute__('openstack_creds')) == 0: + raise Exception("The file %s is empty." % + CONST.__getattribute__('openstack_creds')) logger.info("Sourcing the OpenStack RC file...") - os_utils.source_credentials(CONST.openstack_creds) + os_utils.source_credentials(CONST.__getattribute__('openstack_creds')) for key, value in os.environ.iteritems(): if re.search("OS_", key): if key == 'OS_AUTH_URL': - CONST.OS_AUTH_URL = value + CONST.__setattr__('OS_AUTH_URL', value) elif key == 'OS_USERNAME': - CONST.OS_USERNAME = value + CONST.__setattr__('OS_USERNAME', value) elif key == 'OS_TENANT_NAME': - CONST.OS_TENANT_NAME = value + CONST.__setattr__('OS_TENANT_NAME', value) elif key == 'OS_PASSWORD': - CONST.OS_PASSWORD = value + CONST.__setattr__('OS_PASSWORD', value) def patch_config_file(): @@ -229,7 +241,7 @@ def patch_file(patch_file_path): updated = False for key in patch_file: - if key in CONST.DEPLOY_SCENARIO: + if key in CONST.__getattribute__('DEPLOY_SCENARIO'): new_functest_yaml = dict(ft_utils.merge_dicts( ft_utils.get_functest_yaml(), patch_file[key])) updated = True @@ -244,7 +256,8 @@ def patch_file(patch_file_path): def verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") - cmd = ("%s/functest/ci/check_os.sh" % CONST.dir_repo_functest) + cmd = ("%s/functest/ci/check_os.sh" % + CONST.__getattribute__('dir_repo_functest')) logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) @@ -275,7 +288,7 @@ def install_rally(): cmd = "rally deployment destroy opnfv-rally" ft_utils.execute_command(cmd, error_msg=( "Deployment %s does not exist." - % CONST.rally_deployment_name), + % CONST.__getattribute__('rally_deployment_name')), verbose=False) rally_conf = os_utils.get_credentials_for_rally() @@ -283,7 +296,7 @@ def install_rally(): json.dump(rally_conf, fp) cmd = ("rally deployment create " "--file=rally_conf.json --name={0}" - .format(CONST.rally_deployment_name)) + .format(CONST.__getattribute__('rally_deployment_name'))) error_msg = "Problem while creating Rally deployment" ft_utils.execute_command_raise(cmd, error_msg=error_msg) @@ -305,17 +318,18 @@ def install_rally(): def install_tempest(): logger.info("Installing tempest from existing repo...") cmd = ("rally verify list-verifiers | " - "grep '{0}' | wc -l".format(CONST.tempest_deployment_name)) + "grep '{0}' | wc -l".format( + CONST.__getattribute__('tempest_deployment_name'))) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) while p.poll() is None: line = p.stdout.readline().rstrip() if str(line) == '0': logger.debug("Tempest %s does not exist" % - CONST.tempest_deployment_name) + CONST.__getattribute__('tempest_deployment_name')) cmd = ("rally verify create-verifier --source {0} " "--name {1} --type tempest --system-wide" - .format(CONST.dir_repo_tempest, - CONST.tempest_deployment_name)) + .format(CONST.__getattribute__('dir_repo_tempest'), + CONST.__getattribute__('tempest_deployment_name'))) error_msg = "Problem while installing Tempest." ft_utils.execute_command_raise(cmd, error_msg=error_msg) @@ -332,10 +346,10 @@ def create_flavor(): def check_environment(): msg_not_active = "The Functest environment is not installed." - if not os.path.isfile(CONST.env_active): + if not os.path.isfile(CONST.__getattribute__('env_active')): raise Exception(msg_not_active) - with open(CONST.env_active, "r") as env_file: + with open(CONST.__getattribute__('env_active'), "r") as env_file: s = env_file.read() if not re.search("1", s): raise Exception(msg_not_active) @@ -365,7 +379,7 @@ def main(**kwargs): install_rally() install_tempest() create_flavor() - with open(CONST.env_active, "w") as env_file: + with open(CONST.__getattribute__('env_active'), "w") as env_file: env_file.write("1") check_environment() print_deployment_info() diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index d1361260..073e09a7 100755 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -75,7 +75,7 @@ def print_separator(str, count=45): def source_rc_file(): - rc_file = CONST.openstack_creds + rc_file = CONST.__getattribute__('openstack_creds') if not os.path.isfile(rc_file): raise Exception("RC file %s does not exist..." % rc_file) logger.debug("Sourcing the OpenStack RC file...") @@ -83,13 +83,13 @@ def source_rc_file(): for key, value in os.environ.iteritems(): if re.search("OS_", key): if key == 'OS_AUTH_URL': - CONST.OS_AUTH_URL = value + CONST.__setattr__('OS_AUTH_URL', value) elif key == 'OS_USERNAME': - CONST.OS_USERNAME = value + CONST.__setattr__('OS_USERNAME', value) elif key == 'OS_TENANT_NAME': - CONST.OS_TENANT_NAME = value + CONST.__setattr__('OS_TENANT_NAME', value) elif key == 'OS_PASSWORD': - CONST.OS_PASSWORD = value + CONST.__setattr__('OS_PASSWORD', value) def generate_os_snapshot(): @@ -211,7 +211,8 @@ def run_all(tiers): for tier in tiers.get_tiers(): if (len(tier.get_tests()) != 0 and - re.search(CONST.CI_LOOP, tier.get_ci_loop()) is not None): + re.search(CONST.__getattribute__('CI_LOOP'), + tier.get_ci_loop()) is not None): tiers_to_run.append(tier) summary += ("\n - %s:\n\t %s" % (tier.get_name(), @@ -227,11 +228,10 @@ def run_all(tiers): def main(**kwargs): - CI_INSTALLER_TYPE = CONST.INSTALLER_TYPE - CI_SCENARIO = CONST.DEPLOY_SCENARIO - file = CONST.functest_testcases_yaml - _tiers = tb.TierBuilder(CI_INSTALLER_TYPE, CI_SCENARIO, file) + _tiers = tb.TierBuilder(CONST.__getattribute__('INSTALLER_TYPE'), + CONST.__getattribute__('DEPLOY_SCENARIO'), + file) if kwargs['noclean']: GlobalVariables.CLEAN_FLAG = False @@ -256,7 +256,8 @@ def main(**kwargs): logger.error("Unknown test case or tier '%s', " "or not supported by " "the given scenario '%s'." - % (kwargs['test'], CI_SCENARIO)) + % (kwargs['test'], + CONST.__getattribute__('DEPLOY_SCENARIO'))) logger.debug("Available tiers are:\n\n%s" % _tiers) return Result.EX_ERROR -- cgit 1.2.3-korg