summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/api/stl/examples/stl_bi_dir_flows.py4
-rw-r--r--scripts/automation/trex_control_plane/client_utils/scapy_packet_builder.py5
-rwxr-xr-xscripts/automation/trex_control_plane/common/trex_streams.py1
-rw-r--r--scripts/stl/profiles/imix.py4
4 files changed, 7 insertions, 7 deletions
diff --git a/scripts/api/stl/examples/stl_bi_dir_flows.py b/scripts/api/stl/examples/stl_bi_dir_flows.py
index b7967066..7d090345 100644
--- a/scripts/api/stl/examples/stl_bi_dir_flows.py
+++ b/scripts/api/stl/examples/stl_bi_dir_flows.py
@@ -22,11 +22,11 @@ def create_pkt (size, direction):
vm = [
# src
- STLVmFlowVar(name="src",min_val=src['start'],max_val=src['end'],size=4,op="inc"),
+ STLVmFlowVar(name="src",min_value=src['start'],max_value=src['end'],size=4,op="inc"),
STLVmWriteFlowVar(fv_name="src",pkt_offset= "IP.src"),
# dst
- STLVmFlowVar(name="dst",min_val=dst['start'],max_val=dst['end'],size=4,op="inc"),
+ STLVmFlowVar(name="dst",min_value=dst['start'],max_value=dst['end'],size=4,op="inc"),
STLVmWriteFlowVar(fv_name="dst",pkt_offset= "IP.dst"),
# checksum
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
diff --git a/scripts/stl/profiles/imix.py b/scripts/stl/profiles/imix.py
index dcd6f734..834ab6b3 100644
--- a/scripts/stl/profiles/imix.py
+++ b/scripts/stl/profiles/imix.py
@@ -51,11 +51,11 @@ class STLImix(object):
vm =[
# src
- STLVmFlowVar(name="src",min_val=src['start'],max_val=src['end'],size=4,op="inc"),
+ STLVmFlowVar(name="src",min_value=src['start'],max_value=src['end'],size=4,op="inc"),
STLVmWriteFlowVar(fv_name="src",pkt_offset= "IP.src"),
# dst
- STLVmFlowVar(name="dst",min_val=dst['start'],max_val=dst['end'],size=4,op="inc"),
+ STLVmFlowVar(name="dst",min_value=dst['start'],max_value=dst['end'],size=4,op="inc"),
STLVmWriteFlowVar(fv_name="dst",pkt_offset= "IP.dst"),
# checksum