diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /src/sim/trex_sim_stateful.cpp | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
Diffstat (limited to 'src/sim/trex_sim_stateful.cpp')
| -rw-r--r-- | src/sim/trex_sim_stateful.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sim/trex_sim_stateful.cpp b/src/sim/trex_sim_stateful.cpp index 7546644d..3980dc24 100644 --- a/src/sim/trex_sim_stateful.cpp +++ b/src/sim/trex_sim_stateful.cpp @@ -169,6 +169,9 @@ int load_list_of_cap_files(CParserOption * op){ if (op->client_cfg_file != "") { try { fl.load_client_config_file(op->client_cfg_file); + // The simulator only test MAC address configs, so this parameter is not used + CManyIPInfo pretest_result; + fl.set_client_config_resolved_macs(pretest_result); } catch (const std::runtime_error &e) { std::cout << "\n*** " << e.what() << "\n\n"; exit(-1); |