summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2017-08-02 01:55:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-02 01:55:38 +0000
commit26e2f9ff08e86d661fd6a0ad9b3d6dfefedcc2d7 (patch)
tree10336d826426cfae3a0cfa609f132294980c4d47
parenta0f7d4bcd3d1077c8211d706d0cdc49dfbbddc01 (diff)
parent7ba570a792337dc1a826af6240a7015ed50e1cbd (diff)
Merge "mandatory vping test case added to proposed_tests"
-rw-r--r--dovetail/compliance/debug.yml5
-rw-r--r--dovetail/compliance/proposed_tests.yml3
-rw-r--r--dovetail/conf/dovetail_config.yml3
-rw-r--r--dovetail/testcase/nfvi.tc101.yml9
-rw-r--r--dovetail/testcase/nfvi.tc102.yml9
-rw-r--r--dovetail/testcase/vping.tc001.yml (renamed from dovetail/testcase/nfvi.tc002.yml)4
-rw-r--r--dovetail/testcase/vping.tc002.yml (renamed from dovetail/testcase/nfvi.tc001.yml)4
7 files changed, 10 insertions, 27 deletions
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 fecc0ae1..36c8e5c1 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.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/nfvi.tc002.yml b/dovetail/testcase/vping.tc001.yml
index 28a7adfd..e3b501be 100644
--- a/dovetail/testcase/nfvi.tc002.yml
+++ b/dovetail/testcase/vping.tc001.yml
@@ -1,6 +1,6 @@
---
-dovetail.nfvi.tc002:
- name: dovetail.nfvi.tc002
+dovetail.vping.tc001:
+ name: dovetail.vping.tc001
objective: testing for vping using userdata
validate:
type: functest
diff --git a/dovetail/testcase/nfvi.tc001.yml b/dovetail/testcase/vping.tc002.yml
index 157fc8da..a800a4db 100644
--- a/dovetail/testcase/nfvi.tc001.yml
+++ b/dovetail/testcase/vping.tc002.yml
@@ -1,6 +1,6 @@
---
-dovetail.nfvi.tc001:
- name: dovetail.nfvi.tc001
+dovetail.vping.tc002:
+ name: dovetail.vping.tc002
objective: testing for vping using ssh
validate:
type: functest