[fraser] move 2 sub test cases in patrole to optional list

JIRA: DOVETAIL-756

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

diff --git a/etc/compliance/ovp.2018.09.yaml b/etc/compliance/ovp.2018.09.yaml
index 764398e..9821b4c 100644 (file)
--- a/etc/compliance/ovp.2018.09.yaml
+++ b/etc/compliance/ovp.2018.09.yaml
@@ -32,6 +32,7 @@ ovp.2018.09:
       - functest.tempest.vm_lifecycle
       - functest.tempest.network_scenario
       - functest.tempest.bgpvpn
+      - functest.security.patrole_vxlan_dependent
       - functest.bgpvpn.subnet_connectivity
       - functest.bgpvpn.tenant_separation
       - functest.bgpvpn.router_association

diff --git a/etc/testcase/functest.security.patrole.yml b/etc/testcase/functest.security.patrole.yml
index e3418f7..c47986b 100644 (file)
--- a/etc/testcase/functest.security.patrole.yml
+++ b/etc/testcase/functest.security.patrole.yml
@@ -65,8 +65,6 @@ functest.security.patrole:
       - patrole_tempest_plugin.tests.api.network.test_floating_ips_rbac.FloatingIpsRbacTest.test_show_floating_ip
       - patrole_tempest_plugin.tests.api.network.test_floating_ips_rbac.FloatingIpsRbacTest.test_update_floating_ip
       - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network
-      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
-      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
       - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_router_external
       - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_shared
       - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_subnet

diff --git a/etc/testcase/functest.security.patrole_vxlan_dependent.yml b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
new file mode 100644 (file)
index 0000000..9cb21de
--- /dev/null
+++ b/etc/testcase/functest.security.patrole_vxlan_dependent.yml
@@ -0,0 +1,26 @@
+---
+functest.security.patrole_vxlan_dependent:
+  name: functest.security.patrole_vxlan_dependent
+  objective: Run 2 sub test cases in Patrole that are dependent on vxlan
+  validate:
+    type: functest
+    testcase: tempest_custom
+    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'
+    pre_copy:
+      src_file: tempest_custom.txt
+      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
+  report:
+    source_archive_files:
+      - functest.log
+      - tempest_custom/tempest.log
+      - tempest_custom/tempest-report.html
+    dest_archive_files:
+      - security_logs/functest.security.patrole_vxlan_dependent.functest.log
+      - security_logs/functest.security.patrole_vxlan_dependent.log
+      - security_logs/functest.security.patrole_vxlan_dependent.html
+    check_results_file: 'functest_results.txt'
+    sub_testcase_list:
+      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type[admin]
+      - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id[admin]