diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2017-01-17 11:37:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-17 11:37:49 +0000 |
| commit | 8b75ee19407e542fa4b4153e3b6b23f678507575 (patch) | |
| tree | be0d19f3b7e41a5e65833cdca6e93ffac38f0392 /tools/pkt_gen/ixia/ixia.py | |
| parent | 7ed7b9683a2cc4c81fcabdffc945bf352263437f (diff) | |
| parent | 4481df385ac03ece015ccb429201f96189dc5ae2 (diff) | |
Merge "traffic: Configurable traffic details"
Diffstat (limited to 'tools/pkt_gen/ixia/ixia.py')
| -rwxr-xr-x | tools/pkt_gen/ixia/ixia.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/pkt_gen/ixia/ixia.py b/tools/pkt_gen/ixia/ixia.py index 5c5fb3df..ed947e70 100755 --- a/tools/pkt_gen/ixia/ixia.py +++ b/tools/pkt_gen/ixia/ixia.py @@ -42,6 +42,7 @@ from collections import OrderedDict from tools import systeminfo from tools.pkt_gen import trafficgen from conf import settings +from conf import merge_spec from core.results.results_constants import ResultsConstants _ROOT_DIR = os.path.dirname(os.path.realpath(__file__)) @@ -203,7 +204,7 @@ class Ixia(trafficgen.ITrafficGenerator): params['traffic'] = self.traffic_defaults.copy() if traffic: - params['traffic'] = trafficgen.merge_spec( + params['traffic'] = merge_spec( params['traffic'], traffic) for cmd in _build_set_cmds(params): @@ -268,7 +269,7 @@ class Ixia(trafficgen.ITrafficGenerator): params['traffic'] = self.traffic_defaults.copy() if traffic: - params['traffic'] = trafficgen.merge_spec( + params['traffic'] = merge_spec( params['traffic'], traffic) for cmd in _build_set_cmds(params): |