diff options
| -rwxr-xr-x | docs/configguide/installation.rst | 4 | ||||
| -rw-r--r-- | docs/configguide/trafficgen.rst | 23 | ||||
| -rwxr-xr-x | docs/userguide/integration.rst | 4 | ||||
| -rwxr-xr-x | docs/userguide/testusage.rst | 12 | ||||
| -rw-r--r-- | testcases/testcase.py | 8 | ||||
| -rw-r--r-- | tools/hugepages.py | 2 | ||||
| -rw-r--r-- | tools/pkt_gen/testcenter/testcenter.py | 16 |
7 files changed, 50 insertions, 19 deletions
diff --git a/docs/configguide/installation.rst b/docs/configguide/installation.rst index 70572b07..2dabfc7f 100755 --- a/docs/configguide/installation.rst +++ b/docs/configguide/installation.rst @@ -162,8 +162,8 @@ hugepage amounts to support running these configurations. It is recommended to configure 1GB hugepages as the pagesize. The amount of hugepages needed depends on your configuration files in vsperf. -Each guest image requires 4096 by default according to the default settings in -the ``04_vnf.conf`` file. +Each guest image requires 4096 MB by default according to the default settings +in the ``04_vnf.conf`` file. .. code:: bash diff --git a/docs/configguide/trafficgen.rst b/docs/configguide/trafficgen.rst index c323ae9d..28b34a6b 100644 --- a/docs/configguide/trafficgen.rst +++ b/docs/configguide/trafficgen.rst @@ -57,7 +57,7 @@ follows: }, } -The framesize paramter can be overridden from the configuration +The framesize parameter can be overridden from the configuration files by adding the following to your custom configuration file ``10_custom.conf``: @@ -169,7 +169,7 @@ IxNetwork -> IxNetwork\_$(VER\_NUM) -> IxNetwork TCL Server) Right click on IxNetwork TCL Server, select properties - Under shortcut tab in the Target dialogue box make sure there is the argument "-tclport xxxx" -where xxxx is your port number (take note of this port number you will +where xxxx is your port number (take note of this port number as you will need it for the 10\_custom.conf file). .. image:: TCLServerProperties.png @@ -329,7 +329,7 @@ Xena Networks Installation ~~~~~~~~~~~~ -Xena Networks traffic generator requires certain files and packages to be +Xena Networks traffic generator requires specific files and packages to be installed. It is assumed the user has access to the Xena2544.exe file which must be placed in VSPerf installation location under the tools/pkt_gen/xena folder. Contact Xena Networks for the latest version of this file. The user @@ -406,7 +406,7 @@ https://github.com/emmericp/MoonGen * Note: Today, MoonGen with VSPERF only supports 10Gbps line speeds. -For VSPerf use, MoonGen should be cloned from here (as opposed to the afore +For VSPerf use, MoonGen should be cloned from here (as opposed to the previously mentioned GitHub): git clone https://github.com/atheurer/MoonGen @@ -435,3 +435,18 @@ One can set up this ssh access by doing the following on both servers: ssh-keygen -b 2048 -t rsa ssh-copy-id <other server> + +Configuration +~~~~~~~~~~~~~ + +Connection information for your Xena Chassis must be supplied inside the +``10_custom.conf`` or ``03_custom.conf`` file. The following parameters must be +set to allow for proper connections to the chassis. + +.. code-block:: console + + TRAFFICGEN_MOONGEN_HOST_IP_ADDR = "" + TRAFFICGEN_MOONGEN_USER = "" + TRAFFICGEN_MOONGEN_BASE_DIR = "" + TRAFFICGEN_MOONGEN_PORTS = "" + TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = "" 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 diff --git a/testcases/testcase.py b/testcases/testcase.py index d88840d7..0123b305 100644 --- a/testcases/testcase.py +++ b/testcases/testcase.py @@ -439,8 +439,8 @@ class TestCase(object): '-socket-mem\s+(\d+),(\d+)', ''.join(S.getValue('VSWITCHD_DPDK_ARGS'))) if match: - sock0_mem, sock1_mem = (int(match.group(1)) / 1024, - int(match.group(2)) / 1024) + sock0_mem, sock1_mem = (int(match.group(1)) * 1024 / hugepage_size, + int(match.group(2)) * 1024 / hugepage_size) else: logging.info( 'Could not parse socket memory config in dpdk params.') @@ -448,8 +448,8 @@ class TestCase(object): sock0_mem, sock1_mem = ( S.getValue( 'VSWITCHD_DPDK_CONFIG')['dpdk-socket-mem'].split(',')) - sock0_mem, sock1_mem = (int(sock0_mem) / 1024, - int(sock1_mem) / 1024) + sock0_mem, sock1_mem = (int(sock0_mem) * 1024 / hugepage_size, + int(sock1_mem) * 1024 / hugepage_size) # If hugepages needed, verify the amounts are free if any([hugepages_needed, sock0_mem, sock1_mem]): diff --git a/tools/hugepages.py b/tools/hugepages.py index bba40122..d233f04d 100644 --- a/tools/hugepages.py +++ b/tools/hugepages.py @@ -42,7 +42,7 @@ def get_hugepage_size(): for line in data: match = hugepage_size_re.search(line) if match: - _LOGGER.info('Hugepages size: %s', match.group('size_hp')) + _LOGGER.info('Hugepages size: %s kb', match.group('size_hp')) return int(match.group('size_hp')) else: _LOGGER.error('Could not parse for hugepage size') diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py index c242269a..a6cea2e1 100644 --- a/tools/pkt_gen/testcenter/testcenter.py +++ b/tools/pkt_gen/testcenter/testcenter.py @@ -95,8 +95,6 @@ def get_rfc2544_common_settings(): settings.getValue("TRAFFICGEN_STC_WEST_INTF_ADDR"), "--west_intf_gateway_addr", settings.getValue("TRAFFICGEN_STC_WEST_INTF_GATEWAY_ADDR"), - "--num_trials", - settings.getValue("TRAFFICGEN_STC_NUMBER_OF_TRIALS"), "--trial_duration_sec", settings.getValue("TRAFFICGEN_STC_TRIAL_DURATION_SEC"), "--traffic_pattern", @@ -104,14 +102,16 @@ def get_rfc2544_common_settings(): return args -def get_rfc2544_custom_settings(framesize, custom_tr): +def get_rfc2544_custom_settings(framesize, custom_tr, tests): """ Return RFC2544 Custom Settings """ args = ["--frame_size_list", str(framesize), "--traffic_custom", - str(custom_tr)] + str(custom_tr), + "--num_trials", + str(tests)] return args @@ -192,7 +192,7 @@ class TestCenter(trafficgen.ITrafficGenerator): stc_common_args = get_stc_common_settings() rfc2544_common_args = get_rfc2544_common_settings() rfc2544_custom_args = get_rfc2544_custom_settings(framesize, - custom) + custom, 1) args = stc_common_args + rfc2544_common_args + rfc2544_custom_args if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True": @@ -224,7 +224,8 @@ class TestCenter(trafficgen.ITrafficGenerator): stc_common_args = get_stc_common_settings() rfc2544_common_args = get_rfc2544_common_settings() - rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '') + rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '', + tests) args = stc_common_args + rfc2544_common_args + rfc2544_custom_args if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True": @@ -256,7 +257,8 @@ class TestCenter(trafficgen.ITrafficGenerator): stc_common_args = get_stc_common_settings() rfc2544_common_args = get_rfc2544_common_settings() - rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '') + rfc2544_custom_args = get_rfc2544_custom_settings(framesize, '', + tests) args = stc_common_args + rfc2544_common_args + rfc2544_custom_args if settings.getValue("TRAFFICGEN_STC_VERBOSE") is "True": |