summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane
diff options
context:
space:
mode:
authorimarom <imarom@cisco.com>2016-09-05 10:32:08 +0300
committerimarom <imarom@cisco.com>2016-09-07 14:02:57 +0300
commit0d4c9932591a46d5e2398dd1049001e107130f44 (patch)
tree71bbf0b7f287d721459132cefc91c104b989e4ef /scripts/automation/trex_control_plane
parentd508420652d613fdc87f6af746fd1372cd2ae7d2 (diff)
dual mode : code review fixes
Diffstat (limited to 'scripts/automation/trex_control_plane')
-rwxr-xr-xscripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py10
-rwxr-xr-xscripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py2
2 files changed, 9 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
index 5664343a..12a69c56 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
@@ -753,7 +753,13 @@ class STLClient(object):
# for dual, provide the slave handler as well
slave_handler = self.ports[port_id ^ 0x1].handler if is_dual else ""
- rc.add(self.ports[port_id].push_remote(pcap_filename, ipg_usec, speedup, count, duration, is_dual, slave_handler))
+ rc.add(self.ports[port_id].push_remote(pcap_filename,
+ ipg_usec,
+ speedup,
+ count,
+ duration,
+ is_dual,
+ slave_handler))
return rc
@@ -2245,7 +2251,7 @@ class STLClient(object):
raise STLError("dual mode: cannot provide adjacent ports ({0}, {1}) in a batch".format(master, slave))
if not slave in self.get_acquired_ports():
- raise STLError("dual mode: port {0} must be owned as well".format(slave))
+ raise STLError("dual mode: adjacent port {0} must be owned during dual mode".format(slave))
self.logger.pre_cmd("Pushing remote PCAP on port(s) {0}:".format(ports))
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
index 779f35db..e1de6b55 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
@@ -39,7 +39,7 @@ REMOTE_FILE = 23
LOCKED = 24
PIN_CORES = 25
CORE_MASK = 26
-DUAL = 28
+DUAL = 27
GLOBAL_STATS = 50
PORT_STATS = 51