diff options
| -rw-r--r-- | functest/ci/generate_report.py | 35 | ||||
| -rwxr-xr-x | functest/ci/prepare_env.py | 146 | ||||
| -rwxr-xr-x | functest/ci/run_tests.py | 23 | ||||
| -rw-r--r-- | functest/core/vnf_base.py | 18 | ||||
| -rw-r--r-- | functest/opnfv_tests/vnf/ims/opera_ims.py | 12 | ||||
| -rw-r--r-- | functest/tests/unit/ci/test_generate_report.py | 24 | ||||
| -rw-r--r-- | functest/tests/unit/ci/test_prepare_env.py | 79 | ||||
| -rw-r--r-- | functest/tests/unit/ci/test_run_tests.py | 13 | ||||
| -rw-r--r-- | requirements.txt | 1 |
9 files changed, 188 insertions, 163 deletions
diff --git a/functest/ci/generate_report.py b/functest/ci/generate_report.py index 7a25fd952..17240e8c0 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 08badf176..9fd07958e 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 d9f3fe42d..ae002c2e3 100755 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -74,7 +74,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...") @@ -82,13 +82,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(): @@ -207,7 +207,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(), @@ -223,11 +224,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 @@ -252,7 +252,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 diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py index 90bc80b38..bc5bf9a71 100644 --- a/functest/core/vnf_base.py +++ b/functest/core/vnf_base.py @@ -26,12 +26,12 @@ class VnfOnBoardingBase(base.TestCase): self.repo = kwargs.get('repo', '') self.cmd = kwargs.get('cmd', '') self.details = {} - self.result_dir = CONST.dir_results + self.result_dir = CONST.__getattribute__('dir_results') self.details_step_mapping = dict( - deploy_orchestrator='orchestrator', - deploy_vnf='vnf', - test_vnf='test_vnf', - prepare='prepare_env') + deploy_orchestrator='orchestrator', + deploy_vnf='vnf', + test_vnf='test_vnf', + prepare='prepare_env') self.details['prepare_env'] = {} self.details['orchestrator'] = {} self.details['vnf'] = {} @@ -127,7 +127,7 @@ class VnfOnBoardingBase(base.TestCase): self.creds['username']) if not admin_user_id: self.step_failure("Failed to get id of {0}".format( - self.creds['username'])) + self.creds['username'])) tenant_id = os_utils.get_tenant_id(self.keystone_client, self.tenant_name) @@ -137,7 +137,7 @@ class VnfOnBoardingBase(base.TestCase): self.tenant_description) if not tenant_id: self.step_failure("Failed to get or create {0} tenant".format( - self.tenant_name)) + self.tenant_name)) roles_name = ["admin", "Admin"] role_id = '' for role_name in roles_name: @@ -147,12 +147,12 @@ class VnfOnBoardingBase(base.TestCase): if not role_id: self.step_failure("Failed to get id for {0} role".format( - role_name)) + role_name)) if not os_utils.add_role_user(self.keystone_client, admin_user_id, role_id, tenant_id): self.step_failure("Failed to add {0} on tenant".format( - self.creds['username'])) + self.creds['username'])) user_id = os_utils.get_or_create_user(self.keystone_client, self.tenant_name, diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py index 51a4dc0d1..8defdee67 100644 --- a/functest/opnfv_tests/vnf/ims/opera_ims.py +++ b/functest/opnfv_tests/vnf/ims/opera_ims.py @@ -64,27 +64,27 @@ class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase): self.logger.info('VNFM IP: %s', vnfm_ip) vnf_status_url = 'http://{0}:5000/api/v1/model/status'.format(vnfm_ip) vnf_alive = False - retry = 15 + retry = 40 self.logger.info('Check the VNF status') while retry > 0: - rq = requests.get(vnf_status_url) + rq = requests.get(vnf_status_url, timeout=90) response = rq.json() vnf_alive = response['vnf_alive'] msg = response['msg'] self.logger.info(msg) if vnf_alive: break - self.logger.info('check again in one minute...') + self.logger.info('check again in one and half a minute...') retry = retry - 1 - time.sleep(60) + time.sleep(90) if not vnf_alive: raise Exception('VNF failed to start: {0}'.format(msg)) ellis_config_url = ('http://{0}:5000/api/v1/model/ellis/configure' .format(vnfm_ip)) - rq = requests.get(ellis_config_url, timeout=60) + rq = requests.get(ellis_config_url, timeout=90) if rq.json() and not rq.json()['ellis_ok']: self.logger.error(rq.json()['data']) raise Exception('Failed to configure Ellis') @@ -92,7 +92,7 @@ class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase): self.logger.info('Get Clearwater deployment detail') vnf_info_url = ('http://{0}:5000/api/v1/model/output' .format(vnfm_ip)) - rq = requests.get(vnf_info_url, timeout=60) + rq = requests.get(vnf_info_url, timeout=90) data = rq.json()['data'] self.logger.info(data) bono_ip = data['bono_ip'] diff --git a/functest/tests/unit/ci/test_generate_report.py b/functest/tests/unit/ci/test_generate_report.py index 2225586f2..13361c1d1 100644 --- a/functest/tests/unit/ci/test_generate_report.py +++ b/functest/tests/unit/ci/test_generate_report.py @@ -29,7 +29,7 @@ class GenerateReportTesting(unittest.TestCase): side_effect=urllib2.URLError('no host given')) def test_get_results_from_db_fail(self, mock_method): url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + CONST.__getattribute__('BUILD_TAG')) self.assertIsNone(gen_report.get_results_from_db()) mock_method.assert_called_once_with(url) @@ -37,7 +37,7 @@ class GenerateReportTesting(unittest.TestCase): return_value={'results': []}) def test_get_results_from_db_success(self, mock_method): url = "%s/results?build_tag=%s" % (ft_utils.get_db_url(), - CONST.BUILD_TAG) + CONST.__getattribute__('BUILD_TAG')) self.assertEqual(gen_report.get_results_from_db(), None) mock_method.assert_called_once_with(url) @@ -45,7 +45,7 @@ class GenerateReportTesting(unittest.TestCase): self.assertIsInstance(gen_report.get_data({'result': ''}, ''), dict) def test_print_line_with_ci_run(self): - CONST.IS_CI_RUN = True + CONST.__setattr__('IS_CI_RUN', True) w1 = 'test_print_line' test_str = ("| %s| %s| %s| %s| %s|\n" % (w1.ljust(gen_report.COL_1_LEN - 1), @@ -56,7 +56,7 @@ class GenerateReportTesting(unittest.TestCase): self.assertEqual(gen_report.print_line(w1), test_str) def test_print_line_without_ci_run(self): - CONST.IS_CI_RUN = False + CONST.__setattr__('IS_CI_RUN', False) w1 = 'test_print_line' test_str = ("| %s| %s| %s| %s|\n" % (w1.ljust(gen_report.COL_1_LEN - 1), @@ -66,7 +66,7 @@ class GenerateReportTesting(unittest.TestCase): self.assertEqual(gen_report.print_line(w1), test_str) def test_print_line_no_column_with_ci_run(self): - CONST.IS_CI_RUN = True + CONST.__setattr__('IS_CI_RUN', True) TOTAL_LEN = gen_report.COL_1_LEN + gen_report.COL_2_LEN TOTAL_LEN += gen_report.COL_3_LEN + gen_report.COL_4_LEN + 2 TOTAL_LEN += gen_report.COL_5_LEN + 1 @@ -74,14 +74,14 @@ class GenerateReportTesting(unittest.TestCase): self.assertEqual(gen_report.print_line_no_columns('test'), test_str) def test_print_line_no_column_without_ci_run(self): - CONST.IS_CI_RUN = False + CONST.__setattr__('IS_CI_RUN', False) TOTAL_LEN = gen_report.COL_1_LEN + gen_report.COL_2_LEN TOTAL_LEN += gen_report.COL_3_LEN + gen_report.COL_4_LEN + 2 test_str = ("| %s|\n" % 'test'.ljust(TOTAL_LEN)) self.assertEqual(gen_report.print_line_no_columns('test'), test_str) def test_print_separator_with_ci_run(self): - CONST.IS_CI_RUN = True + CONST.__setattr__('IS_CI_RUN', True) test_str = ("+" + "=" * gen_report.COL_1_LEN + "+" + "=" * gen_report.COL_2_LEN + "+" + "=" * gen_report.COL_3_LEN + @@ -91,7 +91,7 @@ class GenerateReportTesting(unittest.TestCase): self.assertEqual(gen_report.print_separator(), test_str) def test_print_separator_without_ci_run(self): - CONST.IS_CI_RUN = False + CONST.__setattr__('IS_CI_RUN', False) test_str = ("+" + "=" * gen_report.COL_1_LEN + "+" + "=" * gen_report.COL_2_LEN + "+" + "=" * gen_report.COL_3_LEN + @@ -101,25 +101,25 @@ class GenerateReportTesting(unittest.TestCase): @mock.patch('functest.ci.generate_report.logger.info') def test_main_with_ci_run(self, mock_method): - CONST.IS_CI_RUN = True + CONST.__setattr__('IS_CI_RUN', True) gen_report.main() mock_method.assert_called_once_with(test_utils.SubstrMatch('URL')) @mock.patch('functest.ci.generate_report.logger.info') def test_main_with_ci_loop(self, mock_method): - CONST.CI_LOOP = 'daily' + CONST.__setattr__('CI_LOOP', 'daily') gen_report.main() mock_method.assert_called_once_with(test_utils.SubstrMatch('CI LOOP')) @mock.patch('functest.ci.generate_report.logger.info') def test_main_with_scenario(self, mock_method): - CONST.DEPLOY_SCENARIO = 'test_scenario' + CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario') gen_report.main() mock_method.assert_called_once_with(test_utils.SubstrMatch('SCENARIO')) @mock.patch('functest.ci.generate_report.logger.info') def test_main_with_build_tag(self, mock_method): - CONST.BUILD_TAG = 'test_build_tag' + CONST.__setattr__('BUILD_TAG', 'test_build_tag') gen_report.main() mock_method.assert_called_once_with(test_utils. SubstrMatch('BUILD TAG')) diff --git a/functest/tests/unit/ci/test_prepare_env.py b/functest/tests/unit/ci/test_prepare_env.py index 714dd13c3..39a0825c3 100644 --- a/functest/tests/unit/ci/test_prepare_env.py +++ b/functest/tests/unit/ci/test_prepare_env.py @@ -33,7 +33,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_missing_inst_type(self, mock_logger_warn, mock_logger_info): - CONST.INSTALLER_TYPE = None + CONST.__setattr__('INSTALLER_TYPE', None) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -44,7 +44,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_missing_inst_ip(self, mock_logger_warn, mock_logger_info): - CONST.INSTALLER_IP = None + CONST.__setattr__('INSTALLER_IP', None) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -61,7 +61,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_inst_ip(self, mock_logger_warn, mock_logger_info): - CONST.INSTALLER_IP = mock.Mock() + CONST.__setattr__('INSTALLER_IP', mock.Mock()) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -72,7 +72,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_missing_scenario(self, mock_logger_warn, mock_logger_info): - CONST.DEPLOY_SCENARIO = None + CONST.__setattr__('DEPLOY_SCENARIO', None) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -84,7 +84,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_scenario(self, mock_logger_warn, mock_logger_info): - CONST.DEPLOY_SCENARIO = 'test_scenario' + CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario') prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -95,7 +95,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_ci_debug(self, mock_logger_warn, mock_logger_info): - CONST.CI_DEBUG = mock.Mock() + CONST.__setattr__('CI_DEBUG', mock.Mock()) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -106,7 +106,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_node(self, mock_logger_warn, mock_logger_info): - CONST.NODE_NAME = mock.Mock() + CONST.__setattr__('NODE_NAME', mock.Mock()) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -117,7 +117,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_build_tag(self, mock_logger_warn, mock_logger_info): - CONST.BUILD_TAG = mock.Mock() + CONST.__setattr__('BUILD_TAG', mock.Mock()) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -129,7 +129,7 @@ class PrepareEnvTesting(unittest.TestCase): @mock.patch('functest.ci.prepare_env.logger.warning') def test_check_env_variables_with_is_ci_run(self, mock_logger_warn, mock_logger_info): - CONST.IS_CI_RUN = mock.Mock() + CONST.__setattr__('IS_CI_RUN', mock.Mock()) prepare_env.check_env_variables() mock_logger_info.assert_any_call("Checking environment variables" "...") @@ -140,11 +140,11 @@ class PrepareEnvTesting(unittest.TestCase): def test_get_deployment_handler_missing_const_vars(self): with mock.patch('functest.ci.prepare_env.' 'factory.Factory.get_handler') as m: - CONST.INSTALLER_IP = None + CONST.__setattr__('INSTALLER_IP', None) prepare_env.get_deployment_handler() self.assertFalse(m.called) - CONST.INSTALLER_TYPE = None + CONST.__setattr__('INSTALLER_TYPE', None) prepare_env.get_deployment_handler() self.assertFalse(m.called) @@ -156,8 +156,8 @@ class PrepareEnvTesting(unittest.TestCase): mock.patch('functest.ci.prepare_env.' 'ft_utils.get_parameter_from_yaml', side_effect=ValueError): - CONST.INSTALLER_IP = 'test_ip' - CONST.INSTALLER_TYPE = 'test_inst_type' + CONST.__setattr__('INSTALLER_IP', 'test_ip') + CONST.__setattr__('INSTALLER_TYPE', 'test_inst_type') opnfv_constants.INSTALLERS = ['test_inst_type'] prepare_env.get_deployment_handler() msg = ('Printing deployment info is not supported for ' @@ -172,8 +172,8 @@ class PrepareEnvTesting(unittest.TestCase): side_effect=Exception), \ mock.patch('functest.ci.prepare_env.' 'ft_utils.get_parameter_from_yaml'): - CONST.INSTALLER_IP = 'test_ip' - CONST.INSTALLER_TYPE = 'test_inst_type' + CONST.__setattr__('INSTALLER_IP', 'test_ip') + CONST.__setattr__('INSTALLER_TYPE', 'test_inst_type') opnfv_constants.INSTALLERS = ['test_inst_type'] prepare_env.get_deployment_handler() self.assertTrue(mock_debug.called) @@ -188,12 +188,16 @@ class PrepareEnvTesting(unittest.TestCase): as mock_method: prepare_env.create_directories() mock_logger_info.assert_any_call("Creating needed directories...") - mock_method.assert_any_call(CONST.dir_functest_conf) - mock_method.assert_any_call(CONST.dir_functest_data) + mock_method.assert_any_call( + CONST.__getattribute__('dir_functest_conf')) + mock_method.assert_any_call( + CONST.__getattribute__('dir_functest_data')) mock_logger_info.assert_any_call(" %s created." % - CONST.dir_functest_conf) + CONST.__getattribute__( + 'dir_functest_conf')) mock_logger_info.assert_any_call(" %s created." % - CONST.dir_functest_data) + CONST.__getattribute__( + 'dir_functest_data')) @mock.patch('functest.ci.prepare_env.logger.info') @mock.patch('functest.ci.prepare_env.logger.debug') @@ -204,9 +208,11 @@ class PrepareEnvTesting(unittest.TestCase): prepare_env.create_directories() mock_logger_info.assert_any_call("Creating needed directories...") mock_logger_debug.assert_any_call(" %s already exists." % - CONST.dir_functest_conf) + CONST.__getattribute__( + 'dir_functest_conf')) mock_logger_debug.assert_any_call(" %s already exists." % - CONST.dir_functest_data) + CONST.__getattribute__( + 'dir_functest_data')) def _get_env_cred_dict(self, os_prefix=''): return {'OS_USERNAME': os_prefix + 'username', @@ -230,24 +236,24 @@ class PrepareEnvTesting(unittest.TestCase): mock.patch('functest.ci.prepare_env.os.path.getsize', return_value=0), \ self.assertRaises(Exception): - CONST.openstack_creds = 'test_creds' + CONST.__setattr__('openstack_creds', 'test_creds') prepare_env.source_rc_file() def test_source_rc_missing_installer_ip(self): with mock.patch('functest.ci.prepare_env.os.path.isfile', return_value=False), \ self.assertRaises(Exception): - CONST.INSTALLER_IP = None - CONST.openstack_creds = 'test_creds' + CONST.__setattr__('INSTALLER_IP', None) + CONST.__setattr__('openstack_creds', 'test_creds') prepare_env.source_rc_file() def test_source_rc_missing_installer_type(self): with mock.patch('functest.ci.prepare_env.os.path.isfile', return_value=False), \ self.assertRaises(Exception): - CONST.INSTALLER_IP = 'test_ip' - CONST.openstack_creds = 'test_creds' - CONST.INSTALLER_TYPE = 'test_type' + CONST.__setattr__('INSTALLER_IP', 'test_ip') + CONST.__setattr__('openstack_creds', 'test_creds') + CONST.__setattr__('INSTALLER_TYPE', 'test_type') opnfv_constants.INSTALLERS = [] prepare_env.source_rc_file() @@ -259,9 +265,9 @@ class PrepareEnvTesting(unittest.TestCase): mock.patch('functest.ci.prepare_env.subprocess.Popen') \ as mock_subproc_popen, \ self.assertRaises(Exception): - CONST.openstack_creds = 'test_creds' - CONST.INSTALLER_IP = None - CONST.INSTALLER_TYPE = 'test_type' + CONST.__setattr__('openstack_creds', 'test_creds') + CONST.__setattr__('INSTALLER_IP', None) + CONST.__setattr__('INSTALLER_TYPE', 'test_type') opnfv_constants.INSTALLERS = ['test_type'] process_mock = mock.Mock() @@ -281,7 +287,7 @@ class PrepareEnvTesting(unittest.TestCase): return_value={'tkey1': 'tvalue1'}), \ mock.patch('functest.ci.prepare_env.os.remove') as m, \ mock.patch('functest.ci.prepare_env.yaml.dump'): - CONST.DEPLOY_SCENARIO = 'test_scenario' + CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario') prepare_env.patch_file('test_file') self.assertTrue(m.called) @@ -321,12 +327,12 @@ class PrepareEnvTesting(unittest.TestCase): cmd = "rally deployment destroy opnfv-rally" error_msg = "Deployment %s does not exist." % \ - CONST.rally_deployment_name + CONST.__getattribute__('rally_deployment_name') mock_logger_info.assert_any_call("Creating Rally environment...") mock_exec.assert_any_call(cmd, error_msg=error_msg, verbose=False) cmd = "rally deployment create --file=rally_conf.json --name=" - cmd += CONST.rally_deployment_name + cmd += CONST.__getattribute__('rally_deployment_name') error_msg = "Problem while creating Rally deployment" mock_exec_raise.assert_any_call(cmd, error_msg=error_msg) @@ -352,7 +358,7 @@ class PrepareEnvTesting(unittest.TestCase): 'stdout.readline.return_value': '0'} mock_popen.configure_mock(**attrs) - CONST.tempest_deployment_name = 'test_dep_name' + CONST.__setattr__('tempest_deployment_name', 'test_dep_name') with mock.patch('functest.ci.prepare_env.' 'ft_utils.execute_command_raise', side_effect=Exception), \ @@ -379,7 +385,7 @@ class PrepareEnvTesting(unittest.TestCase): with mock.patch('functest.ci.prepare_env.os.path.isfile', return_value=False), \ self.assertRaises(Exception): - prepare_env.check_environment() + prepare_env.check_environment() @mock.patch('functest.ci.prepare_env.sys.exit') @mock.patch('functest.ci.prepare_env.logger.error') @@ -431,7 +437,8 @@ class PrepareEnvTesting(unittest.TestCase): self.assertTrue(mock_install_rally.called) self.assertTrue(mock_install_temp.called) self.assertTrue(mock_create_flavor.called) - m.assert_called_once_with(CONST.env_active, "w") + m.assert_called_once_with( + CONST.__getattribute__('env_active'), "w") self.assertTrue(mock_check_env.called) self.assertTrue(mock_print_info.called) diff --git a/functest/tests/unit/ci/test_run_tests.py b/functest/tests/unit/ci/test_run_tests.py index 7d02b1af1..ef08282aa 100644 --- a/functest/tests/unit/ci/test_run_tests.py +++ b/functest/tests/unit/ci/test_run_tests.py @@ -62,13 +62,13 @@ class RunTestsTesting(unittest.TestCase): @mock.patch('functest.ci.run_tests.os_snapshot.main') def test_generate_os_snapshot(self, mock_os_snap): - run_tests.generate_os_snapshot() - self.assertTrue(mock_os_snap.called) + run_tests.generate_os_snapshot() + self.assertTrue(mock_os_snap.called) @mock.patch('functest.ci.run_tests.os_clean.main') def test_cleanup(self, mock_os_clean): - run_tests.cleanup() - self.assertTrue(mock_os_clean.called) + run_tests.cleanup() + self.assertTrue(mock_os_clean.called) def test_update_test_info(self): run_tests.GlobalVariables.EXECUTED_TEST_CASES = [self.test] @@ -179,7 +179,7 @@ class RunTestsTesting(unittest.TestCase): with mock.patch('functest.ci.run_tests.run_tier') as mock_method, \ mock.patch('functest.ci.run_tests.generate_report.init'), \ mock.patch('functest.ci.run_tests.generate_report.main'): - CONST.CI_LOOP = 'test_ci_loop' + CONST.__setattr__('CI_LOOP', 'test_ci_loop') run_tests.run_all(self.tiers) mock_method.assert_any_call(self.tier) self.assertTrue(mock_logger_info.called) @@ -188,7 +188,7 @@ class RunTestsTesting(unittest.TestCase): def test_run_all__missing_tier(self, mock_logger_info): with mock.patch('functest.ci.run_tests.generate_report.init'), \ mock.patch('functest.ci.run_tests.generate_report.main'): - CONST.CI_LOOP = 'loop_re_not_available' + CONST.__setattr__('CI_LOOP', 'loop_re_not_available') run_tests.run_all(self.tiers) self.assertTrue(mock_logger_info.called) @@ -268,5 +268,6 @@ class RunTestsTesting(unittest.TestCase): run_tests.Result.EX_ERROR) self.assertTrue(m.called) + if __name__ == "__main__": unittest.main(verbosity=2) diff --git a/requirements.txt b/requirements.txt index 92f16bcca..e709220a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,3 +32,4 @@ Pillow==3.3.0 click==6.6 openbaton-cli==2.2.1-beta7 mock==1.3.0 +iniparse==0.4 |