Dovetail tool replaces defcore with osinterop

Rename the "defcore" test area to "osinterop".
The DefCore working group has been
renamed OpenStack InterOp Working Group some time ago.

JIRA: DOVETAIL-499

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

5 files changed, 15 insertions, 16 deletions

diff --git a/dovetail/compliance/debug.yml b/dovetail/compliance/debug.yml
index 9f6d2389..cd70c4ec 100644
--- a/dovetail/compliance/debug.yml
+++ b/dovetail/compliance/debug.yml
@@ -1,13 +1,13 @@
 ---
 # only used for dovetail tool development debug
 # nfvi.tc001 tc002 running time is shorter, about 3 minutes
-# defcore.tc001 about 30 minutes
+# osinterop.tc001 about 30 minutes
 debug:
   name: debug
   testcases_list:
     - dovetail.example.tc002
-    - dovetail.defcore.tc001
-#    - dovetail.defcore.tc002
+    - dovetail.osinterop.tc001
+#    - dovetail.osinterop.tc002
 #    - dovetail.ipv6.tc008
 #    - dovetail.ipv6.tc009
 #    - dovetail.ipv6.tc018
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml
index 18b8cec9..83b97d53 100644
--- a/dovetail/compliance/proposed_tests.yml
+++ b/dovetail/compliance/proposed_tests.yml
@@ -2,9 +2,8 @@
 proposed_tests:
   name: proposed_tests
   testcases_list:
-    # defcore,defcore.tc001 used for auto-method, defcore.tc002 used for manually method
-    - dovetail.defcore.tc001
-    # - dovetail.defcore.tc002
+    # osinterop
+    - dovetail.osinterop.tc001
     # vping
     - dovetail.vping.tc001
     - dovetail.vping.tc002
@@ -55,4 +54,4 @@ proposed_tests:
     - dovetail.tempest.tc004
     - dovetail.tempest.tc005
     # resiliency
-    - dovetail.resiliency.tc001
+    # - dovetail.resiliency.tc001
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index de849a52..e93bd64a 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -29,7 +29,7 @@ testsuite_supported:
   - debug
 # testarea supported, should adjust accordingly
 testarea_supported:
-  - defcore
+  - osinterop
   - example
   - ha
   - ipv6
diff --git a/dovetail/testcase/defcore.tc001.yml b/dovetail/testcase/osinterop.tc001.yml
index 19092c09..f84f52e1 100644
--- a/dovetail/testcase/defcore.tc001.yml
+++ b/dovetail/testcase/osinterop.tc001.yml
@@ -1,7 +1,7 @@
 ---
-dovetail.defcore.tc001:
-  name: dovetail.defcore.tc001
-  objective: > # Set of DefCore tempest test cases not flagged and required. It only contains OpenStack core (no object storage)
+dovetail.osinterop.tc001:
+  name: dovetail.osinterop.tc001
+  objective: > # Set of OpenStack interoperability test cases not flagged and required. It only contains OpenStack core (no object storage)
     # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack
     # The list can be generated using the Rest API from RefStack project:
     # https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
@@ -11,7 +11,7 @@ dovetail.defcore.tc001:
     pre_condition:
       - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/local/lib/python2.7/dist-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
     pre_copy:
-      src_file: defcore.txt
+      src_file: osinterop.txt
       dest_path: /usr/local/lib/python2.7/dist-packages/functest/opnfv_tests/openstack/refstack_client/defcore.txt
     cmds:
       - 'functest env prepare'
diff --git a/dovetail/testcase/defcore.tc002.yml b/dovetail/testcase/osinterop.tc002.yml
index ae7a1fb3..42346a53 100644
--- a/dovetail/testcase/defcore.tc002.yml
+++ b/dovetail/testcase/osinterop.tc002.yml
@@ -1,7 +1,7 @@
 ---
-dovetail.defcore.tc002:
-  name: dovetail.defcore.tc002
-  objective: > # Set of DefCore tempest test cases not flagged and required. It only contains OpenStack core (no object storage)
+dovetail.osinterop.tc002:
+  name: dovetail.osinterop.tc002
+  objective: > # Set of OpenStack interoperability test cases not flagged and required. It only contains OpenStack core (no object storage)
     # The approved guidelines (2016.08) are valid for Kilo, Liberty, Mitaka and Newton releases of OpenStack
     # The list can be generated using the Rest API from RefStack project:
     # https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
@@ -11,7 +11,7 @@ dovetail.defcore.tc002:
     pre_condition:
       - 'echo test for precondition in testcase'
     cmds:
-      - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/refstack_tempest.conf  -v --test-list /home/opnfv/userconfig/defcore.txt'
+      - 'cd /home/opnfv/repos/refstack-client; source .venv/bin/activate; ./refstack-client test -c /home/opnfv/userconfig/refstack_tempest.conf  -v --test-list /home/opnfv/userconfig/osinterop.txt'
     post_condition:
       - 'echo test for postcondition in testcase'
   report: