Update trunk port list with Hunter and using blacklist

1. Using blacklist to avoid running some sub test cases
2. Update the sub test cases according to Functest Hunter scope

Change-Id: I61d6d796dcdfe0fef41ba7578d0f8f2221414686
Signed-off-by: xudan <xudan16@huawei.com>

2 files changed, 32 insertions, 2 deletions

diff --git a/etc/testcase/functest.tempest.trunk-ports.yml b/etc/testcase/functest.tempest.trunk-ports.yml
index 07d27ce2..724a08d4 100644
--- a/etc/testcase/functest.tempest.trunk-ports.yml
+++ b/etc/testcase/functest.tempest.trunk-ports.yml
@@ -16,6 +16,7 @@ functest.tempest.neutron_trunk_ports:
     testcase: neutron_trunk
     pre_condition:
       - 'cp /home/opnfv/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/trunk_port_blacklist.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml'
   report:
     source_archive_files:
       - functest.log
@@ -28,7 +29,7 @@ functest.tempest.neutron_trunk_ports:
     check_results_files:
       - 'functest_results.txt'
     sub_testcase_list:
-      - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_add_subport
+      - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_add_subports
       - 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
@@ -49,7 +50,7 @@ functest.tempest.neutron_trunk_ports:
       - 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_add_subport_port_id_uses_parent_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
diff --git a/etc/userconfig/trunk_port_blacklist.yaml b/etc/userconfig/trunk_port_blacklist.yaml
new file mode 100644
index 00000000..0f1d805d
--- /dev/null
+++ b/etc/userconfig/trunk_port_blacklist.yaml
@@ -0,0 +1,29 @@
+---
+-
+    scenarios:
+        - unknown
+        - os-nosdn-ovs-ha
+    tests:
+        # need VLAN type driver, otherwise the following 1 sub test case will skip
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestInheritJSONBase.test_add_subport
+        # need vxlan type driver, otherwise the following 1 sub test case will skip
+        - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestJSON.test_create_subport_invalid_inherit_network_segmentation_type
+        # need vxlan or gre type driver, otherwise the following 6 sub test case will skip
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_add_subport_with_mtu_equal_to_trunk
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_add_subport_with_mtu_greater_than_subport
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_create_trunk_with_mtu_equal_to_subport
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestMtusJSON.test_create_trunk_with_mtu_greater_than_subport
+        - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestMtusJSON.test_add_subport_with_mtu_greater_than_trunk
+        - neutron_tempest_plugin.api.test_trunk_negative.TrunkTestMtusJSON.test_create_trunk_with_mtu_smaller_than_subport
+        # advanced image is required to run this test, otherwise the following 2 sub test case will skip
+        - neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_parent_port_connectivity_after_trunk_deleted_lb
+        - neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity
+        # key 'revision_number' is a new extension for Newton and not support by Mitaka
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_update_trunk
+        # extension 'project-id' is a new extension for Newton
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_show_trunk_has_project_id
+        # Can not work correctly on Mitaka
+        - neutron_tempest_plugin.api.test_trunk.TrunkTestJSON.test_create_update_trunk_with_description
+        # Remove neutron trunk test cases with href links
+        - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_page_reverse_with_href_links
+        - neutron_tempest_plugin.api.test_trunk.TrunksSearchCriteriaTest.test_list_pagination_with_href_links