diff options
33 files changed, 166 insertions, 85 deletions
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index 56a5482a..2171dbe4 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -25,6 +25,7 @@ functest_testsuite: - refstack_defcore - tempest_smoke_serial - tempest_full_parallel + - tempest_custom - rally_sanity - promise diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml index d1f1d6a0..460506a6 100644 --- a/dovetail/conf/functest_config.yml +++ b/dovetail/conf/functest_config.yml @@ -14,5 +14,5 @@ functest: - 'echo test for postcondition in functest' result: dir: '/home/opnfv/functest/results' - file_path: 'dump.txt' + file_path: 'functest_results.txt' openrc: '/home/opnfv/functest/conf/openstack.creds' diff --git a/dovetail/container.py b/dovetail/container.py index f7912d58..3b040ca9 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -63,8 +63,8 @@ class Container(object): # These are all just used by Functest's function push_results_to_db. # And has nothing to do with DoveTail running test cases. - ins_type = " -e INSTALLER_TYPE=vendor-specific" - scenario = " -e DEPLOY_SCENARIO=default" + ins_type = " -e INSTALLER_TYPE=unknown" + scenario = " -e DEPLOY_SCENARIO=unknown" node = " -e NODE_NAME=master" envs = "%s %s %s" % (ins_type, scenario, node) @@ -72,8 +72,9 @@ class Container(object): if dovetail_config['report_dest'].startswith("http"): report = " -e TEST_DB_URL=%s " % dovetail_config['report_dest'] if dovetail_config['report_dest'] == "file": - file_path = dovetail_config["functest"]['result']['dir'] - file_path = file_path[0:file_path.rfind('/results')] + func_res_conf = dovetail_config["functest"]['result'] + file_path = os.path.join(func_res_conf['dir'], + func_res_conf['file_path']) report = " -e TEST_DB_URL=file://%s " % file_path return "%s %s" % (envs, report) @@ -99,7 +100,7 @@ class Container(object): return "%s %s" % (envs, log_vol) @classmethod - def create(cls, type): + def create(cls, type, testcase_name): sshkey = "-v /root/.ssh/id_rsa:/root/.ssh/id_rsa " dovetail_config = dt_cfg.dovetail_config docker_image = cls.get_docker_image(type) @@ -113,7 +114,8 @@ class Container(object): # CI_DEBUG is used for showing the debug logs of the upstream projects # BUILD_TAG is the unique id for this test envs = ' -e CI_DEBUG=true' - envs = envs + ' -e BUILD_TAG=%s' % dovetail_config['build_tag'] + envs = envs + ' -e BUILD_TAG=%s-%s' % (dovetail_config['build_tag'], + testcase_name) config = "" if type.lower() == "functest": diff --git a/dovetail/report.py b/dovetail/report.py index 3dd636c7..c7eff3d2 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -110,7 +110,12 @@ class Report(object): for testcase in report_data['testcases_list']: pattern = re.compile( '|'.join(dt_cfg.dovetail_config['testarea_supported'])) - area = pattern.findall(testcase['name'])[0] + area = pattern.findall(testcase['name']) + if not area: + cls.logger.error("testcase %s not in supported testarea", + testcase['name']) + return None + area = area[0] testarea_scope.append(area) sub_report[area] += '-%-25s %s\n' %\ (testcase['name'], testcase['result']) @@ -178,14 +183,14 @@ class Report(object): cls.logger.error('crawler is None:%s', testcase.name()) return None - if validate_testcase in cls.results[type]: - return cls.results[type][validate_testcase] + # if validate_testcase in cls.results[type]: + # return cls.results[type][validate_testcase] result = crawler.crawl(testcase) if result is not None: cls.results[type][validate_testcase] = result - testcase.script_result_acquired(True) + # testcase.script_result_acquired(True) cls.logger.debug('testcase: %s -> result acquired', validate_testcase) else: @@ -224,6 +229,7 @@ class FunctestCrawler(object): timestop = 0 duration = 0 testcase_name = testcase.validate_testcase() + build_tag = '%s-%s' % (dovetail_config['build_tag'], testcase.name()) file_path = \ os.path.join(dovetail_config['result_dir'], dovetail_config[self.type]['result']['file_path']) @@ -241,7 +247,8 @@ class FunctestCrawler(object): for jsonfile in f: try: data = json.loads(jsonfile) - if testcase_name == data['case_name']: + if testcase_name == data['case_name'] and \ + build_tag == data['build_tag']: criteria = data['criteria'] timestart = data['start_date'] timestop = data['stop_date'] @@ -270,7 +277,7 @@ class FunctestCrawler(object): return json_results def crawl_from_url(self, testcase=None): - url = "%s/results?case=%s&last=1" % \ + url = "%s?case=%s&last=1" % \ (dt_cfg.dovetail_config['report_dest'], testcase.validate_testcase()) self.logger.debug("Query to rest api: %s", url) @@ -377,6 +384,8 @@ class FunctestChecker(object): @staticmethod def get_sub_testcase(sub_testcase, result): + if not result: + return False reg = sub_testcase + '[\s+\d+]' find_reg = re.compile(reg) match = find_reg.findall(result) diff --git a/dovetail/run.py b/dovetail/run.py index 556f8137..f268f921 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -57,8 +57,8 @@ def run_test(testsuite, testarea, logger): if testcase.exceed_max_retry_times(): run_testcase = False - if testcase.script_result_acquired(): - run_testcase = False + # if testcase.script_result_acquired(): + # run_testcase = False if run_testcase: testcase.run() @@ -82,7 +82,7 @@ def check_tc_result(testcase, logger): else: if dt_utils.check_db_results(dt_cfg.dovetail_config['report_dest'], dt_cfg.dovetail_config['build_tag'], - testcase.validate_testcase(), + testcase.name(), logger): logger.info("Results have been pushed to database.") else: diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index 2c1b7fd6..cfc49018 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -39,7 +39,8 @@ class DockerRunner(object): if not Container.pull_image(self.testcase.validate_type()): self.logger.error("Failed to pull the image.") return - container_id = Container.create(self.testcase.validate_type()) + container_id = Container.create(self.testcase.validate_type(), + self.testcase.name()) if not container_id: self.logger.error('failed to create container') return diff --git a/dovetail/testcase.py b/dovetail/testcase.py index 13a31fde..408599fc 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -159,7 +159,7 @@ class Testcase(object): src_file.write(sub_test + '\n') self.logger.debug('save testcases to %s', file_path) except Exception: - self.logger.error('Failed to save: %s', src_file) + self.logger.error('Failed to save: %s', file_path) src_file_path = os.path.join(dt_cfg.dovetail_config['result_dir'], testcase_src_file) diff --git a/dovetail/testcase/ipv6.tc001.yml b/dovetail/testcase/ipv6.tc001.yml index 598e1cad..a70d41eb 100644 --- a/dovetail/testcase/ipv6.tc001.yml +++ b/dovetail/testcase/ipv6.tc001.yml @@ -4,16 +4,12 @@ dovetail.ipv6.tc001: objective: Bulk creation and deletion of IPv6 networks, ports and subnets validate: type: functest - testcase: tempest_smoke_serial - pre_condition: - - 'echo test for precondition in testcase' - cmds: - - 'functest env prepare' - - 'functest testcase run {{validate_testcase}} -r' - post_condition: - - 'echo test for precondition in testcase' + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network - - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port - - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet + - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_network[id-d4f9024d-1e28-4fc1-a6b1-25dbc6fa11e2,smoke] + - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_port[id-48037ff2-e889-4c3b-b86a-8e3f34d2d060,smoke] + - tempest.api.network.test_networks.BulkNetworkOpsIpV6Test.test_bulk_create_delete_subnet[id-8936533b-c0aa-4f29-8e53-6cc873aec489,smoke] diff --git a/dovetail/testcase/ipv6.tc002.yml b/dovetail/testcase/ipv6.tc002.yml index 37406a2e..48aeafa3 100644 --- a/dovetail/testcase/ipv6.tc002.yml +++ b/dovetail/testcase/ipv6.tc002.yml @@ -4,9 +4,12 @@ dovetail.ipv6.tc002: objective: VIM ipv6 operations, to create/update/delete an IPv6 network and subnet validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet + - tempest.api.network.test_networks.NetworksIpV6Test.test_create_update_delete_network_subnet[id-0e269138-0da6-4efc-a46d-578161e7b221,smoke] - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_create_update_delete_network_subnet diff --git a/dovetail/testcase/ipv6.tc003.yml b/dovetail/testcase/ipv6.tc003.yml index d7c7f716..d9c93799 100644 --- a/dovetail/testcase/ipv6.tc003.yml +++ b/dovetail/testcase/ipv6.tc003.yml @@ -4,8 +4,11 @@ dovetail.ipv6.tc003: objective: VIM ipv6 operations, to check external network visibility validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility + - tempest.api.network.test_networks.NetworksIpV6Test.test_external_network_visibility[id-af774677-42a9-4e4b-bb58-16fe6a5bc1ec,smoke] - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_external_network_visibility diff --git a/dovetail/testcase/ipv6.tc004.yml b/dovetail/testcase/ipv6.tc004.yml index 984dd1b5..a69b9fcd 100644 --- a/dovetail/testcase/ipv6.tc004.yml +++ b/dovetail/testcase/ipv6.tc004.yml @@ -4,10 +4,13 @@ dovetail.ipv6.tc004: objective: VIM ipv6 operations, to list IPv6 networks and subnets of a tenant validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks - - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets + - tempest.api.network.test_networks.NetworksIpV6Test.test_list_networks[id-f7ffdeda-e200-4a7a-bcbe-05716e86bf43,smoke] + - tempest.api.network.test_networks.NetworksIpV6Test.test_list_subnets[id-db68ba48-f4ea-49e9-81d1-e367f6d0b20a,smoke] - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_networks - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_list_subnets diff --git a/dovetail/testcase/ipv6.tc005.yml b/dovetail/testcase/ipv6.tc005.yml index d6e74aee..52cae5f5 100644 --- a/dovetail/testcase/ipv6.tc005.yml +++ b/dovetail/testcase/ipv6.tc005.yml @@ -4,10 +4,13 @@ dovetail.ipv6.tc005: objective: VIM ipv6 operations, to show information of an IPv6 network and subnet validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network - - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet + - tempest.api.network.test_networks.NetworksIpV6Test.test_show_network[id-2bf13842-c93f-4a69-83ed-717d2ec3b44e,smoke] + - tempest.api.network.test_networks.NetworksIpV6Test.test_show_subnet[id-bd635d81-6030-4dd1-b3b9-31ba0cfdf6cc,smoke] - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_network - tempest.api.network.test_networks.NetworksIpV6TestAttrs.test_show_subnet diff --git a/dovetail/testcase/ipv6.tc006.yml b/dovetail/testcase/ipv6.tc006.yml index aa9f5e2a..dc6b2da6 100644 --- a/dovetail/testcase/ipv6.tc006.yml +++ b/dovetail/testcase/ipv6.tc006.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc006: objective: VIM ipv6 operations, to create an IPv6 port in allowed allocation pools validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools + - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_in_allowed_allocation_pools[id-0435f278-40ae-48cb-a404-b8a087bc09b1,smoke] diff --git a/dovetail/testcase/ipv6.tc007.yml b/dovetail/testcase/ipv6.tc007.yml index 813a6905..b2658ec9 100644 --- a/dovetail/testcase/ipv6.tc007.yml +++ b/dovetail/testcase/ipv6.tc007.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc007: objective: VIM ipv6 operations, to create an IPv6 port without security groups validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups + - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_port_with_no_securitygroups[id-4179dcb9-1382-4ced-84fe-1b91c54f5735,smoke] diff --git a/dovetail/testcase/ipv6.tc008.yml b/dovetail/testcase/ipv6.tc008.yml index 3dbbb700..597a4716 100644 --- a/dovetail/testcase/ipv6.tc008.yml +++ b/dovetail/testcase/ipv6.tc008.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc008: objective: VIM ipv6 operations, to create/update/delete an IPv6 port validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port + - tempest.api.network.test_ports.PortsIpV6TestJSON.test_create_update_delete_port[id-c72c1c0c-2193-4aca-aaa4-b1442640f51c,smoke] diff --git a/dovetail/testcase/ipv6.tc009.yml b/dovetail/testcase/ipv6.tc009.yml index cb0f3ac4..013a76ea 100644 --- a/dovetail/testcase/ipv6.tc009.yml +++ b/dovetail/testcase/ipv6.tc009.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc009: objective: VIM ipv6 operations, to list IPv6 ports of a tenant validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports + - tempest.api.network.test_ports.PortsIpV6TestJSON.test_list_ports[id-cf95b358-3e92-4a29-a148-52445e1ac50e,smoke] diff --git a/dovetail/testcase/ipv6.tc010.yml b/dovetail/testcase/ipv6.tc010.yml index ebe40401..48191f0b 100644 --- a/dovetail/testcase/ipv6.tc010.yml +++ b/dovetail/testcase/ipv6.tc010.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc010: objective: VIM ipv6 operations, to show information of an IPv6 port validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port + - tempest.api.network.test_ports.PortsIpV6TestJSON.test_show_port[id-c9a685bd-e83f-499c-939f-9f7863ca259f,smoke] diff --git a/dovetail/testcase/ipv6.tc011.yml b/dovetail/testcase/ipv6.tc011.yml index 40c3d465..18373ef5 100644 --- a/dovetail/testcase/ipv6.tc011.yml +++ b/dovetail/testcase/ipv6.tc011.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc011: objective: VIM ipv6 operations, to add multiple interfaces for an IPv6 router validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces + - tempest.api.network.test_routers.RoutersIpV6Test.test_add_multiple_router_interfaces[id-802c73c9-c937-4cef-824b-2191e24a6aab,smoke] diff --git a/dovetail/testcase/ipv6.tc012.yml b/dovetail/testcase/ipv6.tc012.yml index 5777d349..620fdd6b 100644 --- a/dovetail/testcase/ipv6.tc012.yml +++ b/dovetail/testcase/ipv6.tc012.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc012: objective: VIM ipv6 operations, to add and remove an IPv6 router interface with port_id validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id + - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_port_id[id-2b7d2f37-6748-4d78-92e5-1d590234f0d5,smoke] diff --git a/dovetail/testcase/ipv6.tc013.yml b/dovetail/testcase/ipv6.tc013.yml index 1b122485..8f739bc7 100644 --- a/dovetail/testcase/ipv6.tc013.yml +++ b/dovetail/testcase/ipv6.tc013.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc013: objective: VIM ipv6 operations, to add and remove an IPv6 router interface with subnet_id validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id + - tempest.api.network.test_routers.RoutersIpV6Test.test_add_remove_router_interface_with_subnet_id[id-b42e6e39-2e37-49cc-a6f4-8467e940900a,smoke] diff --git a/dovetail/testcase/ipv6.tc014.yml b/dovetail/testcase/ipv6.tc014.yml index d4eb0fe8..8d3ed342 100644 --- a/dovetail/testcase/ipv6.tc014.yml +++ b/dovetail/testcase/ipv6.tc014.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc014: objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 router validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router + - tempest.api.network.test_routers.RoutersIpV6Test.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke] diff --git a/dovetail/testcase/ipv6.tc015.yml b/dovetail/testcase/ipv6.tc015.yml index 246bff59..19a9806d 100644 --- a/dovetail/testcase/ipv6.tc015.yml +++ b/dovetail/testcase/ipv6.tc015.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc015: objective: VIM ipv6 operations, to create, update, delete, list and show an IPv6 security group validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group + - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_list_update_show_delete_security_group[id-bfd128e5-3c92-44b6-9d66-7fe29d22c802,smoke] diff --git a/dovetail/testcase/ipv6.tc016.yml b/dovetail/testcase/ipv6.tc016.yml index f8f6ba49..f5899058 100644 --- a/dovetail/testcase/ipv6.tc016.yml +++ b/dovetail/testcase/ipv6.tc016.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc016: objective: VIM ipv6 operations, to create, delete and show security group rules validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule + - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_create_show_delete_security_group_rule[id-cfb99e0e-7410-4a3d-8a0c-959a63ee77e9,smoke] diff --git a/dovetail/testcase/ipv6.tc017.yml b/dovetail/testcase/ipv6.tc017.yml index 006efb01..8bef6036 100644 --- a/dovetail/testcase/ipv6.tc017.yml +++ b/dovetail/testcase/ipv6.tc017.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc017: objective: VIM ipv6 operations, to list all security groups validate: type: functest - testcase: tempest_smoke_serial + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups + - tempest.api.network.test_security_groups.SecGroupIPv6Test.test_list_security_groups[id-e30abd17-fef9-4739-8617-dc26da88e686,smoke] diff --git a/dovetail/testcase/ipv6.tc018.yml b/dovetail/testcase/ipv6.tc018.yml index 78d70228..93ae1235 100644 --- a/dovetail/testcase/ipv6.tc018.yml +++ b/dovetail/testcase/ipv6.tc018.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc018: objective: VIM ipv6 operations, to show information of an IPv6 port validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os + - tempest.scenario.test_network_v6.TestGettingAddress.test_dhcp6_stateless_from_os[compute,id-d7e1f858-187c-45a6-89c9-bdafde619a9f,network,slow] diff --git a/dovetail/testcase/ipv6.tc019.yml b/dovetail/testcase/ipv6.tc019.yml index a4ad477e..fab0acdb 100644 --- a/dovetail/testcase/ipv6.tc019.yml +++ b/dovetail/testcase/ipv6.tc019.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc019: objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, DHCPv6 stateless validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os + - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow] diff --git a/dovetail/testcase/ipv6.tc020.yml b/dovetail/testcase/ipv6.tc020.yml index 2d92c058..b31cd727 100644 --- a/dovetail/testcase/ipv6.tc020.yml +++ b/dovetail/testcase/ipv6.tc020.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc020: objective: VIM ipv6 operations, to do IPv6 Address Assignment - Multiple Prefixes, DHCPv6 Stateless validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless + - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_dhcpv6_stateless[compute,id-7ab23f41-833b-4a16-a7c9-5b42fe6d4123,network,slow] diff --git a/dovetail/testcase/ipv6.tc021.yml b/dovetail/testcase/ipv6.tc021.yml index 104993fa..f8820f1d 100644 --- a/dovetail/testcase/ipv6.tc021.yml +++ b/dovetail/testcase/ipv6.tc021.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc021: objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, Multiple Prefixes, DHCPv6 Stateless validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless + - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_dhcpv6_stateless[compute,id-cf1c4425-766b-45b8-be35-e2959728eb00,network] diff --git a/dovetail/testcase/ipv6.tc022.yml b/dovetail/testcase/ipv6.tc022.yml index 58813da5..6c61702e 100644 --- a/dovetail/testcase/ipv6.tc022.yml +++ b/dovetail/testcase/ipv6.tc022.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc022: objective: VIM ipv6 operations, to do IPv6 Address Assignment - SLAAC validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os + - tempest.scenario.test_network_v6.TestGettingAddress.test_slaac_from_os[compute,id-2c92df61-29f0-4eaa-bee3-7c65bef62a43,network,slow] diff --git a/dovetail/testcase/ipv6.tc023.yml b/dovetail/testcase/ipv6.tc023.yml index 5b6dbb09..25193708 100644 --- a/dovetail/testcase/ipv6.tc023.yml +++ b/dovetail/testcase/ipv6.tc023.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc023: objective: VIM ipv6 operations, to do IPv6 Address Assignment - Dual Stack, SLAAC validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os + - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_dhcp6_stateless_from_os[compute,id-76f26acd-9688-42b4-bc3e-cd134c4cb09e,network,slow] diff --git a/dovetail/testcase/ipv6.tc024.yml b/dovetail/testcase/ipv6.tc024.yml index ab6970f1..9a5f331e 100644 --- a/dovetail/testcase/ipv6.tc024.yml +++ b/dovetail/testcase/ipv6.tc024.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc024: objective: VIM ipv6 operations, to do IPv6 address assignment - multiple prefixes, SLAAC validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac + - tempest.scenario.test_network_v6.TestGettingAddress.test_multi_prefix_slaac[compute,id-dec222b1-180c-4098-b8c5-cc1b8342d611,network,slow] diff --git a/dovetail/testcase/ipv6.tc025.yml b/dovetail/testcase/ipv6.tc025.yml index 396098e0..4cf3a005 100644 --- a/dovetail/testcase/ipv6.tc025.yml +++ b/dovetail/testcase/ipv6.tc025.yml @@ -4,7 +4,10 @@ dovetail.ipv6.tc025: objective: VIM ipv6 operations, to do IPv6 address assignment - dual stack, multiple prefixes, SLAAC validate: type: functest - testcase: tempest_full_parallel + testcase: tempest_custom + pre_copy: + src_file: tempest_custom.txt + dest_path: /home/opnfv/repos/functest/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt report: sub_testcase_list: - - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac + - tempest.scenario.test_network_v6.TestGettingAddress.test_dualnet_multi_prefix_slaac[compute,id-9178ad42-10e4-47e9-8987-e02b170cc5cd,network] diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py index fa99e004..020617b8 100644 --- a/dovetail/utils/dovetail_utils.py +++ b/dovetail/utils/dovetail_utils.py @@ -49,14 +49,14 @@ def exec_cmd(cmd, logger=None, exit_on_error=False, info=False, p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout = '' - count = 1 - DEBUG = os.getenv('DEBUG') + # count = 1 + # DEBUG = os.getenv('DEBUG') for line in iter(p.stdout.readline, b''): exec_log(verbose, logger, line.strip(), level, True) stdout += line - if DEBUG is None or DEBUG.lower() != "true": - show_progress_bar(count) - count += 1 + # if DEBUG is None or DEBUG.lower() != "true": + # show_progress_bar(count) + # count += 1 stdout = stdout.strip() returncode = p.wait() p.stdout.close() @@ -132,7 +132,7 @@ def get_ext_net_name(env_file, logger=None): def check_db_results(db_url, build_tag, testcase, logger): - url = "%s/results?build_tag=%s&case=%s" % (db_url, build_tag, testcase) + url = "%s?build_tag=%s-%s" % (db_url, build_tag, testcase) logger.debug("Query to rest api: %s", url) try: data = json.load(urllib2.urlopen(url)) |