Updated results and sceanrios for Danube

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

2 files changed, 16 insertions, 14 deletions

diff --git a/docs/testing/developer/results/results.rst b/docs/testing/developer/results/results.rst
index 1fd6d443..df9c52cb 100644
--- a/docs/testing/developer/results/results.rst
+++ b/docs/testing/developer/results/results.rst
@@ -2,12 +2,12 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Intel Corporation, AT&T and others.
 
-OPNFV Brahmaputra Results
+OPNFV Test Results
 =========================
-The vsperf CI jobs that were used to obtain the
-results can be found at https://wiki.opnfv.org/wiki/vsperf_results.
+VSPERF CI jobs are run daily and sample results can be found at
+https://wiki.opnfv.org/display/vsperf/Vsperf+Results
 
-The following table maps the results in the test dashboard to the appropriate
+The following example maps the results in the test dashboard to the appropriate
 test case in the VSPERF Framework and specifies the metric the vertical/Y axis
 is plotting. **Please note**, the presence of dpdk within a test name signifies
 that the vswitch under test was OVS with DPDK, while its absence indicates that
@@ -34,5 +34,5 @@ pvvp_b2b_ovsdpdkuser  pvvp_back2back        Throughput (FPS)   vhost-user
 pvvp_b2b_ovsvirtio    pvvp_back2back        Throughput (FPS)   virtio-net
 ===================== ===================== ================== ===============
 
-The loopback application in the VNF used for PVP and PVVP scenarios was DPDK
+The loopback application in the VNF was used for PVP and PVVP scenarios was DPDK
 testpmd.
diff --git a/docs/testing/developer/results/scenario.rst b/docs/testing/developer/results/scenario.rst
index 49ff626a..a57d6a03 100644
--- a/docs/testing/developer/results/scenario.rst
+++ b/docs/testing/developer/results/scenario.rst
@@ -2,12 +2,13 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. (c) OPNFV, Intel Corporation, AT&T and others.
 
-OPNFV Brahmaputra Scenarios
-===========================
-Available Tests and aspects of scenarios:
+VSPERF Test Scenarios
+=====================
+
+Predefined Tests run with CI:
 
 ===================== ===========================================================
-   Framework Test                          Definition
+   Test                          Definition
 ===================== ===========================================================
 phy2phy_tput          :ref:`PacketLossRatio <PacketLossRatio>` for :ref:`Phy2Phy <Phy2Phy>`
 back2back             :ref:`BackToBackFrames <BackToBackFrames>` for :ref:`Phy2Phy <Phy2Phy>`
@@ -24,14 +25,14 @@ phy2phy_cpu_load      :ref:`CPU0PacketLoss <CPU0PacketLoss>` for :ref:`Phy2Phy <
 phy2phy_mem_load      Same as :ref:`CPU0PacketLoss <CPU0PacketLoss>` but using a memory intensive app
 ===================== ===========================================================
 
-Supported deployment scenarios:
+Deployment 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:
+Loopback applications in the Guest:
 
 * `DPDK testpmd <http://dpdk.org/doc/guides/testpmd_app_ug/index.html>`_.
 * Linux Bridge.
@@ -39,7 +40,8 @@ Loopback applications in the Guest can be:
 
 Supported traffic generators:
 
+* Spirent Testcenter
 * Ixia: IxOS and IxNet.
-* Spirent.
-* Dummy.
-
+* Xena
+* MoonGen
+* Dummy