fix random_limit max value
authorHanoh Haim <[email protected]>
Tue, 13 Sep 2016 12:26:27 +0000 (15:26 +0300)
committerHanoh Haim <[email protected]>
Tue, 13 Sep 2016 16:37:29 +0000 (19:37 +0300)
scripts/automation/regression/functional_tests/stl_basic_tests.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py
scripts/exp/udp_1pkt_repeat_random.pcap
scripts/stl/udp_1pkt_repeat_random.py

index 5af1e4d..df37703 100644 (file)
@@ -273,12 +273,9 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
              ["udp_1pkt_range_clients_split_garp.py","-m 1 -l 50",True],
              ["udp_1pkt_src_ip_split.py","-m 1 -l 50 --cores 2",True],
              ["udp_1pkt_repeat_random.py","-m 1 -l 50",True],
-
-
           ];
 
-
-        p  = [ ["udp_1pkt_repeat_random.py","-m 1 -l 50",True] ]
+        p = [ ["udp_1pkt_repeat_random.py","-m 1 -l 50",True] ];
 
 
         for obj in p:
index 5f3a007..079a8d3 100755 (executable)
@@ -751,9 +751,9 @@ class STLVmFlowVarRepetableRandom(CTRexVmDescBase):
         self.min_value  = convert_val (min_value);
 
         if max_value == None :
-            max_value = get_max_by_size()
-
-        self.max_value  = get_max_by_size (self.size)
+            self.max_value = get_max_by_size (self.size) 
+        else:
+            self.max_value = convert_val (max_value)
 
         if self.min_value > self.max_value :
             raise CTRexPacketBuildException(-11,("max %d is lower than min %d ") % (self.max_value,self.min_value)  );
index 33c5a08..61d5c52 100644 (file)
Binary files a/scripts/exp/udp_1pkt_repeat_random.pcap and b/scripts/exp/udp_1pkt_repeat_random.pcap differ
index 8149f26..cdbf976 100644 (file)
@@ -26,7 +26,7 @@ class STLS1(object):
                                                            min_value="48.0.0.1",
                                                            max_value="48.0.0.255", 
                                                            size=4, 
-                                                           limit=5, seed=0x1234),
+                                                           limit=5, seed=0x1235),
 
                              STLVmWrFlowVar (fv_name="ip_src", pkt_offset= "IP.src" ), # write ip to packet IP.src
                              STLVmWrFlowVar (fv_name="ip_dst", pkt_offset= "IP.dst" ), # write ip to packet IP.dst