From 7cd5c4c60b3f9a9893c2801a39061489ecfa6ae0 Mon Sep 17 00:00:00 2001 From: xudan Date: Sun, 21 Oct 2018 21:56:37 -0400 Subject: Stop redefine testcases.yaml for some test cases 1. For Functest healthcheck, patrole, refstack_defcore, neutron_trunk and vping test cases, stop to redefine testcases.yaml. 2. For VNF and bgpvpn, they still have scenario dependencies for Functest. How to handle them are still under consideration. 3. For other tempest test cases, they rely on tempest_custom. Leave them under discussion. JIRA: DOVETAIL-673 Change-Id: Ibd10c9883d8df3749f4a93e280deaca77fe6bc00 Signed-off-by: xudan --- etc/testcase/functest.healthcheck.api_check.yml | 1 + .../functest.healthcheck.connection_check.yml | 1 + .../functest.healthcheck.snaps_health_check.yml | 1 + etc/testcase/functest.security.patrole.yml | 5 +- etc/testcase/functest.tempest.osinterop.yml | 1 - etc/testcase/functest.tempest.trunk-ports.yml | 77 +++++++++++----------- etc/testcase/functest.vping.ssh.yml | 1 + etc/testcase/functest.vping.userdata.yml | 1 + 8 files changed, 45 insertions(+), 43 deletions(-) (limited to 'etc/testcase') diff --git a/etc/testcase/functest.healthcheck.api_check.yml b/etc/testcase/functest.healthcheck.api_check.yml index 8738d332..ed586689 100644 --- a/etc/testcase/functest.healthcheck.api_check.yml +++ b/etc/testcase/functest.healthcheck.api_check.yml @@ -5,6 +5,7 @@ functest.healthcheck.api_check: validate: type: functest testcase: api_check + image_name: opnfv/functest-healthcheck report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.healthcheck.connection_check.yml b/etc/testcase/functest.healthcheck.connection_check.yml index f869c907..e9ddd40b 100644 --- a/etc/testcase/functest.healthcheck.connection_check.yml +++ b/etc/testcase/functest.healthcheck.connection_check.yml @@ -5,6 +5,7 @@ functest.healthcheck.connection_check: validate: type: functest testcase: connection_check + image_name: opnfv/functest-healthcheck report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.healthcheck.snaps_health_check.yml b/etc/testcase/functest.healthcheck.snaps_health_check.yml index d179968e..014ccfd4 100644 --- a/etc/testcase/functest.healthcheck.snaps_health_check.yml +++ b/etc/testcase/functest.healthcheck.snaps_health_check.yml @@ -5,6 +5,7 @@ functest.healthcheck.snaps_health_check: validate: type: functest testcase: snaps_health_check + image_name: opnfv/functest-healthcheck report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.security.patrole.yml b/etc/testcase/functest.security.patrole.yml index e3418f76..cdf4a659 100644 --- a/etc/testcase/functest.security.patrole.yml +++ b/etc/testcase/functest.security.patrole.yml @@ -7,7 +7,6 @@ functest.security.patrole: testcase: patrole pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log @@ -88,7 +87,7 @@ functest.security.patrole: - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_binding_host_id - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_binding_profile - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_device_owner - - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_fixed_ips + - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_fixed_ips_ip_address - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_mac_address - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_create_port_security_enabled - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_delete_port @@ -102,7 +101,7 @@ functest.security.patrole: - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_binding_host_id - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_binding_profile - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_device_owner - - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_fixed_ips + - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_fixed_ips_ip_address - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_mac_address - patrole_tempest_plugin.tests.api.network.test_ports_rbac.PortsRbacTest.test_update_port_security_enabled - patrole_tempest_plugin.tests.api.network.test_routers_rbac.RouterRbacTest.test_add_router_interface diff --git a/etc/testcase/functest.tempest.osinterop.yml b/etc/testcase/functest.tempest.osinterop.yml index 4ced2967..124ad419 100644 --- a/etc/testcase/functest.tempest.osinterop.yml +++ b/etc/testcase/functest.tempest.osinterop.yml @@ -10,7 +10,6 @@ functest.tempest.osinterop: testcase: refstack_defcore pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.tempest.trunk-ports.yml b/etc/testcase/functest.tempest.trunk-ports.yml index 7ba2963a..1b064b2b 100644 --- a/etc/testcase/functest.tempest.trunk-ports.yml +++ b/etc/testcase/functest.tempest.trunk-ports.yml @@ -7,7 +7,6 @@ functest.tempest.neutron_trunk_ports: testcase: neutron_trunk pre_condition: - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml' - - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log @@ -19,41 +18,41 @@ functest.tempest.neutron_trunk_ports: - tempest_logs/functest.tempest.neutron_trunk_ports.html check_results_file: 'functest_results.txt' sub_testcase_list: - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_add_subport - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_create_show_delete_trunk - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_create_trunk_empty_subports_list - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_create_trunk_subports_not_specified - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_delete_trunk_with_subport_is_allowed - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_get_subports - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_list_trunks - - neutron.tests.tempest.api.test_trunk.TrunkTestJSON.test_remove_subport - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_no_pagination_limit_0 - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_asc - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_desc - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_with_marker - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_sorts_asc - - neutron.tests.tempest.api.test_trunk.TrunksSearchCriteriaTest.test_list_sorts_desc - - neutron.tests.tempest.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_empty_trunk_details - - neutron.tests.tempest.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_trunk_details_no_subports - - neutron.tests.tempest.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_trunk_details_with_subport - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_add_subport_duplicate_segmentation_details - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_add_subport_passing_dict - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_add_subport_port_id_disabled_trunk - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_add_subport_port_id_uses_trunk_port_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_subport_missing_segmentation_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_subport_nonexistent_port_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_subport_nonexistent_trunk - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_duplicate_subport_segmentation_ids - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_nonexistent_port_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_nonexistent_subport_port_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_port_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_segmentation_id - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_segmentation_type - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_delete_port_in_use_by_subport - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_delete_port_in_use_by_trunk - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_delete_trunk_disabled_trunk - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_not_found - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_passing_dict - - neutron.tests.tempest.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_port_id_disabled_trunk - - neutron.tests.tempest.scenario.test_trunk.TrunkTest.test_trunk_subport_lifecycle + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_add_subport + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_show_delete_trunk + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_trunk_empty_subports_list + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_trunk_subports_not_specified + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_delete_trunk_with_subport_is_allowed + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_get_subports + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_list_trunks + - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_remove_subport + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_no_pagination_limit_0 + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_asc + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_desc + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_with_marker + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_sorts_asc + - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_sorts_desc + - neutron_tempest_plugin.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_empty_trunk_details + - neutron_tempest_plugin.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_trunk_details_no_subports + - neutron_tempest_plugin.api.test_trunk_details.TestTrunkDetailsJSON.test_port_resource_trunk_details_with_subport + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_add_subport_duplicate_segmentation_details + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_add_subport_passing_dict + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_add_subport_port_id_disabled_trunk + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_add_subport_port_id_uses_trunk_port_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_subport_missing_segmentation_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_subport_nonexistent_port_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_subport_nonexistent_trunk + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_duplicate_subport_segmentation_ids + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_nonexistent_port_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_nonexistent_subport_port_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_port_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_segmentation_id + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_trunk_with_subport_missing_segmentation_type + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_delete_port_in_use_by_subport + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_delete_port_in_use_by_trunk + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_delete_trunk_disabled_trunk + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_not_found + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_passing_dict + - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_remove_subport_port_id_disabled_trunk + - neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_trunk_subport_lifecycle diff --git a/etc/testcase/functest.vping.ssh.yml b/etc/testcase/functest.vping.ssh.yml index 913aa2e1..43a6e2b4 100644 --- a/etc/testcase/functest.vping.ssh.yml +++ b/etc/testcase/functest.vping.ssh.yml @@ -5,6 +5,7 @@ functest.vping.ssh: validate: type: functest testcase: vping_ssh + image_name: opnfv/functest-healthcheck report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.vping.userdata.yml b/etc/testcase/functest.vping.userdata.yml index 5ef9e880..1943e92e 100644 --- a/etc/testcase/functest.vping.userdata.yml +++ b/etc/testcase/functest.vping.userdata.yml @@ -5,6 +5,7 @@ functest.vping.userdata: validate: type: functest testcase: vping_userdata + image_name: opnfv/functest-healthcheck report: source_archive_files: - functest.log -- cgit 1.2.3-korg