Update test suite ovp.next

Update test suite ovp.next according to the latest OVP scope.
Modify Dovetail daily jobs to run all the scope.
There should be 2 jobs.
One for all mandatory test cases and the other for all optional ones.
That's mainly because of that the total executed time will be too large
(more than 300 minutes). Then the job will always failed because of time out.
It's hard to enlarge the time because it's already larger than common 3 hours.
Split it into 2 jobs can avoid the time out issue and make the results
clearer for reviewing.

JIRA: DOVETAIL-694

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

6 files changed, 83 insertions, 70 deletions

diff --git a/etc/compliance/healthcheck.yml b/etc/compliance/healthcheck.yml
index 99844917..1db46990 100644
--- a/etc/compliance/healthcheck.yml
+++ b/etc/compliance/healthcheck.yml
@@ -4,6 +4,7 @@
 healthcheck:
   name: healthcheck
   testcases_list:
-    - dovetail.healthcheck.tc001
-    - dovetail.healthcheck.tc002
-    - dovetail.healthcheck.tc003
+    optional:
+      - dovetail.healthcheck.snaps_health_check
+      - dovetail.healthcheck.connection_check
+      - dovetail.healthcheck.api_check
diff --git a/etc/compliance/onap.1.0.0.yml b/etc/compliance/onap.1.0.0.yml
index 9bb4d2f9..43492ab1 100644
--- a/etc/compliance/onap.1.0.0.yml
+++ b/etc/compliance/onap.1.0.0.yml
@@ -2,4 +2,5 @@
 onap.1.0.0:
   name: onap.1.0.0
   testcases_list:
-    - dovetail.lifecycle.tc001
\ No newline at end of file
+    optional:
+      - dovetail.lifecycle.tc001
diff --git a/etc/compliance/ovp.next.yaml b/etc/compliance/ovp.next.yaml
index 67c5d743..7693b921 100644
--- a/etc/compliance/ovp.next.yaml
+++ b/etc/compliance/ovp.next.yaml
@@ -2,33 +2,43 @@
 ovp.next:
   name: ovp.next
   testcases_list:
-  # mandatory test cases
-    # osinterop
-    - dovetail.tempest.osinterop
-    # vping
-    - dovetail.vping.userdata
-    - dovetail.vping.ssh
-    # HA
-    - dovetail.ha.nova_api
-    - dovetail.ha.neutron_server
-    - dovetail.ha.keystone
-    - dovetail.ha.glance_api
-    - dovetail.ha.cinder_api
-    - dovetail.ha.cpu_load
-    - dovetail.ha.disk_load
-    - dovetail.ha.haproxy
-  # optional test cases
-    # ipv6
-    - dovetail.tempest.ipv6_api
-    - dovetail.tempest.ipv6_scenario
-    # tempest
-    # some of the previous tempest test suites tc001 - tc005 have been merged
-    # with the smoke tests executed as part of the proposed_test test suite
-    - dovetail.tempest.multi_node_scheduling
-    - dovetail.tempest.network_security
-    - dovetail.tempest.vm_lifecycle
-    # sdnvpn
-    - dovetail.sdnvpn.subnet_connectivity
-    - dovetail.sdnvpn.tenant_separation
-    - dovetail.sdnvpn.router_association
-    - dovetail.sdnvpn.router_association_floating_ip
+    mandatory:
+      - dovetail.vping.userdata
+      - dovetail.vping.ssh
+      - dovetail.tempest.osinterop
+      - dovetail.tempest.compute
+      - dovetail.tempest.identity_v2
+      - dovetail.tempest.identity_v3
+      - dovetail.tempest.image
+      - dovetail.tempest.network_api
+      - dovetail.tempest.volume
+      - dovetail.tempest.neutron_trunk_ports
+      - dovetail.tempest.ipv6_api
+      - dovetail.security.patrole
+      - dovetail.ha.nova_api
+      - dovetail.ha.neutron_server
+      - dovetail.ha.keystone
+      - dovetail.ha.glance_api
+      - dovetail.ha.cinder_api
+      - dovetail.ha.cpu_load
+      - dovetail.ha.disk_load
+      - dovetail.ha.haproxy
+      - dovetail.ha.rabbitmq
+      - dovetail.ha.database
+      - dovetail.stress.ping
+    optional:
+      - dovetail.tempest.ipv6_scenario
+      - dovetail.tempest.multi_node_scheduling
+      - dovetail.tempest.network_security
+      - dovetail.tempest.vm_lifecycle
+      - dovetail.tempest.network_scenario
+      - dovetail.tempest.bgpvpn
+      - dovetail.sdnvpn.subnet_connectivity
+      - dovetail.sdnvpn.tenant_separation
+      - dovetail.sdnvpn.router_association
+      - dovetail.sdnvpn.router_association_floating_ip
+      - dovetail.ha.neutron_l3_agent
+      - dovetail.ha.controller_restart
+      - dovetail.vnf.vims
+      - dovetail.vnf.vepc
+      - dovetail.snaps.smoke
diff --git a/etc/compliance/proposed_tests.yml b/etc/compliance/proposed_tests.yml
index 6ca82daa..e893fa19 100644
--- a/etc/compliance/proposed_tests.yml
+++ b/etc/compliance/proposed_tests.yml
@@ -3,28 +3,30 @@ proposed_tests:
   name: proposed_tests
   testcases_list:
   # proposed test cases for 2nd release
-    # tempest
-    - dovetail.tempest.compute
-    - dovetail.tempest.identity_v2
-    - dovetail.tempest.identity_v3
-    - dovetail.tempest.image
-    - dovetail.tempest.network_api
-    - dovetail.tempest.network_scenario
-    - dovetail.tempest.volume
-    - dovetail.tempest.neutron_trunk_ports
-    # HA
-    - dovetail.ha.controller_restart
-    - dovetail.ha.rabbitmq
-    - dovetail.ha.neutron_l3_agent
-    - dovetail.ha.database
-    # vnf
-    - dovetail.vnf.vims
-    - dovetail.vnf.vepc
-    # security
-    - dovetail.security.patrole
-    # sdnvpn
-    - dovetail.tempest.bgpvpn
-    # snaps
-    - dovetail.snaps.smoke
-    # stress
-    - dovetail.stress.ping
+    mandatory:
+      # tempest
+      - dovetail.tempest.compute
+      - dovetail.tempest.identity_v2
+      - dovetail.tempest.identity_v3
+      - dovetail.tempest.image
+      - dovetail.tempest.network_api
+      - dovetail.tempest.volume
+      - dovetail.tempest.neutron_trunk_ports
+      # HA
+      - dovetail.ha.rabbitmq
+      - dovetail.ha.database
+      # security
+      - dovetail.security.patrole
+      # stress
+      - dovetail.stress.ping
+    optional:
+      - dovetail.tempest.network_scenario
+      - dovetail.ha.controller_restart
+      - dovetail.ha.neutron_l3_agent
+      # vnf
+      - dovetail.vnf.vims
+      - dovetail.vnf.vepc
+      # sdnvpn
+      - dovetail.tempest.bgpvpn
+      # snaps
+      - dovetail.snaps.smoke
diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 76a4d61c..afd06425 100644
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -69,3 +69,13 @@ cli:
         flags:
           - '--deploy-scenario'
         help: 'Specify the DEPLOY_SCENARIO which will be used as input by each testcase respectively'
+      mandatory:
+        flags:
+          - '--mandatory'
+        is_flag: 'True'
+        help: 'Run all mandatory test cases.'
+      optional:
+        flags:
+          - '--optional'
+        is_flag: 'True'
+        help: 'Run all optional test cases.'
diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 83944459..0150e2d8 100644
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -29,7 +29,6 @@ trusty_image: 'trusty-server-cloudimg-amd64-disk1.img'
 
 # testsuite supported, should adjust accordingly
 testsuite_supported:
-  - compliance_set
   - proposed_tests
   - debug
   - healthcheck
@@ -90,13 +89,3 @@ test_project:
   - 'functest'
   - 'bottlenecks'
   - 'vnftest'
-
-mandatory:
-  - osinterop
-  - ha
-  - vping
-
-optional:
-  - ipv6
-  - tempest
-  - sdnvpn