From 9df89870d053a01a8b65afc1484db6185309ddd8 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Tue, 13 Sep 2016 15:26:27 +0300
Subject: [PATCH] fix random_limit max value

---
 .../regression/functional_tests/stl_basic_tests.py    |   5 +----
 .../stl/trex_stl_lib/trex_stl_packet_builder_scapy.py |   6 +++---
 scripts/exp/udp_1pkt_repeat_random.pcap               | Bin 3824 -> 3824 bytes
 scripts/stl/udp_1pkt_repeat_random.py                 |   2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/automation/regression/functional_tests/stl_basic_tests.py b/scripts/automation/regression/functional_tests/stl_basic_tests.py
index 5af1e4de..df377037 100644
--- a/scripts/automation/regression/functional_tests/stl_basic_tests.py
+++ b/scripts/automation/regression/functional_tests/stl_basic_tests.py
@@ -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:
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 5f3a0078..079a8d3c 100755
--- 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
@@ -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)  );
diff --git a/scripts/exp/udp_1pkt_repeat_random.pcap b/scripts/exp/udp_1pkt_repeat_random.pcap
index 33c5a0858a563f59521eba42c6b4426fbd23ee26..61d5c52f49727ff0a4145adc500862eac603044c 100644
GIT binary patch
literal 3824
zcma*pKWh_l9LMor(lkw*v`Lz#P18T=|Nl)}H$liPU0m8h1QCiLf)q*@5pBT=>R^X<
zsDlnF>fr8E@CkJ2BXMzY@a@q|lFxm<a2&_|?#1uk+;CSve|$-YOlZ$#PY9{@1?OAW
zM=73KJh`wPLi69Us2nx=cwjSx&zV#xg!;+hv;U^;C0YkqX{_DOR{DBxiPkHuF07lK
ztuEL4hLyppb++0C6ZiEUs~fA*+3I%pRmaL=iS}97dW_YBCED|8#FO}rFR*f0qJ7S_
zK4JA@iT1s&^%biROSET2Jc;jEWn~^qw9mWNL#zUpXkT!x=UDw%qJ6(>eZU&P672_E
z>mybXOSCV#Rtc+wCEAx<YY(f8CEAx=>j~B%mS{idTJNwbSfYK!wccY5VTtxbu9e5C
zVu|)u*Sd!_j3wF+yVfDr2$pC+;#%ieH7wD-=2{n6qgbN-sB2}h>R6(E-L>vujbVxQ
zW3IK2HI60PkGs|>)&!PlKjB(uSd&<y{iJK9uo_sReZ#eOu%@s?`zhCYgf)#N+E2UI
z8>|^D(SF9Y-eS#SiT1Om)%t@qhb7w2nO1ZgYaUCqpLeYXSPNL9{eo+~#9G7>?H66^
zHP#ZAXuo7yt>0M7Sfc&1X+_&uD_Elaifi4+TE!CWS6%BEYYj`ZUvsS!taU8We%-WM
wzp$EEqJ7h}q6ljPOSIo`t-Dy8SfV|5<4OFFeu}llYSDhnwT`fEV2SpB0Xnvm>i_@%

literal 3824
zcma*qJ!n%=7{>9_ByDfoq)pPKIZ4xx^dtRFTSpNrqJx7jE?v4v!J&g&uUqGiZjPr2
zB8VV`azI28MUVqhP|(H2#l^)%5J7wzno089=Y`AV!nr@r`E!^1>CN#`%4AGuPWz4N
z={(?m>HNyK$F?Uj*NkbME!!%%JA-&(@4@cNOpnQ$+QHp>|4qkBvZ@AF>dHwu>TadZ
z_m*UZQ&{P(((dQ(R$8>;Cala+di#ENt5Yy(U;ZPk-o2e0huy7SabNB>tUlhpPqgeG
zSpB>`K8^MyoiPMh5pN%fR@{I!z}pXqmj3{2khjN*_9UIr?O^2)Z$Bhj_7|)yZ=V&d
z@D5gvx6g@IT!%Hx+YgJDe-CSfw;vHLw+$=L+vi2g{)AQF?F*t6Uc)N#_C?W(E3ig+
z`%%&IZ()^q`;ut6Td>N!eOa{Z4_ITo{g`Nl7qBY4eMPk5A}q_>Tha2bU{!hhs%W{J
zuxh-0O|<NHSmV6?xM&3rtIpfkMJvw1n&9mxM9V*iHObpgik7<$Yl^p@5-s};)--QF
zEn49iR)e>1h*liIn&ItdM9ZJRn&s_hMax}<HOJe}iI)8eYo52C7p?FVR+G1HidLM4
zwZPjih?ai_Ymv8K6fJid))H^OBwF?htYzMQS+v4qSS!5!ifHZsg|*7tuZos`0&9)8
vUlT2N5mt-0Z;6&Y`|nui?bk&sJcPBu+i!^0{%=^Dy#1zV`A4uW@b>=z5>?@y

diff --git a/scripts/stl/udp_1pkt_repeat_random.py b/scripts/stl/udp_1pkt_repeat_random.py
index 8149f263..cdbf976f 100644
--- a/scripts/stl/udp_1pkt_repeat_random.py
+++ b/scripts/stl/udp_1pkt_repeat_random.py
@@ -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
-- 
2.16.6