diff options
| author |   imarom <imarom@cisco.com> | 2016-06-20 14:30:46 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-06-20 16:47:34 +0300 |
| commit | 0422016ab056245449e0e5bdf0dceef2c4f06e31 (patch) | |
| tree | c55d5dc86c944196274efad60e4a864ec15b9931 /scripts/automation/trex_control_plane/stl/trex_stl_lib/utils | |
| parent | 1b1567ac6c2cfcb1625dded30f497339c1519f91 (diff) | |
bug: multiplier can be string or unicode
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib/utils')
| -rw-r--r-- | scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/common.py | 1 | ||||
| -rwxr-xr-x | scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/common.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/common.py index b4903e81..6835ea5f 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/common.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/common.py @@ -64,3 +64,4 @@ def list_difference (l1, l2): def is_sub_list (l1, l2): return set(l1) <= set(l2) + 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 98e3ca6a..9ef14612 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 @@ -90,10 +90,6 @@ match_multiplier_help = """Multiplier should be passed in the following format: # value should be divided def decode_multiplier(val, allow_update = False, divide_count = 1): - # must be string - if not isinstance(val, str): - return None - # do we allow updates ? +/- if not allow_update: match = re.match("^(\d+(\.\d+)?)(bps|kbps|mbps|gbps|pps|kpps|mpps|%?)$", val) |