6 files changed, 40 insertions, 18 deletions
diff --git a/docs/testing/user/configguide/index.rst b/docs/testing/user/configguide/index.rst
index 8c9db1aa..83908a97 100644
--- a/docs/testing/user/configguide/index.rst
+++ b/docs/testing/user/configguide/index.rst
@@ -14,13 +14,13 @@ Introduction
 
 VSPERF is an OPNFV testing project.
 
-VSPERF is an OPNFV project that provides an automated test-framework and comprehensive test suite based on Industry
+VSPERF provides an automated test-framework and comprehensive test suite based on Industry
 Test Specifications for measuring NFVI data-plane performance. The data-path includes switching technologies with
 physical and virtual network interfaces. The VSPERF architecture is switch and traffic generator agnostic and test
-cases can be easily customized. Software versions and configurations including the vSwitch (OVS or VPP) as well as
-the network topology are controlled by VSPERF (independent of OpenStack). VSPERF is used as a development tool for
-optimizing switching technologies, qualification of packet processing components and for pre-deployment evaluation
-of the NFV platform data-path.
+cases can be easily customized. VSPERF was designed to be independent of OpenStack therefore OPNFV installer scenarios
+are not required. VSPERF can source, configure and deploy the device-under-test using specified software versions and
+network topology. VSPERF is used as a development tool for optimizing switching technologies, qualification of packet
+processing functions and for evaluation of data-path performance.
 
 The Euphrates release adds new features and improvements that will help advance high performance packet processing
 on Telco NFV platforms. This includes new test cases, flexibility in customizing test-cases, new results display
diff --git a/docs/testing/user/configguide/installation.rst b/docs/testing/user/configguide/installation.rst
index 0a98c945..8bad4efd 100644
--- a/docs/testing/user/configguide/installation.rst
+++ b/docs/testing/user/configguide/installation.rst
@@ -63,6 +63,7 @@ The vSwitch must support Open Flow 1.3 or greater.
 * Open vSwitch
 * Open vSwitch with DPDK support
 * TestPMD application from DPDK (supports p2p and pvp scenarios)
+* Cisco VPP
 
 Supported Hypervisors
 ---------------------
@@ -342,7 +343,7 @@ following location:
 
 http://www.tuned-project.org/2017/04/27/tuned-2-8-0-released/
 
-Follow instructions to install the latest tuned-adm onto your system. For
+Follow the instructions to install the latest tuned-adm onto your system. For
 current RHEL customers you should already have the most current version. You
 just need to install the cpu-partitioning profile.
 
diff --git a/docs/testing/user/configguide/trafficgen.rst b/docs/testing/user/configguide/trafficgen.rst
index 7c14c55d..4b9eec6e 100644
--- a/docs/testing/user/configguide/trafficgen.rst
+++ b/docs/testing/user/configguide/trafficgen.rst
@@ -248,7 +248,7 @@ Ixia
 ----
 
 VSPERF can use both IxNetwork and IxExplorer TCL servers to control Ixia chassis.
-However usage of IxNetwork TCL server is a preferred option. Following sections
+However, usage of IxNetwork TCL server is a preferred option. The following sections
 will describe installation and configuration of IxNetwork components used by VSPERF.
 
 Installation
@@ -675,11 +675,15 @@ https://github.com/emmericp/MoonGen
 For VSPERF use, MoonGen should be cloned from here (as opposed to the
 previously mentioned GitHub):
 
-git clone https://github.com/atheurer/lua-trafficgen
+.. code-block:: console
+
+    git clone https://github.com/atheurer/lua-trafficgen
 
 and use the master branch:
 
-git checkout master
+.. code-block:: console
+
+    git checkout master
 
 VSPERF uses a particular Lua script with the MoonGen project:
 
@@ -808,10 +812,10 @@ Example of this configuration is in conf/03_traffic.conf or conf/10_custom.conf.
     TRAFFICGEN_TREX_USER = ''
     TRAFFICGEN_TREX_BASE_DIR = ''
 
-TRAFFICGEN_TREX_USER has to have sudo permission and passwordless access.
+TRAFFICGEN_TREX_USER has to have sudo permission and password-less access.
 TRAFFICGEN_TREX_BASE_DIR is the place, where is stored 't-rex-64' file.
 
-It is possible to specify the accurancy of RFC2544 Throughput measurement.
+It is possible to specify the accuracy of RFC2544 Throughput measurement.
 Threshold below defines maximal difference between frame rate of successful
 (i.e. defined frameloss was reached) and unsuccessful (i.e. frameloss was
 exceeded) iterations.
@@ -821,3 +825,18 @@ Default value of this parameter is defined in conf/03_traffic.conf as follows:
 .. code-block:: console
 
     TRAFFICGEN_TREX_RFC2544_TPUT_THRESHOLD = ''
+
+SR-IOV and Multistream layer 2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+T-Rex by default only accepts packets on the receive side if the destination mac matches the
+MAC address specified in the /etc/trex-cfg.yaml on the server side. For SR-IOV this creates
+challenges with modifying the MAC address in the traffic profile to correctly flow packets
+through specified VFs. To remove this limitation enable promiscuous mode on T-Rex to allow
+all packets regardless of the destination mac to be accepted.
+
+This also creates problems when doing multistream at layer 2 since the source macs will be
+modified. Enable Promiscuous mode when doing multistream at layer 2 testing with T-Rex.
+
+.. code-block:: console
+
+    TRAFFICGEN_TREX_PROMISCUOUS=True
diff --git a/docs/testing/user/configguide/upgrade.rst b/docs/testing/user/configguide/upgrade.rst
index cf92572c..a41683ee 100644
--- a/docs/testing/user/configguide/upgrade.rst
+++ b/docs/testing/user/configguide/upgrade.rst
@@ -35,6 +35,7 @@ List of stable releases:
    colorado.2.0
    colorado.3.0
    danube.1.0
+   euphrates.1.0
 
 You could select which stable release should be used. For example, select ``danube.1.0``:
 
@@ -180,4 +181,3 @@ parameters and update them according to the documentation:
    rfc2544_tests
    stream_type
    traffic_type
-
diff --git a/docs/testing/user/userguide/integration.rst b/docs/testing/user/userguide/integration.rst
index 83b29da6..249a03c4 100644
--- a/docs/testing/user/userguide/integration.rst
+++ b/docs/testing/user/userguide/integration.rst
@@ -457,7 +457,7 @@ To run GENEVE decapsulation tests:
 Executing Tunnel encapsulation+decapsulation tests
 --------------------------------------------------
 
-The OVS DPDK encapsulation_decapsulation tests requires IPs, MAC addresses,
+The OVS DPDK encapsulation/decapsulation tests requires IPs, MAC addresses,
 bridge names and WHITELIST_NICS for DPDK.
 
 The test cases can test the tunneling encap and decap without using any ingress
diff --git a/docs/testing/user/userguide/testusage.rst b/docs/testing/user/userguide/testusage.rst
index 4d3528d0..20c30a40 100644
--- a/docs/testing/user/userguide/testusage.rst
+++ b/docs/testing/user/userguide/testusage.rst
@@ -20,6 +20,8 @@ support in VSPERF includes:
   Traffic generator modules.
 - Moongen software traffic generator. Requires a separate machine running
   moongen to execute packet generation.
+- T-Rex software traffic generator. Requires a separate machine running T-Rex
+  Server to execute packet generation.
 
 If you want to use another traffic generator, please select the :ref:`trafficgen-dummy`
 generator.
@@ -475,7 +477,7 @@ For example:
 
 * vSwitch tests with DPDK or without DPDK support to verify impact
   of VF usage on vSwitch performance
-* tests without vSwitch, where traffic is forwared directly
+* tests without vSwitch, where traffic is forwarded directly
   between VF interfaces by packet forwarder (e.g. testpmd application)
 * tests without vSwitch, where VM accesses VF interfaces directly
   by PCI-passthrough_ to measure raw VM throughput performance.
@@ -486,11 +488,11 @@ Using QEMU with PCI passthrough support
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Raw virtual machine throughput performance can be measured by execution of PVP
-test with direct access to NICs by PCI passthrough. To execute VM with direct
+test with direct access to NICs by PCI pass-through. To execute VM with direct
 access to PCI devices, enable vfio-pci_. In order to use virtual functions,
 SRIOV-support_ must be enabled.
 
-Execution of test with PCI passthrough with vswitch disabled:
+Execution of test with PCI pass-through with vswitch disabled:
 
 .. code-block:: console
 
@@ -498,9 +500,9 @@ Execution of test with PCI passthrough with vswitch disabled:
                --vswitch none --vnf QemuPciPassthrough pvp_tput
 
 Any of supported guest-loopback-application_ can be used inside VM with
-PCI passthrough support.
+PCI pass-through support.
 
-Note: Qemu with PCI passthrough support can be used only with PVP test
+Note: Qemu with PCI pass-through support can be used only with PVP test
 deployment.
 
 .. _guest-loopback-application: