Splitting the networking tests in API and scenario tests

Split the networking tempest test case in Tempest API tests and scenario
tests. The API tests will be promoted to mandatory while the scenario
tests will remain optional.

JIRA: DOVETAIL-678

Change-Id: I03022316076809536782e82fd531d98f45105caa
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>

3 files changed, 37 insertions, 12 deletions

diff --git a/etc/compliance/proposed_tests.yml b/etc/compliance/proposed_tests.yml
index f4d159ea..6ca82daa 100644
--- a/etc/compliance/proposed_tests.yml
+++ b/etc/compliance/proposed_tests.yml
@@ -8,7 +8,8 @@ proposed_tests:
     - dovetail.tempest.identity_v2
     - dovetail.tempest.identity_v3
     - dovetail.tempest.image
-    - dovetail.tempest.network
+    - dovetail.tempest.network_api
+    - dovetail.tempest.network_scenario
     - dovetail.tempest.volume
     - dovetail.tempest.neutron_trunk_ports
     # HA
diff --git a/etc/testcase/tempest.network.yml b/etc/testcase/tempest.network_api.yml
index 28389ad8..159dc1f1 100644
--- a/etc/testcase/tempest.network.yml
+++ b/etc/testcase/tempest.network_api.yml
@@ -1,7 +1,7 @@
 ---
-dovetail.tempest.network:
-  name: dovetail.tempest.network
-  objective: tempest smoke test cases about network
+dovetail.tempest.network_api:
+  name: dovetail.tempest.network_api
+  objective: tempest smoke API test cases covering networking capabilities
   validate:
     type: functest
     testcase: tempest_custom
@@ -17,9 +17,9 @@ dovetail.tempest.network:
       - tempest/tempest.log
       - tempest/tempest-report.html
     dest_archive_files:
-      - tempest_logs/dovetail.tempest.network.functest.log
-      - tempest_logs/dovetail.tempest.network.log
-      - tempest_logs/dovetail.tempest.network.html
+      - tempest_logs/dovetail.tempest.network_api.functest.log
+      - tempest_logs/dovetail.tempest.network_api.log
+      - tempest_logs/dovetail.tempest.network_api.html
     check_results_file: 'functest_results.txt'
     sub_testcase_list:
       - tempest.api.network.test_extensions.ExtensionsTestJSON.test_list_show_extensions[id-ef28c7e6-e646-4979-9d67-deb207bc5564,smoke]
@@ -36,8 +36,3 @@ dovetail.tempest.network:
       - tempest.api.network.test_routers.RoutersTest.test_create_show_list_update_delete_router[id-f64403e2-8483-4b34-8ccd-b09a87bcc68c,smoke]
       - tempest.api.network.test_subnetpools_extensions.SubnetPoolsTestJSON.test_create_list_show_update_delete_subnetpools[id-62595970-ab1c-4b7f-8fcc-fddfe55e9811,smoke]
       - tempest.api.network.test_versions.NetworksApiDiscovery.test_api_version_resources[id-cac8a836-c2e0-4304-b556-cd299c7281d1,smoke]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details[compute,id-d8bb918e-e2df-48b2-97cd-b73c95450980,network,slow]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state[compute,id-f5dfcc22-45fd-409f-954c-5bd500d7890b,network,slow]
-      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network,slow]
diff --git a/etc/testcase/tempest.network_scenario.yml b/etc/testcase/tempest.network_scenario.yml
new file mode 100644
index 00000000..f2b83327
--- /dev/null
+++ b/etc/testcase/tempest.network_scenario.yml
@@ -0,0 +1,29 @@
+---
+dovetail.tempest.network_scenario:
+  name: dovetail.tempest.network_scenario
+  objective: tempest smoke scenario test cases covering networking capabilities
+  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/tempest.log
+      - tempest/tempest-report.html
+    dest_archive_files:
+      - tempest_logs/dovetail.tempest.network_scenario.functest.log
+      - tempest_logs/dovetail.tempest.network_scenario.log
+      - tempest_logs/dovetail.tempest.network_scenario.html
+    check_results_file: 'functest_results.txt'
+    sub_testcase_list:
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_hotplug_nic[compute,id-c5adff73-e961-41f1-b4a9-343614f18cfa,network]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_subnet_details[compute,id-d8bb918e-e2df-48b2-97cd-b73c95450980,network,slow]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_instance_port_admin_state[compute,id-f5dfcc22-45fd-409f-954c-5bd500d7890b,network,slow]
+      - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state[compute,id-04b9fe4e-85e8-4aea-b937-ea93885ac59f,network,slow]