diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-12-01 14:23:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-01 14:23:37 +0000 |
| commit | 513153802b329c0584d72655460a4a264ad41e7c (patch) | |
| tree | ad9e231c4ed3ba68e14f11c76dcc0308024ace9d | |
| parent | 964d1bffc8ac4c85ba05f4c5a2cb1fa9b10f6b6b (diff) | |
| parent | 89906b235ef9d050d91eb695cdeff737a28ffb60 (diff) | |
Merge "pkt_gen: MoonGen updated to keep parity with master"
| -rw-r--r-- | docs/configguide/trafficgen.rst | 19 | ||||
| -rw-r--r-- | tools/pkt_gen/moongen/moongen.py | 4 |
2 files changed, 11 insertions, 12 deletions
diff --git a/docs/configguide/trafficgen.rst b/docs/configguide/trafficgen.rst index efcc4d83..3d0cfc66 100644 --- a/docs/configguide/trafficgen.rst +++ b/docs/configguide/trafficgen.rst @@ -443,23 +443,22 @@ 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 previously -mentioned GitHub): +For VSPERF use, MoonGen should be cloned from here (as opposed to the +previously mentioned GitHub): -git clone https://github.com/atheurer/MoonGen +git clone https://github.com/atheurer/lua-trafficgen -and use the opnfv-stable branch: +and use the master branch: -git checkout opnfv-stable +git checkout master -VSPerf uses a particular example script under the examples directory within -the MoonGen project: +VSPERF uses a particular Lua script with the MoonGen project: -MoonGen/examples/opnfv-vsperf.lua +trafficgen.lua -Follow MoonGen set up instructions here: +Follow MoonGen set up and execution instructions here: -https://github.com/atheurer/MoonGen/blob/opnfv-stable/MoonGenSetUp.html +https://github.com/atheurer/lua-trafficgen/blob/master/README.md Note one will need to set up ssh login to not use passwords between the server running MoonGen and the device under test (running the VSPERF test diff --git a/tools/pkt_gen/moongen/moongen.py b/tools/pkt_gen/moongen/moongen.py index fe3aca52..7fd67661 100644 --- a/tools/pkt_gen/moongen/moongen.py +++ b/tools/pkt_gen/moongen/moongen.py @@ -222,7 +222,7 @@ class Moongen(ITrafficGenerator): "@" + self._moongen_host_ip_addr cmd_find_moongen = connect_moongen + " ls " + \ - self._moongen_base_dir + "/examples/opnfv-vsperf.lua" + self._moongen_base_dir + "/trafficgen.lua" find_moongen = subprocess.Popen(cmd_find_moongen, shell=True, @@ -367,7 +367,7 @@ class Moongen(ITrafficGenerator): self._moongen_host_ip_addr cmd_moongen = " 'cd " + self._moongen_base_dir + \ - "; ./build/MoonGen examples/opnfv-vsperf.lua | tee moongen_log.txt'" + "; ./MoonGen/build/MoonGen trafficgen.lua | tee moongen_log.txt'" cmd_start_moongen = connect_moongen + cmd_moongen |