Updates for new doc structure

Change-Id: Idc496e246f966f2882ce0c439913c9379b31c5ea
Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>

diff --git a/docs/index.rst b/docs/index.rst
index a7aad8c..9bfc2f4 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,7 +7,6 @@
 ======
 VSPERF
 ======
-
 VSPERF is an OPNFV testing project.
 
 VSPERF provides an automated test-framework and comprehensive test suite based on
@@ -28,19 +27,6 @@ setup of the network and/or for control of the test-generator and test execution
 * Artifacts: https://artifacts.opnfv.org/vswitchperf.html
 * Continuous Integration status: https://build.opnfv.org/ci/view/vswitchperf/
 
-******************************
-VSPERF Installation Guide
-******************************
-
-.. toctree::
-   :caption: VSPERF Installation Guide
-   :maxdepth: 5
-   :numbered: 5
-
-   ./configguide/installation.rst
-   ./configguide/upgrade.rst
-   ./configguide/trafficgen.rst
-
 ******************************
 VSPERF User Guide
 ******************************
@@ -50,44 +36,54 @@ VSPERF User Guide
    :maxdepth: 5
    :numbered: 5
 
-   ./userguide/testusage.rst
-   ./userguide/teststeps.rst
-   ./userguide/integration.rst
-   Yardstick integration <./userguide/yardstick.rst>
+   ./testing/user/configguide/installation.rst
+   ./testing/user/configguide/upgrade.rst
+   ./testing/user/configguide/trafficgen.rst
 
-**************
-VSPERF Design
-**************
+   ./testing/user/userguide/testusage.rst
+   ./testing/user/userguide/teststeps.rst
+   ./testing/user/userguide/integration.rst
+   ./testing/user/userguide/yardstick.rst
+
+****************************
+VSPERF Developer Guide
+****************************
 
 .. toctree::
-   :caption: VSPERF Design
+   :caption: VSPERF Developer Guide
    :maxdepth: 5
    :numbered: 5
 
-   ./design/vswitchperf_design.rst
-   ./design/trafficgen_integration_guide.rst
+   ./testing/developer/design/trafficgen_integration_guide.rst
+   ./testing/developer/design/vswitchperf_design.rst
+
+   ./testing/developer/requirements/vswitchperf_ltd.rst
+   ./testing/developer/requirements/vswitchperf_ltp.rst
 
-*******************
-VSPERF Requirements
-*******************
+*****************************
+VSPERF - IETF Internet Draft
+*****************************
 
 .. toctree::
-   :caption: VSPERF Requirements
+   :caption: IETF Internet Draft
    :maxdepth: 5
    :numbered: 5
 
-   ./requirements/vswitchperf_ltp.rst
-   ./requirements/vswitchperf_ltd.rst
+`Benchmarking Virtual Switches in OPNFV <https://tools.ietf.org/html/draft-ietf-bmwg-vswitch-opnfv-01>`_
 
-**************
-VSPERF Results
-**************
+Location of xml drafts :doc:`./testing/developer/requirements/ietf_draft/`
+
+********************************
+VSPERF Scenarios and CI Results
+********************************
 
 .. toctree::
-   :maxdepth: 3
+   :caption: VSPERF Scenarios & Results
+   :maxdepth: 5
+   :numbered: 5
 
-   ./results/scenario.rst
-   ./results/results.rst
+   ./testing/developer/results/scenario.rst
+   ./testing/developer/results/results.rst
 
 Indices
 =======