diff options
| author |   imarom <imarom@cisco.com> | 2016-12-25 12:54:09 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-12-25 13:50:56 +0200 |
| commit | 34cb66c9f06c7a43e68a17b4a8802f8d34298a65 (patch) | |
| tree | aa6b081213e5715cf09a18503cc7b0a20168c6fc /scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py | |
| parent | 549f2750ab22db5695a8d29575c136ab06e37235 (diff) | |
refactor layer config on prot attributes
added guard against unconfigured MAC when going up with empty config
file
Signed-off-by: imarom <imarom@cisco.com>
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py')
| -rwxr-xr-x | scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py index 464869aa..cf594948 100755 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py @@ -1089,10 +1089,10 @@ def generate_packet(**user_kwargs): fix_ipv4_checksum = True ip_src_addr = kwargs['ip_src_addr'] if type(ip_src_addr) is str: - ip_src_addr = ipv4_str_to_num(is_valid_ipv4(ip_src_addr)) + ip_src_addr = ipv4_str_to_num(is_valid_ipv4_ret(ip_src_addr)) step = kwargs['ip_src_step'] if type(step) is str: - step = ipv4_str_to_num(is_valid_ipv4(step)) + step = ipv4_str_to_num(is_valid_ipv4_ret(step)) if step < 1: raise STLError('ip_src_step has to be at least 1') @@ -1129,11 +1129,11 @@ def generate_packet(**user_kwargs): fix_ipv4_checksum = True ip_dst_addr = kwargs['ip_dst_addr'] if type(ip_dst_addr) is str: - ip_dst_addr = ipv4_str_to_num(is_valid_ipv4(ip_dst_addr)) + ip_dst_addr = ipv4_str_to_num(is_valid_ipv4_ret(ip_dst_addr)) step = kwargs['ip_dst_step'] if type(step) is str: - step = ipv4_str_to_num(is_valid_ipv4(step)) + step = ipv4_str_to_num(is_valid_ipv4_ret(step)) if step < 1: raise STLError('ip_dst_step has to be at least 1') @@ -1188,11 +1188,11 @@ def generate_packet(**user_kwargs): if count < 0: raise STLError('ipv6_src_count has to be at least 1') if count > 0 or kwargs['ipv6_src_mode'] == 'random': - ipv6_src_addr_num = ipv4_str_to_num(is_valid_ipv6(kwargs['ipv6_src_addr'])[-4:]) + ipv6_src_addr_num = ipv4_str_to_num(is_valid_ipv6_ret(kwargs['ipv6_src_addr'])[-4:]) step = kwargs['ipv6_src_step'] if type(step) is str: # convert ipv6 step to number - step = ipv4_str_to_num(is_valid_ipv6(step)[-4:]) + step = ipv4_str_to_num(is_valid_ipv6_ret(step)[-4:]) if step < 1: raise STLError('ipv6_src_step has to be at least 1') @@ -1226,11 +1226,11 @@ def generate_packet(**user_kwargs): if count < 0: raise STLError('ipv6_dst_count has to be at least 1') if count > 0 or kwargs['ipv6_dst_mode'] == 'random': - ipv6_dst_addr_num = ipv4_str_to_num(is_valid_ipv6(kwargs['ipv6_dst_addr'])[-4:]) + ipv6_dst_addr_num = ipv4_str_to_num(is_valid_ipv6_ret(kwargs['ipv6_dst_addr'])[-4:]) step = kwargs['ipv6_dst_step'] if type(step) is str: # convert ipv6 step to number - step = ipv4_str_to_num(is_valid_ipv6(step)[-4:]) + step = ipv4_str_to_num(is_valid_ipv6_ret(step)[-4:]) if step < 1: raise STLError('ipv6_dst_step has to be at least 1') |