From 3e20a563a264aae8000e540e93775545d89cc34a Mon Sep 17 00:00:00 2001 From: imarom Date: Tue, 16 Aug 2016 14:34:04 +0300 Subject: regression failure due to previous commit --- .../trex_control_plane/stl/trex_stl_lib/trex_stl_client.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'scripts') 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, -- cgit 1.2.3-korg