diff options
| author |   Christian Trautman <ctrautma@redhat.com> | 2016-08-11 08:53:20 -0400 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-08-12 13:08:32 +0000 |
| commit | f6f05f632f85d86d397e2522bc43cb4407d9eba8 (patch) | |
| tree | 1c56864917b1265a44790d3df2d326edb3173e18 /docs/userguide | |
| parent | ea6a60dec01d154196c21cfdacf6fd3f6981c71c (diff) | |
doc_fixup: Grammar and link fixes to documentation
Fixes minor grammar and link issues.
JIRA: VSPERF-349
Change-Id: Id8708aee5b099287b5c99e79ca6da9ab8778897f
Signed-off-by: Christian Trautman <ctrautma@redhat.com>
Diffstat (limited to 'docs/userguide')
| -rwxr-xr-x | docs/userguide/integration.rst | 4 | ||||
| -rwxr-xr-x | docs/userguide/testusage.rst | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/docs/userguide/integration.rst b/docs/userguide/integration.rst index e45f2dc1..c7886536 100755 --- a/docs/userguide/integration.rst +++ b/docs/userguide/integration.rst @@ -435,6 +435,10 @@ Executing Tunnel encapsulation tests The VXLAN OVS DPDK encapsulation tests requires IPs, MAC addresses, bridge names and WHITELIST_NICS for DPDK. +NOTE: Only Ixia traffic generators currently support the execution of the tunnel +encapsulation tests. Support for other traffic generators may come in a future +release. + Default values are already provided. To customize for your environment, override the following variables in you user_settings.py file: diff --git a/docs/userguide/testusage.rst b/docs/userguide/testusage.rst index b5f47998..c020b6ca 100755 --- a/docs/userguide/testusage.rst +++ b/docs/userguide/testusage.rst @@ -16,6 +16,10 @@ support in VSPERF includes: - Spirent traffic generator (TestCenter hardware chassis or TestCenter virtual in a VM) and a VM to run the Spirent Virtual Deployment Service image, formerly known as "Spirent LabServer". +- Xena Network traffic generator (Xena hardware chassis) that houses the Xena + Traffic generator modules. +- Moongen software traffic generator. Requires a separate machine running + moongen to execute packet generation. If you want to use another traffic generator, please select the Dummy generator option as shown in `Traffic generator instructions @@ -114,6 +118,12 @@ deployment scenarios. The image can be downloaded from $ wget http://artifacts.opnfv.org/vswitchperf/vloop-vnf-ubuntu-14.04_20151216.qcow2 +Newer vloop_vnf images are available. Please reference the +installation instructions for information on these images +`installation instructions +<http://artifacts.opnfv.org/vswitchperf/docs/configguide/installation.html>`__ + + vloop_vnf forwards traffic through a VM using one of: * DPDK testpmd * Linux Bridge @@ -645,5 +655,5 @@ More information ^^^^^^^^^^^^^^^^ For more information and details refer to the vSwitchPerf user guide at: -http://artifacts.opnfv.org/vswitchperf/brahmaputra/userguide/index.html +http://artifacts.opnfv.org/vswitchperf/docs/userguide/index.html |