summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorimarom <imarom@cisco.com>2016-08-16 14:34:04 +0300
committerimarom <imarom@cisco.com>2016-08-16 14:34:04 +0300
commit3e20a563a264aae8000e540e93775545d89cc34a (patch)
treec5969ebbe4810c55cf6db77ff33cd1d58c1564ff /scripts
parentc5a9a3c77658f04e9dac066443e3bf6aa7d32b67 (diff)
regression failure due to previous commit
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py13
1 files changed, 5 insertions, 8 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 3bc507e5..ee8e84cf 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
@@ -943,8 +943,6 @@ class STLClient(object):
# list of masks
elif isinstance(core_mask, list):
- if not ports:
- raise STLError("'ports' must be specified explicitly when providing 'core_mask'")
if len(ports) != len(core_mask):
raise STLError("'core_mask' list must be the same length as 'ports' list")
@@ -1985,20 +1983,19 @@ class STLClient(object):
"""
- #########################
- # decode core mask argument
- core_mask = self.__decode_core_mask(ports, core_mask)
- #######################
-
ports = ports if ports is not None else self.get_acquired_ports()
ports = self._validate_port_list(ports)
-
validate_type('mult', mult, basestring)
validate_type('force', force, bool)
validate_type('duration', duration, (int, float))
validate_type('total', total, bool)
+ #########################
+ # decode core mask argument
+ core_mask = self.__decode_core_mask(ports, core_mask)
+ #######################
+
# verify multiplier
mult_obj = parsing_opts.decode_multiplier(mult,
allow_update = False,