diff options
author | imarom <imarom@cisco.com> | 2016-02-03 14:06:10 -0500 |
---|---|---|
committer | imarom <imarom@cisco.com> | 2016-02-03 14:11:23 -0500 |
commit | c8cd078fca514ed0a30b5a084efd1fa5f8386cc2 (patch) | |
tree | dc543f8c1b7c1af8257a81f3d92e17f27588cae1 /scripts/automation/trex_control_plane | |
parent | 2887433cb71f43c9bf91226915959f5ebea49869 (diff) |
integration issue
Diffstat (limited to 'scripts/automation/trex_control_plane')
-rw-r--r-- | scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py | 5 | ||||
-rwxr-xr-x | scripts/automation/trex_control_plane/common/trex_streams.py | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py b/scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py index b48b3d7b..30383469 100644 --- a/scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py +++ b/scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py @@ -493,8 +493,8 @@ class CTRexVmDescFlowVar(CTRexVmDescBase): valid_fv_ops (op) # choose default value for init val - if init_val == None: - init_val = max_val if op == "dec" else min_val + if init_value == None: + init_value = max_value if op == "dec" else min_value self.init_value = convert_val (init_value) self.min_value = convert_val (min_value); @@ -711,7 +711,6 @@ class CScapyTRexPktBuilder(CTrexPktBuilderInterface): var_names = desc.get_var_name() if var_names : - print var_names for var_name in var_names: if vars.has_key(var_name): raise CTRexPacketBuildException(-11,("variable %s define twice ") % (var_name) ); diff --git a/scripts/automation/trex_control_plane/common/trex_streams.py b/scripts/automation/trex_control_plane/common/trex_streams.py index 0766aa7b..238c89f3 100755 --- a/scripts/automation/trex_control_plane/common/trex_streams.py +++ b/scripts/automation/trex_control_plane/common/trex_streams.py @@ -2,6 +2,7 @@ import external_packages from client_utils.packet_builder_interface import CTrexPktBuilderInterface +from client_utils.packet_builder import CTRexPktBuilder from collections import OrderedDict, namedtuple from client_utils.yaml_utils import * import trex_stl_exceptions |