Merge "Replacing references to "DefCore""

6 files changed, 19 insertions, 27 deletions

diff --git a/docs/testing/user/testspecification/vimoperationscompute/index.rst b/docs/testing/user/testspecification/vimoperationscompute/index.rst
index 42a8e70e..b6bb852f 100644
--- a/docs/testing/user/testspecification/vimoperationscompute/index.rst
+++ b/docs/testing/user/testspecification/vimoperationscompute/index.rst
@@ -32,7 +32,7 @@ References
 
   - https://wiki.openstack.org/wiki/Governance/InteropWG
 
-- Defcore test cases
+- OpenStack Interoperability guidelines (version 2016.08)
 
   - https://github.com/openstack/interop/blob/master/2016.08.json
 
diff --git a/docs/testing/user/testspecification/vimoperationsidentity/index.rst b/docs/testing/user/testspecification/vimoperationsidentity/index.rst
index 1a65999e..284ffcbc 100644
--- a/docs/testing/user/testspecification/vimoperationsidentity/index.rst
+++ b/docs/testing/user/testspecification/vimoperationsidentity/index.rst
@@ -20,7 +20,7 @@ the Identity API.
 References
 ================
 
-- Defcore test cases
+- OpenStack interoperability guidelines (version 2016.08)
 
   - https://github.com/openstack/interop/blob/master/2016.08.json
 
@@ -28,13 +28,10 @@ References
 
   - https://www.openstack.org/brand/interop/
 
-- Defcore test cases listed using the Rest API from RefStack project
+- OpenStack interoperability test cases excluding object storage
 
   - https://refstack.openstack.org/api/v1/guidelines/2016.08/tests?target=compute&type=required&alias=true&flag=false
 
-- Refstack client
-
-  - https://github.com/openstack/refstack-client
 
 Definitions and abbreviations
 =============================
@@ -59,14 +56,10 @@ is able to run independently, i.e. irrelevant of the state created by a previous
 Dependency Description
 ======================
 
-The VIM identity operation test area is a part of the DefCore tempest test
-cases run by refstack, then inherited by dovetail. Refstack-client is a command line
-utility that allows you to execute Tempest test runs based on configurations you specify.
-It is the official tool to run Defcore test cases,
-which focuses on testing interoperability between OpenStack clouds.
-
-For Danube based dovetail release, the approved Defcore 2016.08 guidelines is adopted,
-which is valid for Kilo, Liberty, Mitaka and Newton releases of Openstack.
+The VIM identity operations test cases are a part of the OpenStack
+interoperability tempest test cases.  For Danube based dovetail release, the
+OpenStack interoperability guidelines (version 2016.08) is adopted, which is
+valid for Kilo, Liberty, Mitaka and Newton releases of Openstack.
 
 Test Descriptions
 =================
diff --git a/docs/testing/user/testspecification/vimoperationsimage/index.rst b/docs/testing/user/testspecification/vimoperationsimage/index.rst
index 8e5f08ce..7ebc30c9 100644
--- a/docs/testing/user/testspecification/vimoperationsimage/index.rst
+++ b/docs/testing/user/testspecification/vimoperationsimage/index.rst
@@ -21,7 +21,7 @@ image creation, image list, image update and image deletion capabilities using G
 References
 ==========
 
-- Defcore test cases
+- OpenStack Interoperability guidelines (version 2016.08)
 
   - https://github.com/openstack/interop/blob/master/2016.08.json
 
diff --git a/docs/testing/user/testspecification/vimoperationsnetwork/index.rst b/docs/testing/user/testspecification/vimoperationsnetwork/index.rst
index 47c08ef2..d1d9dce3 100644
--- a/docs/testing/user/testspecification/vimoperationsnetwork/index.rst
+++ b/docs/testing/user/testspecification/vimoperationsnetwork/index.rst
@@ -21,7 +21,7 @@ basic CRUD operations on L2 networks, L2 network ports and security groups.
 References
 ==========
 
-- Defcore test cases
+- OpenStack Interoperability guidelines (version 2016.08)
 
   - https://github.com/openstack/interop/blob/master/2016.08.json
 
diff --git a/docs/testing/user/testspecification/vimoperationsvolume/index.rst b/docs/testing/user/testspecification/vimoperationsvolume/index.rst
index 9a76c37c..9d5e275f 100644
--- a/docs/testing/user/testspecification/vimoperationsvolume/index.rst
+++ b/docs/testing/user/testspecification/vimoperationsvolume/index.rst
@@ -34,7 +34,7 @@ References
 
   - https://wiki.openstack.org/wiki/Governance/InteropWG
 
-- Defcore test cases
+- OpenStack Interoperability guidelines (version 2016.08)
 
   - https://github.com/openstack/interop/blob/master/2016.08.json
 
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 3a9c6dc4..d88d5715 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -479,15 +479,14 @@ Users need to create file ``$DOVETAIL_HOME/pre_config/id_rsa`` to store the priv
        key_filename: /root/.ssh/id_rsa
 
 
-Special Configuration for Running defcore, IPv6 and tempest Test Cases
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Configuration for Running Tempest Test Cases
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-All test cases in test area defcore, ipv6 and tempest are picked up from Tempest.
-For all these test cases, they need some configurations. Most of them
-are done by Dovetail. However, there are still some configurations needed to be
-given by users who know the SUT better. All these additional configurations should
-be in file ``$DOVETAIL_HOME/pre_config/tempest_conf.yaml``. If this file is not given,
-some test cases will be skipped or failed.
+The test cases in the test areas `interop` (OpenStack Interoperability tests),
+`ipv6` and `tempest` are based on Tempest.  A SUT-specific configuration of
+Tempest is required in order to run those test cases successfully.  The
+corresponding SUT-specific configuration options should be supplied in the file
+``$DOVETAIL_HOME/pre_config/tempest_conf.yaml``.
 
 Create and edit file ``$DOVETAIL_HOME/pre_config/tempest_conf.yaml``.
 Here is an example of what this file should contain.
@@ -529,9 +528,9 @@ When a tester is performing trial runs, Dovetail stores results in a local file
 
      * Additional log files may be of interests: refstack.log, dovetail_ha_tcXXX.out ...
 
-   * Example: defcore test case example
+   * Example: OpenStack Interoperability test cases
 
-     * Can see the log details in ``defcore_logs/dovetail.defcore.tc001.log``,
+     * Can see the log details in ``osinterop_logs/dovetail.osinterop.tc001.log``,
        which has the passed, skipped and failed test cases results.
 
      * The skipped test cases have the reason for the users to see why these test cases skipped.