Revert "Moved doc files to testing document structure 03/31303/1
authorTrevor Cooper <trevor.cooper@intel.com>
Wed, 22 Mar 2017 00:49:09 +0000 (00:49 +0000)
committerTrevor Cooper <trevor.cooper@intel.com>
Wed, 22 Mar 2017 00:49:09 +0000 (00:49 +0000)
This reverts commit 32a5263216d79ad34041dca55357278f092bb931.

Change-Id: I641b967badffd52ffd9e249b75e67bb7c82a8150
Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
32 files changed:
docs/configguide/LICENSE [moved from docs/testing/developer/design/LICENSE with 100% similarity]
docs/configguide/TCLServerProperties.png [moved from docs/testing/user/configguide/TCLServerProperties.png with 100% similarity]
docs/configguide/installation.rst [moved from docs/testing/user/configguide/installation.rst with 100% similarity]
docs/configguide/trafficgen.rst [moved from docs/testing/user/configguide/trafficgen.rst with 100% similarity]
docs/configguide/upgrade.rst [moved from docs/testing/user/configguide/upgrade.rst with 100% similarity]
docs/design/LICENSE [moved from docs/testing/developer/requirements/LICENSE with 100% similarity]
docs/design/factory_and_loader.png [moved from docs/testing/developer/design/factory_and_loader.png with 100% similarity]
docs/design/traffic_controller.png [moved from docs/testing/developer/design/traffic_controller.png with 100% similarity]
docs/design/trafficgen_integration_guide.rst [moved from docs/testing/developer/design/trafficgen_integration_guide.rst with 100% similarity]
docs/design/vsperf.png [moved from docs/testing/developer/design/vsperf.png with 100% similarity]
docs/design/vswitchperf_design.rst [moved from docs/testing/developer/design/vswitchperf_design.rst with 100% similarity]
docs/index.rst
docs/release/release-notes/index.rst
docs/requirements/LICENSE [moved from docs/testing/user/configguide/LICENSE with 100% similarity]
docs/requirements/ietf_draft/LICENSE [moved from docs/testing/developer/requirements/ietf_draft/LICENSE with 100% similarity]
docs/requirements/ietf_draft/draft-ietf-bmwg-vswitch-opnfv-00.xml [moved from docs/testing/developer/requirements/ietf_draft/draft-ietf-bmwg-vswitch-opnfv-00.xml with 100% similarity]
docs/requirements/ietf_draft/draft-ietf-bmwg-vswitch-opnfv-01.xml [moved from docs/testing/developer/requirements/ietf_draft/draft-ietf-bmwg-vswitch-opnfv-01.xml with 100% similarity]
docs/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-00.xml [moved from docs/testing/developer/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-00.xml with 100% similarity]
docs/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-01.xml [moved from docs/testing/developer/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-01.xml with 100% similarity]
docs/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-02.xml [moved from docs/testing/developer/requirements/ietf_draft/draft-vsperf-bmwg-vswitch-opnfv-02.xml with 100% similarity]
docs/requirements/vm2vm_alternative_benchmark.png [moved from docs/testing/developer/requirements/vm2vm_alternative_benchmark.png with 100% similarity]
docs/requirements/vm2vm_benchmark.png [moved from docs/testing/developer/requirements/vm2vm_benchmark.png with 100% similarity]
docs/requirements/vm2vm_hypervisor_benchmark.png [moved from docs/testing/developer/requirements/vm2vm_hypervisor_benchmark.png with 100% similarity]
docs/requirements/vm2vm_virtual_interface_benchmark.png [moved from docs/testing/developer/requirements/vm2vm_virtual_interface_benchmark.png with 100% similarity]
docs/requirements/vswitchperf_ltd.rst [moved from docs/testing/developer/requirements/vswitchperf_ltd.rst with 100% similarity]
docs/requirements/vswitchperf_ltp.rst [moved from docs/testing/developer/requirements/vswitchperf_ltp.rst with 100% similarity]
docs/results/results.rst [moved from docs/testing/developer/results/results.rst with 93% similarity]
docs/results/scenario.rst [moved from docs/testing/developer/results/scenario.rst with 90% similarity]
docs/userguide/integration.rst [moved from docs/testing/user/userguide/integration.rst with 100% similarity]
docs/userguide/teststeps.rst [moved from docs/testing/user/userguide/teststeps.rst with 100% similarity]
docs/userguide/testusage.rst [moved from docs/testing/user/userguide/testusage.rst with 100% similarity]
docs/userguide/yardstick.rst [moved from docs/testing/user/userguide/yardstick.rst with 100% similarity]

index 11aaf65..889d4ab 100644 (file)
@@ -7,28 +7,39 @@
 ======
 VSPERF
 ======
-
 VSPERF is an OPNFV testing project.
 
-VSPERF provides a configurable and automated test-framework with test cases based on
-industry standard network benchmarks applicable to NFVI. This includes the network
-tolpology with physical and virtual network interfaces as well as the switching
-technology. The VSPERF architecture was designed to be switch and traffic generator
-agnostic and provides control of NFVI software components, switch configurations and
-test-case customization.
+VSPERF provides an automated test-framework and comprehensive test suite based on
+industry standards for measuring data-plane performance of Telco NFV switching
+technologies as well as physical and virtual network interfaces (NFVI). The VSPERF
+architecture is switch and traffic generator agnostic and provides full control of
+software component versions and configurations as well as test-case customization.
 
 The Danube release of VSPERF includes improvements in documentation and capabilities.
-This includes additional test-cases such as RFC 5481 (latency tests) and RFC-2889
-(address-learning-rate test). Hardware traffic generator support is now provided for
+This includes additional test-cases such as RFC 5481 Latency test and RFC-2889
+address-learning-rate test. Hardware traffic generator support is now provided for
 Spirent and Xena in addition to Ixia. The Moongen software traffic generator is also
-now supported. VSPERF can be used in a variety of modes for configuration and
-setup of the network and/or for control of the traffic-generator and test execution.
+now fully supported. VSPERF can be used in a variety of modes for configuration and
+setup of the network and/or for control of the test-generator and test execution.
 
 * Wiki: https://wiki.opnfv.org/characterize_vswitch_performance_for_telco_nfv_use_cases
 * Repository: https://git.opnfv.org/vswitchperf
 * 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
 ******************************
@@ -38,44 +49,44 @@ VSPERF User Guide
    :maxdepth: 5
    :numbered: 5
 
-   ./user/configguide/installation.rst
-   ./user/configguide/upgrade.rst
-   ./user/configguide/trafficgen.rst
-
-   ./user/userguide/testusage.rst
-   ./user/userguide/teststeps.rst
-   ./user/userguide/integration.rst
+   ./userguide/testusage.rst
+   ./userguide/teststeps.rst
+   ./userguide/integration.rst
    Yardstick integration <./userguide/yardstick.rst>
 
-
-****************************
-VSPERF Developer
-****************************
+**************
+VSPERF Design
+**************
 
 .. toctree::
-   :caption: VSPERF Developer Guide
+   :caption: VSPERF Design
    :maxdepth: 5
    :numbered: 5
 
-   ./developer/design/trafficgen_integration_guide.rst
-   ./developer/design/vswitchperf_design.rst
+   ./design/vswitchperf_design.rst
+   ./design/trafficgen_integration_guide.rst
 
-   ./developer/requirements/vswitchperf_ltd.rst
-   ./developer/requirements/vswitchperf_ltp.rst
-   IETF Internet Draft: Benchmarking Virtual Switches in OPNFV <./requirements/ietf_draft/>
+*******************
+VSPERF Requirements
+*******************
+
+.. toctree::
+   :caption: VSPERF Requirements
+   :maxdepth: 5
+   :numbered: 5
 
+   ./requirements/vswitchperf_ltp.rst
+   ./requirements/vswitchperf_ltd.rst
 
-******************************
+**************
 VSPERF Results
-******************************
+**************
 
 .. toctree::
-   :caption: VSPERF Scenarios and Test Cases
    :maxdepth: 3
-   :numbered: 3
 
-   ./developer/results/scenario.rst
-   ./developer/results/results.rst
+   ./results/scenario.rst
+   ./results/results.rst
 
 Indices
 =======
index 8b38d53..eaa7bb7 100644 (file)
@@ -1,21 +1,12 @@
-.. _vswitchperf-releasenotes:
-
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Intel Corporation and others.
 
-====================
-VSPERF Release Notes
-====================
+==================================================
+OPNFV VSPERF Release Notes
+==================================================
 
 .. toctree::
-   :numbered:
-   :maxdepth: 2
-
-   release-notes.rst
-
-Revision: _sha1_
-
-:Author: Trevor Cooper (trevor.cooper@intel.com)
+   :maxdepth: 1
 
-Build date: |today|
+   release-notes
similarity index 93%
rename from docs/testing/developer/results/results.rst
rename to docs/results/results.rst
index 42df961..1fd6d44 100644 (file)
@@ -2,10 +2,10 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Intel Corporation, AT&T and others.
 
-OPNFV VSPERF CI Results
+OPNFV Brahmaputra Results
 =========================
-The VSPERF CI jobs are run daily through Jenkins. Result samples can be found at
-https://wiki.opnfv.org/display/vsperf/Vsperf+Results
+The vsperf CI jobs that were used to obtain the
+results can be found at https://wiki.opnfv.org/wiki/vsperf_results.
 
 The following table maps the results in the test dashboard to the appropriate
 test case in the VSPERF Framework and specifies the metric the vertical/Y axis
similarity index 90%
rename from docs/testing/developer/results/scenario.rst
rename to docs/results/scenario.rst
index 2967fc6..49ff626 100644 (file)
@@ -2,23 +2,12 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Intel Corporation, AT&T and others.
 
-OPNFV VSPERF Scenarios
+OPNFV Brahmaputra Scenarios
 ===========================
-
-Predefined network topologies:
-
-* :ref:`Phy2Phy <Phy2Phy>`: Physical port -> vSwitch -> Physical port.
-* :ref:`PVP <PVP>`: Physical port -> vSwitch -> VNF -> vSwitch -> Physical port.
-* :ref:`PVVP <PVVP>`: Physical port -> vSwitch -> VNF -> vSwitch -> VNF -> vSwitch ->
-  Physical port.
-
-Loopback applications in the Guest can be:
-* `DPDK testpmd <http://dpdk.org/doc/guides/testpmd_app_ug/index.html>`_.
-* Linux Bridge.
-* :ref:`l2fwd-module`
+Available Tests and aspects of scenarios:
 
 ===================== ===========================================================
-   Testcase                          Definition
+   Framework Test                          Definition
 ===================== ===========================================================
 phy2phy_tput          :ref:`PacketLossRatio <PacketLossRatio>` for :ref:`Phy2Phy <Phy2Phy>`
 back2back             :ref:`BackToBackFrames <BackToBackFrames>` for :ref:`Phy2Phy <Phy2Phy>`
@@ -34,3 +23,23 @@ pvvp_back2back        :ref:`BackToBackFrames <BackToBackFrames>` for :ref:`PVVP
 phy2phy_cpu_load      :ref:`CPU0PacketLoss <CPU0PacketLoss>` for :ref:`Phy2Phy <Phy2Phy>`
 phy2phy_mem_load      Same as :ref:`CPU0PacketLoss <CPU0PacketLoss>` but using a memory intensive app
 ===================== ===========================================================
+
+Supported deployment scenarios:
+
+* :ref:`Phy2Phy <Phy2Phy>`: Physical port -> vSwitch -> Physical port.
+* :ref:`PVP <PVP>`: Physical port -> vSwitch -> VNF -> vSwitch -> Physical port.
+* :ref:`PVVP <PVVP>`: Physical port -> vSwitch -> VNF -> vSwitch -> VNF -> vSwitch ->
+  Physical port.
+
+Loopback applications in the Guest can be:
+
+* `DPDK testpmd <http://dpdk.org/doc/guides/testpmd_app_ug/index.html>`_.
+* Linux Bridge.
+* :ref:`l2fwd-module`
+
+Supported traffic generators:
+
+* Ixia: IxOS and IxNet.
+* Spirent.
+* Dummy.
+