fix integer checks, now they include "long"

4 files changed, 74 insertions, 57 deletions

diff --git a/scripts/automation/trex_control_plane/stl/examples/hlt_udp_simple.py b/scripts/automation/trex_control_plane/stl/examples/hlt_udp_simple.py
index 6cd6debc..56e2005a 100644
--- a/scripts/automation/trex_control_plane/stl/examples/hlt_udp_simple.py
+++ b/scripts/automation/trex_control_plane/stl/examples/hlt_udp_simple.py
@@ -87,7 +87,6 @@ if __name__ == "__main__":
                                 ip_dst_addr = '8.0.0.1', ip_dst_mode = 'increment', ip_dst_count = 254,
                                 l4_protocol = 'udp',
                                 udp_dst_port = 12, udp_src_port = 1025,
-                                stream_id = 1, # temporary workaround, add_stream does not return stream_id
                                 rate_pps = args.rate_pps,
                                 )
     check_res(res)
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 98336ef2..23ecaf83 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
@@ -158,13 +158,13 @@ traffic_config_kwargs = {
 }
 
 traffic_control_kwargs = {
-    'action': None,                         # ( run | stop )
-    'port_handle': None
+    'action': None,                         # ( clear_stats | run | stop | sync_run | poll | reset )
+    'port_handle': None,
 }
 
 traffic_stats_kwargs = {
     'mode': 'aggregate',                    # ( aggregate )
-    'port_handle': None
+    'port_handle': None,
 }
 
 
@@ -173,6 +173,7 @@ import os
 import socket
 import copy
 from trex_stl_lib.api import *
+from trex_stl_types import *
 from utils.common import get_number
 from collections import defaultdict
 
@@ -212,7 +213,7 @@ def correct_macs(kwargs):
     for mac_arg in list_of_mac_args + list_of_mac_steps:
         if mac_arg in kwargs:
             mac_value = kwargs[mac_arg]
-            if type(mac_value) in (int, long) and mac_arg in list_of_mac_steps: # step can be number
+            if is_integer(mac_value) and mac_arg in list_of_mac_steps: # step can be number
                 continue
             if type(mac_value) is not str: raise STLError('Argument %s should be str' % mac_arg)
             mac_value = mac_value.replace('{', '').replace('}', '').strip().replace('-', ' ').replace(':', ' ').replace('.', ' ')
@@ -306,7 +307,7 @@ class CStreamsPerPort(defaultdict):
         if stream_id is None: return # no stream_id, can't save TODO: remove this check ASAP
         if stream_hlt_args.get('load_profile'): return # can't modify profiles, don't save
         if not self.hlt_history: raise STLError('CStreamsPerPort: this object works only with HLT history, try init with hlt_history = True')
-        if type(stream_id) not in (int, long): raise STLError('CStreamsPerPort: stream_id should be number')
+        if not is_integer(stream_id): raise STLError('CStreamsPerPort: stream_id should be number')
         if not isinstance(stream_hlt_args, dict): raise STLError('CStreamsPerPort: stream_hlt_args should be dict')
         if not isinstance(ports_list, list):
             ports_list = [ports_list]
@@ -574,6 +575,8 @@ class CTRexHltApi(object):
             try:
                 stream_id_arr = self.trex_client.add_streams(streams = stream_obj,
                                                              ports = port_handle)
+                if type(stream_id_arr) is not list:
+                    stream_id_arr = [stream_id_arr]
                 for port in port_handle:
                     self._streams_history.save_stream_args(port_handle, stream_id_arr[0], user_kwargs)
             except Exception as e:
@@ -660,7 +663,7 @@ class CTRexHltApi(object):
             except Exception as e:
                 return HLT_ERR('Could not retrieve stats: %s' % e if isinstance(e, STLError) else traceback.format_exc())
             for port_id, stat_dict in stats.iteritems():
-                if type(port_id) in (int, long):
+                if is_integer(port_id):
                     hlt_stats_dict[port_id] = {
                         'aggregate': {
                             'tx': {
@@ -737,7 +740,7 @@ class CTRexHltApi(object):
             return [int(port) for port in port_list.strip().split()]
         elif type(port_list) is list:
             return [int(port) for port in port_list]
-        elif type(port_list) in (int, long):
+        elif is_integer(port_list):
             return [int(port_list)]
         raise STLError('port_list should be string with ports, list, or single number')
 
@@ -1481,7 +1484,7 @@ def vlan_in_args(user_kwargs):
 def split_vlan_arg(vlan_arg):
     if type(vlan_arg) is list:
         return vlan_arg
-    if type(vlan_arg) in (int, long, type(None)):
+    if is_integer(vlan_arg) or vlan_arg is None:
         return [vlan_arg]
     if type(vlan_arg) is str:
         return vlan_arg.replace('{', '').replace('}', '').strip().split()
@@ -1521,6 +1524,6 @@ def correct_direction(user_kwargs, kwargs):
 # we produce packets without fcs, so need to reduce produced sizes
 def correct_sizes(kwargs):
     for arg in kwargs.keys():
-        if type(arg) in (int, long):
+        if is_integer(arg):
             if arg.endswith(('_length', '_size', '_size_min', '_size_max', '_length_min', '_length_max')):
                 kwargs[arg] -= 4
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py
index 46218bd3..6a393b20 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py
@@ -9,7 +9,7 @@ import base64
 import inspect
 
 from trex_stl_packet_builder_interface import CTrexPktBuilderInterface
-
+from trex_stl_types import *
 from scapy.all import *
 
 class CTRexPacketBuildException(Exception):
@@ -29,7 +29,7 @@ class CTRexPacketBuildException(Exception):
 ################################################################################################
 
 def _buffer_to_num(str_buffer):
-    assert type(str_buffer)==str, 'type of str_buffer is not str'
+    validate_type('str_buffer', str_buffer, str)
     res=0
     for i in str_buffer:
         res = res << 8
@@ -38,12 +38,12 @@ def _buffer_to_num(str_buffer):
 
 
 def ipv4_str_to_num (ipv4_buffer):
-    assert type(ipv4_buffer)==str, 'type of ipv4_buffer is not str'
+    validate_type('ipv4_buffer', ipv4_buffer, str)
     assert len(ipv4_buffer)==4, 'size of ipv4_buffer is not 4'
     return _buffer_to_num(ipv4_buffer)
 
 def mac_str_to_num (mac_buffer):
-    assert type(mac_buffer)==str, 'type of mac_buffer is not str'
+    validate_type('mac_buffer', mac_buffer, str)
     assert len(mac_buffer)==6, 'size of mac_buffer is not 6'
     return _buffer_to_num(mac_buffer)
 
@@ -199,13 +199,13 @@ class CTRexVmInsBase(object):
     """
     def __init__(self, ins_type):
         self.type = ins_type
-        assert type(ins_type)==str, 'type of ins_type is not str'
+        validate_type('ins_type', ins_type, str)
 
 class CTRexVmInsFixIpv4(CTRexVmInsBase):
     def __init__(self, offset):
         super(CTRexVmInsFixIpv4, self).__init__("fix_checksum_ipv4")
         self.pkt_offset = offset
-        assert type(offset)==int, 'type of offset is not int'
+        validate_type('offset', offset, int)
 
 
 class CTRexVmInsFlowVar(CTRexVmInsBase):
@@ -217,63 +217,63 @@ class CTRexVmInsFlowVar(CTRexVmInsBase):
     def __init__(self, fv_name, size, op, init_value, min_value, max_value,step):
         super(CTRexVmInsFlowVar, self).__init__("flow_var")
         self.name = fv_name;
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.size = size
         self.op = op
         self.init_value = init_value
-        assert type(init_value)==int, 'type of init_value is not int'
+        validate_type('init_value', init_value, int)
         assert init_value >= 0, 'init_value (%s) is negative' % init_value
         self.min_value=min_value
-        assert type(min_value)==int, 'type of min_value is not int'
+        validate_type('min_value', min_value, int)
         assert min_value >= 0, 'min_value (%s) is negative' % min_value
         self.max_value=max_value
-        assert type(max_value)==int, 'type of max_value is not int'
+        validate_type('max_value', max_value, int)
         assert max_value >= 0, 'max_value (%s) is negative' % max_value
         self.step=step
-        assert type(step)==int, 'type of step should be int'
+        validate_type('step', step, int)
         assert step >= 0, 'step (%s) is negative' % step
 
 class CTRexVmInsWrFlowVar(CTRexVmInsBase):
     def __init__(self, fv_name, pkt_offset, add_value=0, is_big_endian=True):
         super(CTRexVmInsWrFlowVar, self).__init__("write_flow_var")
         self.name = fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.pkt_offset = pkt_offset
-        assert type(pkt_offset)==int, 'type of pkt_offset is not int'
+        validate_type('pkt_offset', pkt_offset, int)
         self.add_value = add_value
-        assert type(add_value)==int, 'type of add_value is not int'
+        validate_type('add_value', add_value, int)
         self.is_big_endian = is_big_endian
-        assert type(is_big_endian)==bool, 'type of is_big_endian is not bool'
+        validate_type('is_big_endian', is_big_endian, bool)
 
 class CTRexVmInsWrMaskFlowVar(CTRexVmInsBase):
     def __init__(self, fv_name, pkt_offset,pkt_cast_size,mask,shift,add_value, is_big_endian=True):
         super(CTRexVmInsWrMaskFlowVar, self).__init__("write_mask_flow_var")
         self.name = fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.pkt_offset = pkt_offset
-        assert type(pkt_offset)==int, 'type of pkt_offset is not int'
+        validate_type('pkt_offset', pkt_offset, int)
         self.pkt_cast_size = pkt_cast_size
-        assert type(pkt_cast_size)==int, 'type of pkt_cast_size is not int'
+        validate_type('pkt_cast_size', pkt_cast_size, int)
         self.mask = mask
-        assert type(mask)==int, 'type of mask is not int'
+        validate_type('mask', mask, int)
         self.shift = shift
-        assert type(shift)==int, 'type of shift is not int'
+        validate_type('shift', shift, int)
         self.add_value =add_value
-        assert type(add_value)==int, 'type of add_value is not int'
+        validate_type('add_value', add_value, int)
         self.is_big_endian = is_big_endian
-        assert type(is_big_endian)==bool, 'type of is_big_endian is not bool'
+        validate_type('is_big_endian', is_big_endian, bool)
 
 class CTRexVmInsTrimPktSize(CTRexVmInsBase):
     def __init__(self,fv_name):
         super(CTRexVmInsTrimPktSize, self).__init__("trim_pkt_size")
         self.name = fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
 
 class CTRexVmInsTupleGen(CTRexVmInsBase):
     def __init__(self, fv_name, ip_min, ip_max, port_min, port_max, limit_flows, flags=0):
         super(CTRexVmInsTupleGen, self).__init__("tuple_flow_var")
         self.name =fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.ip_min = ip_min;
         self.ip_max = ip_max;
         self.port_min = port_min;
@@ -514,16 +514,14 @@ def valid_fv_ops (op):
         raise CTRexPacketBuildException(-11,("flow var does not have a valid op %s ") % op  );
 
 def convert_val (val):
-    if type(val) == int:
+    if is_integer(val):
         return val
-    else:
-        if type(val) == str:
-          return ipv4_str_to_num (is_valid_ipv4(val))
-        else:
-            raise CTRexPacketBuildException(-11,("init val not valid %s ") % val  );
+    if type(val) == str:
+        return ipv4_str_to_num (is_valid_ipv4(val))
+    raise CTRexPacketBuildException(-11,("init val not valid %s ") % val  );
 
 def check_for_int (val):
-    assert type(val)==int, 'type of vcal is not int'
+    validate_type('val', val, int)
 
 
 class STLVmFlowVar(CTRexVmDescBase):
@@ -585,7 +583,7 @@ class STLVmFlowVar(CTRexVmDescBase):
         """
         super(STLVmFlowVar, self).__init__()
         self.name = name;
-        assert type(name)==str, 'type of name is not str'
+        validate_type('name', name, str)
         self.size =size
         valid_fv_size(size)
         self.op =op
@@ -690,14 +688,14 @@ class STLVmWrFlowVar(CTRexVmDescBase):
 
         super(STLVmWrFlowVar, self).__init__()
         self.name =fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.offset_fixup =offset_fixup
-        assert type(offset_fixup)==int, 'type of offset_fixup is not int'
+        validate_type('offset_fixup', offset_fixup, int)
         self.pkt_offset =pkt_offset
         self.add_val =add_val
-        assert type(add_val)==int,'type of add_val is not int'
+        validate_type('add_val', add_val, int)
         self.is_big =is_big;
-        assert type(is_big)==bool,'type of is_big_endian is not bool'
+        validate_type('is_big', is_big, bool)
 
     def get_var_ref (self):
         return self.name
@@ -816,24 +814,24 @@ class STLVmWrMaskFlowVar(CTRexVmDescBase):
 
         super(STLVmWrMaskFlowVar, self).__init__()
         self.name =fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
         self.offset_fixup =offset_fixup
-        assert type(offset_fixup)==int, 'type of offset_fixup is not int'
+        validate_type('offset_fixup', offset_fixup, int)
         self.pkt_offset =pkt_offset
         self.pkt_cast_size =pkt_cast_size
-        assert type(pkt_cast_size)==int,'type of pkt_cast_size is not int'
+        validate_type('pkt_cast_size', pkt_cast_size, int)
         if not (pkt_cast_size in [1,2,4]):
             raise CTRexPacketBuildException(-10,"not valid cast size");
 
         self.mask = mask
-        assert type(mask)==int,'type of mask is not int'
+        validate_type('mask', mask, int)
         self.shift = shift
-        assert type(shift)==int,'type of shift is not int'
+        validate_type('shift', shift, int)
         self.add_value = add_value
-        assert type(add_value)==int,'type of add_value is not int'
+        validate_type('add_value', add_value, int)
 
         self.is_big =is_big;
-        assert type(is_big)==bool,'type of is_big_endian is not bool'
+        validate_type('is_big', is_big, bool)
 
     def get_var_ref (self):
         return self.name
@@ -902,7 +900,7 @@ class STLVmTrimPktSize(CTRexVmDescBase):
     def __init__(self,fv_name):
         super(STLVmTrimPktSize, self).__init__()
         self.name = fv_name
-        assert type(fv_name)==str, 'type of fv_name is not str'
+        validate_type('fv_name', fv_name, str)
 
     def get_var_ref (self):
         return self.name
@@ -1023,7 +1021,7 @@ class STLVmTupleGen(CTRexVmDescBase):
 
         super(STLVmTupleGen, self).__init__()
         self.name = name
-        assert type(name)==str, 'type of fv_name is not str'
+        validate_type('name', name, str)
         self.ip_min = convert_val(ip_min);
         self.ip_max = convert_val(ip_max);
         self.port_min = port_min;
@@ -1222,7 +1220,7 @@ class STLPktBuilder(CTrexPktBuilderInterface):
 
 
     def set_pkt_as_str (self, pkt_buffer):
-        assert type(pkt_buffer)==str, "pkt_buffer should be string"
+        validate_type('pkt_buffer', pkt_buffer, str)
         self.pkt_raw = pkt_buffer
 
 
@@ -1372,7 +1370,7 @@ class STLPktBuilder(CTrexPktBuilderInterface):
 
         # set split_by_var
         if obj.split_by_field :
-            assert type(obj.split_by_field)==str, "type of split by var should be string"
+            validate_type('obj.split_by_field', obj.split_by_field, str)
             #if not vars.has_key(obj.split_by_field):
             #    raise CTRexPacketBuildException(-11,("variable %s does not exists. change split_by_var args ") % (var_name) );
 
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_types.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_types.py
index bd48f939..4b599f16 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_types.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_types.py
@@ -100,11 +100,28 @@ def RC_ERR (err):
 def RC_WARN (warn):
     return RC(True, warn, is_warn = True)
 
+try:
+    long
+    long_exists = True
+except:
+    long_exists = False
+
+def is_integer(arg):
+    if type(arg) is int:
+        return True
+    if long_exists and type(arg) is long:
+        return True
+    return False
 
 # validate type of arg
 # example1: validate_type('somearg', somearg, [int, long])
 # example2: validate_type('another_arg', another_arg, str)
 def validate_type(arg_name, arg, valid_types):
+    if long_exists:
+        if valid_types is int:
+            valid_types = (int, long)
+        elif type(valid_types) is list and int in valid_types and long not in valid_types:
+            valid_types.append(long)
     if type(valid_types) is list:
         valid_types = tuple(valid_types)
     if (type(valid_types) is type or                        # single type, not array of types