From f6f05f632f85d86d397e2522bc43cb4407d9eba8 Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Thu, 11 Aug 2016 08:53:20 -0400 Subject: 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 --- docs/userguide/testusage.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'docs/userguide/testusage.rst') 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 +`__ + + 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 -- cgit 1.2.3-korg