From 7ba570a792337dc1a826af6240a7015ed50e1cbd Mon Sep 17 00:00:00 2001
From: MatthewLi <lijun_1203@126.com>
Date: Thu, 20 Jul 2017 06:59:13 -0400
Subject: mandatory vping test case added to proposed_tests

JIRA: DOVETAIL-446

1.add vping to proposed_tests
2.delete out-dated nfvi test cases

Change-Id: I181b00b02abe6fed4ff51e947576c1b71321cdd2
Signed-off-by: MatthewLi <lijun_1203@126.com>
---
 dovetail/compliance/debug.yml          | 5 ++---
 dovetail/compliance/proposed_tests.yml | 3 +++
 dovetail/conf/dovetail_config.yml      | 3 +--
 dovetail/testcase/nfvi.tc001.yml       | 9 ---------
 dovetail/testcase/nfvi.tc002.yml       | 9 ---------
 dovetail/testcase/nfvi.tc101.yml       | 9 ---------
 dovetail/testcase/nfvi.tc102.yml       | 9 ---------
 dovetail/testcase/vping.tc001.yml      | 9 +++++++++
 dovetail/testcase/vping.tc002.yml      | 9 +++++++++
 9 files changed, 24 insertions(+), 41 deletions(-)
 delete mode 100644 dovetail/testcase/nfvi.tc001.yml
 delete mode 100644 dovetail/testcase/nfvi.tc002.yml
 delete mode 100644 dovetail/testcase/nfvi.tc101.yml
 delete mode 100644 dovetail/testcase/nfvi.tc102.yml
 create mode 100644 dovetail/testcase/vping.tc001.yml
 create mode 100644 dovetail/testcase/vping.tc002.yml

diff --git a/dovetail/compliance/debug.yml b/dovetail/compliance/debug.yml
index 0ae734ea..9f6d2389 100644
--- a/dovetail/compliance/debug.yml
+++ b/dovetail/compliance/debug.yml
@@ -12,6 +12,5 @@ debug:
 #    - dovetail.ipv6.tc009
 #    - dovetail.ipv6.tc018
 #    - dovetail.ipv6.tc019
-    - dovetail.nfvi.tc001
-    - dovetail.nfvi.tc002
-    - dovetail.nfvi.tc101
+    - dovetail.vping.tc001
+    - dovetail.vping.tc002
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index 9d63cb2a..018edba0 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -5,6 +5,9 @@ proposed_tests:
     # defcore,defcore.tc001 used for auto-method, defcore.tc002 used for manually method
     - dovetail.defcore.tc001
     # - dovetail.defcore.tc002
+    # vping
+    - dovetail.vping.tc001
+    - dovetail.vping.tc002
     # ipv6
     - dovetail.ipv6.tc001
     - dovetail.ipv6.tc002
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 793c7051..8176fc8d 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -30,9 +30,8 @@ testarea_supported:
   - example
   - ha
   - ipv6
-  - nfvi
   - sdnvpn
-  - vimops
+  - vping
 
 functest_testsuite:
   - refstack_defcore
diff --git a/dovetail/testcase/nfvi.tc001.yml b/dovetail/testcase/nfvi.tc001.yml
deleted file mode 100644
index 157fc8da..00000000
--- a/dovetail/testcase/nfvi.tc001.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.nfvi.tc001:
-  name: dovetail.nfvi.tc001
-  objective: testing for vping using ssh
-  validate:
-    type: functest
-    testcase: vping_ssh
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/nfvi.tc002.yml b/dovetail/testcase/nfvi.tc002.yml
deleted file mode 100644
index 28a7adfd..00000000
--- a/dovetail/testcase/nfvi.tc002.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.nfvi.tc002:
-  name: dovetail.nfvi.tc002
-  objective: testing for vping using userdata
-  validate:
-    type: functest
-    testcase: vping_userdata
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/nfvi.tc101.yml b/dovetail/testcase/nfvi.tc101.yml
deleted file mode 100644
index 2fa47dee..00000000
--- a/dovetail/testcase/nfvi.tc101.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.nfvi.tc101:
-  name: dovetail.nfvi.tc101
-  objective: measure number of cores and threads, available memory size and cache size
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc001
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/nfvi.tc102.yml b/dovetail/testcase/nfvi.tc102.yml
deleted file mode 100644
index 6da52243..00000000
--- a/dovetail/testcase/nfvi.tc102.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-dovetail.nfvi.tc102:
-  name: dovetail.nfvi.tc102
-  objective: measure number of cores and threads, available memory size and cache size
-  validate:
-    type: yardstick
-    testcase: opnfv_yardstick_tc002
-  report:
-    sub_testcase_list:
diff --git a/dovetail/testcase/vping.tc001.yml b/dovetail/testcase/vping.tc001.yml
new file mode 100644
index 00000000..e3b501be
--- /dev/null
+++ b/dovetail/testcase/vping.tc001.yml
@@ -0,0 +1,9 @@
+---
+dovetail.vping.tc001:
+  name: dovetail.vping.tc001
+  objective: testing for vping using userdata
+  validate:
+    type: functest
+    testcase: vping_userdata
+  report:
+    sub_testcase_list:
diff --git a/dovetail/testcase/vping.tc002.yml b/dovetail/testcase/vping.tc002.yml
new file mode 100644
index 00000000..a800a4db
--- /dev/null
+++ b/dovetail/testcase/vping.tc002.yml
@@ -0,0 +1,9 @@
+---
+dovetail.vping.tc002:
+  name: dovetail.vping.tc002
+  objective: testing for vping using ssh
+  validate:
+    type: functest
+    testcase: vping_ssh
+  report:
+    sub_testcase_list:
-- 
cgit 1.2.3-korg