summaryrefslogtreecommitdiffstats
path: root/docs/testing
diff options
context:
space:
mode:
authorSofia Wallin <sofia.wallin@ericsson.com>2017-05-03 11:35:44 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-03 11:35:44 +0000
commitab7288dbc6c88f65031997446c511dac2b598195 (patch)
tree374c756e0535d37f49453a8fadbf7e08663b7347 /docs/testing
parentcdbd60ae8f2e3083ddaeb310d48e7cb26d27d3b6 (diff)
parenta3c38919def45d732897aa91533bb0e30e6e3670 (diff)
Merge "Misc Changes"
Diffstat (limited to 'docs/testing')
-rw-r--r--docs/testing/ecosystem/index.rst6
-rw-r--r--docs/testing/testing-dev.rst14
-rw-r--r--docs/testing/testing-user.rst35
3 files changed, 28 insertions, 27 deletions
diff --git a/docs/testing/ecosystem/index.rst b/docs/testing/ecosystem/index.rst
index 6520dc160..f51fa19b0 100644
--- a/docs/testing/ecosystem/index.rst
+++ b/docs/testing/ecosystem/index.rst
@@ -2,9 +2,9 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) Christopher Price (Ericsson AB)
-=============================
-OPNFV Test Framework Overview
-=============================
+========================
+Test Framework Overview
+========================
.. toctree::
:maxdepth: 2
diff --git a/docs/testing/testing-dev.rst b/docs/testing/testing-dev.rst
index 9ad238a15..3716acd19 100644
--- a/docs/testing/testing-dev.rst
+++ b/docs/testing/testing-dev.rst
@@ -7,20 +7,20 @@
Testing Developer Guides
========================
-Functest
----------
+Bottlenecks
+------------
.. toctree::
:maxdepth: 1
- ../submodules/functest/docs/testing/developer/devguide/index
+ ../submodules/bottlenecks/docs/testing/developer/devguide/index
-Bottlenecks
-------------
+Functest
+---------
.. toctree::
:maxdepth: 1
- ../submodules/bottlenecks/docs/testing/developer/devguide/index
+ ../submodules/functest/docs/testing/developer/devguide/index
QTIP
@@ -39,7 +39,7 @@ VSPERF
../submodules/vswitchperf/docs/testing/developer/index
-YARDSTICK
+Yardstick
---------
.. toctree::
:maxdepth: 1
diff --git a/docs/testing/testing-user.rst b/docs/testing/testing-user.rst
index ac205a0a0..198b090e6 100644
--- a/docs/testing/testing-user.rst
+++ b/docs/testing/testing-user.rst
@@ -7,15 +7,6 @@
Testing User Guides
===================
-Functest
----------
-.. toctree::
- :maxdepth: 1
-
- ../submodules/functest/docs/testing/user/configguide/index
- ../submodules/functest/docs/testing/user/userguide/index
-
-
Bottlenecks
------------
.. toctree::
@@ -25,13 +16,13 @@ Bottlenecks
../submodules/bottlenecks/docs/testing/user/userguide/index
-Yardstick
-----------
+Functest
+---------
.. toctree::
:maxdepth: 1
- ../submodules/yardstick/docs/testing/user/configguide/index
- ../submodules/yardstick/docs/testing/user/userguide/index
+ ../submodules/functest/docs/testing/user/configguide/index
+ ../submodules/functest/docs/testing/user/userguide/index
QTIP
@@ -43,6 +34,15 @@ QTIP
../submodules/qtip/docs/testing/user/userguide/index
+Storperf
+--------
+
+.. toctree::
+ :maxdepth: 1
+
+ ../submodules/storperf/docs/testing/user/index
+
+
VSPERF
------
@@ -53,12 +53,13 @@ VSPERF
../submodules/vswitchperf/docs/testing/user/userguide/index
-Storperf
---------
-
+Yardstick
+----------
.. toctree::
:maxdepth: 1
- ../submodules/storperf/docs/testing/user/index
+ ../submodules/yardstick/docs/testing/user/configguide/index
+ ../submodules/yardstick/docs/testing/user/userguide/index
+