Merge "Updated VSPERF description and fixed Wiki links to project"

diff --git a/docs/release/overview.rst b/docs/release/overview.rst
index 72c9eda..7124306 100644 (file)
--- a/docs/release/overview.rst
+++ b/docs/release/overview.rst
@@ -276,8 +276,10 @@ Some of the projects focused on these testing areas include:
 VSPERF
 ------
 
-VSPERF provides a generic and architecture agnostic vSwitch testing framework and associated tests.
-This serves as a basis for validating the suitability of different vSwitch implementations and deployments.
+VSPERF provides an automated test-framework and comprehensive test suite for measuring data-plane
+performance of the NFVI including switching technology, physical and virtual network interfaces.
+The provided test cases with network topologies can be customized while also allowing individual
+versions of Operating System, vSwitch and hypervisor to be specified.
 
 -----------
 Bottlenecks

diff --git a/docs/testing/ecosystem/overview.rst b/docs/testing/ecosystem/overview.rst
index ffa5945..a895d1c 100644 (file)
--- a/docs/testing/ecosystem/overview.rst
+++ b/docs/testing/ecosystem/overview.rst
@@ -322,9 +322,9 @@ Reference documentation
 +================+=========================================================+
 |  Bottlenecks   | https://wiki.opnfv.org/display/bottlenecks/Bottlenecks  |
 +----------------+---------------------------------------------------------+
-| CPerf          | https://wiki.opnfv.org/display/meetings/CPerf           |
+| CPerf          | https://wiki.opnfv.org/display/cperf                    |
 +----------------+---------------------------------------------------------+
-| Dovetail       | https://wiki.opnfv.org/display/dovetail/Dovetail        |
+| Dovetail       | https://wiki.opnfv.org/display/dovetail                 |
 +----------------+---------------------------------------------------------+
 | Functest       | https://wiki.opnfv.org/display/functest/                |
 +----------------+---------------------------------------------------------+
@@ -332,7 +332,7 @@ Reference documentation
 +----------------+---------------------------------------------------------+
 | Storperf       | https://wiki.opnfv.org/display/storperf/Storperf        |
 +----------------+---------------------------------------------------------+
-| VSperf         | https://wiki.opnfv.org/display/vsperf/VSperf            |
+| VSperf         | https://wiki.opnfv.org/display/vsperf                   |
 +----------------+---------------------------------------------------------+
 | Yardstick      | https://wiki.opnfv.org/display/yardstick/Yardstick      |
 +----------------+---------------------------------------------------------+