From 4ae35508f6b448162aa4707264895b4dc42dd0de Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Wed, 24 Feb 2016 16:08:33 +0200 Subject: [PATCH] add seed per stream --- .../unit_tests/functional_tests/stl_basic_tests.py | 6 +++--- .../stl/trex_stl_lib/trex_stl_streams.py | 5 +++++ scripts/exp/syn_attack.pcap | Bin 3824 -> 3824 bytes scripts/exp/udp_rand_len_9k.pcap | Bin 230576 -> 204608 bytes scripts/stl/syn_attack.py | 1 + scripts/stl/udp_rand_len_9k.py | 1 + src/gtest/trex_stateless_gtest.cpp | 12 ++++++------ src/rpc-server/commands/trex_rpc_cmd_stream.cpp | 2 +- src/stateless/cp/trex_stream.h | 2 ++ src/stateless/cp/trex_stream_vm.h | 14 +++++++++++--- src/stateless/dp/trex_stateless_dp_core.cpp | 15 +++++++++++++++ src/stateless/dp/trex_stream_node.h | 9 +++++++++ 12 files changed, 54 insertions(+), 13 deletions(-) diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py index eb8bf1a6..22a63ddd 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py +++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py @@ -141,12 +141,12 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): p = [ ["udp_1pkt_1mac_override.py","-m 1 -l 50",True], - ["syn_attack.py","-m 1 -l 50",False], # can't compare random now + ["syn_attack.py","-m 1 -l 50",True], # can't compare random now ["udp_1pkt_1mac.py","-m 1 -l 50",True], ["udp_1pkt_mac.py","-m 1 -l 50",True], ["udp_1pkt.py","-m 1 -l 50",True], ["udp_1pkt_tuple_gen.py","-m 1 -l 50",True], - ["udp_rand_len_9k.py","-m 1 -l 50",False], # can't do the compare + ["udp_rand_len_9k.py","-m 1 -l 50",True], # can't do the compare ["udp_1pkt_mpls.py","-m 1 -l 50",True], ["udp_1pkt_mpls_vm.py","-m 1 ",True], ["imix.py","-m 1 -l 100",True], @@ -190,7 +190,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): ]; - p1 = [ ["udp_1pkt_range_clients_split_garp.py","-m 1 -l 10 ",True] ] + p1 = [ ["udp_rand_len_9k.py","-m 1 -l 50",True] ] for obj in p: diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py index 127d1669..fdd330a5 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_streams.py @@ -152,6 +152,7 @@ class STLStream(object): next = None, stream_id = None, action_count = 0, + random_seed =0, mac_src_override_by_pkt=None, mac_dst_override_mode=None #see STLStreamDstMAC_xx ): @@ -163,6 +164,7 @@ class STLStream(object): validate_type('self_start', self_start, bool) validate_type('isg', isg, (int, float)) validate_type('stream_id', stream_id, (NoneType, int)) + validate_type('random_seed',random_seed,int); if (type(mode) == STLTXCont) and (next != None): raise STLError("continuous stream cannot have a next stream ID") @@ -207,6 +209,9 @@ class STLStream(object): self.fields['self_start'] = self_start self.fields['isg'] = isg + if random_seed !=0 : + self.fields['random_seed'] = random_seed # optional + # mode self.fields['mode'] = mode.to_json() self.mode_desc = str(mode) diff --git a/scripts/exp/syn_attack.pcap b/scripts/exp/syn_attack.pcap index d1aa5f6f41552eba7b7d87431dc7609b0aab6555..aa420d2c3d1cb582044b50fa36f16b8fb615b2d9 100644 GIT binary patch literal 3824 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 GP~iWvlE%LP literal 230576 zcmeI*Ux-~t9S88a+1;CF({6UR*}c2j-E4O^Ns~0OX_KbL`e4CQ>5J785Q;?zRPv%k zlwwhk(rQ4IU?Es5VxWH%glcHPzLeTZ3#E$I`XZ>HB2w&ARf6hg2r`-1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C722kMazwr9k z=HGXXRj+}r|9x5m-9KHffv*3BHP8XPSe!Be0t5)OSzsh@dwPB{gjn^EKY2P0`8yAl zL;mCs4Eb$tb;nMC009C72oNAZfB*pk1PBmluRu5FSwCumtyp!QHS)cbXWjIPGS3?M zx;(4BZSKek5NNkRv)kazWA9uDvFd(%ZZY-Si?5db_S{DOcDvi%(Gws*fB*pk1PBly zK!5-N0t5&UAV7cs0RjXFoI~J>ymcz9kNArhx?kpG2Cck0v>>QYWivR%v z1PBlyK!5-N0t5&UAV6UC1UBU0>Yqy?#Hxdw1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAJr~(stKgRY>2(jw@7@c0)k8$Yraz93AXrT9FOlGv# zhC_%|qYeKup&h)oL>vC;K%))nJIr|#Xq~{-xrh7hR0y%^9&YNz)WdDxS@v*KPwC-W z*VGP}009C72oNAZfB*pk1PBlyK!5;&wI;AR2fW7?Lx@!eyo*Otz&m%m40snmF5q2j zSAz2)K!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB=Du5@?x)x)5U33-Igq zrUm#9K36WlubZ_1e^Kmf@yXNqQtC9{%1PBly zK!5-N0t5&UAV7cs0Rn4WpqB&DPc>m^tU3^#x+4dor^-Nd>YzY$jb9i}j{pGz1PBly zK!5-N0t5&UAV7csf%hyhlXKRSqannqbJo%0DQDexq|8}IzbI#Y&%}O^009C72oNAZ z;DQBa^DOnN&F7?I)w9&;&!<`Hwy%`4)akp;QZJa=69^C>K!5-N0t5&UAV7cs0RjXF z5FjwP0$XwzJ--q{tU8Qd8B1Yw?~i2|z5HKc^x$4I&YS=N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBly&{l!DyjSL)W-Cmrdaum*ooTPk?nleLGUFe%SEj8k?zjmM zAV7cs0RjXF5FkK+z@-+L&uPQyZV0jJw4wW0N*fN`UZxG*6VirD-7;RE009C7-d$iJ zk6=$UA2N+qk6>HAn?|r}?kY#HEe{&O-rd!o5+Fc;009C72oNAZfB*pk1PBlyK!5-N z0t5(Lh``poYSmpILach#s{3|Ywc7tyxoXw@n^mg|QTDS02oNC94uQoyD!$PCPpo=W zTzoo>igP!YqvGNZjf(APUq?xR009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0Rn9m zxF)aYe`zd)SoMnj*k{v<{+R0t5&UAV7cs0RjXrqrg(W3Ei|g zgjn@W=;ltk3ElBVc@ui|n{GlcW25=22@oJafB*pk1PBlyK!5-N0t5)Gj=*w`2fyEZ z|5dCy9_)TQ#e)YvUB-jm`^AH+liTtH_yWa7ocoV)9uMgYO zArT-zfB*pk1PBlyK!5-N0)ry3BPTk)?u8JmPIP+Dr;T_k*OeRbdOxudZ&0of=ShG7 z0RjXF5FkK+009C72oNAZfB*pk{U>m3PWNva4k1>Z?ho%x>Hfjz%5;BtR=VGRZRv;z zTtVy!hj+{F`Pm%MX{bl6bc}(QopY55BYIkncO$#B!s#|rTlUjA*jj~ne z-_)x8+^UX^009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7csfpZ94mzPI}yCKA?mq$nb zla@yh{JUHp9r=sp(Q{z>Edm4xv|M0M9upqf5JIeaOxWrEs%OTdo zO@I~a|3a*Xa)@>BJ3_2uLahF4OGiY2009C72oNAZfB*pk1PBmlslW|6qI!8bgjjV% zwft;~sAg^~BdX=cMN}m_self_start = parse_bool(section, "self_start", result); stream->m_flags = parse_int(section, "flags", result); stream->m_action_count = parse_uint16(section, "action_count", result); - + stream->m_random_seed = parse_uint32(section, "random_seed", result,0); /* default is zero */ /* inter stream gap */ stream->m_isg_usec = parse_double(section, "isg", result); diff --git a/src/stateless/cp/trex_stream.h b/src/stateless/cp/trex_stream.h index 36f9d407..161e9592 100644 --- a/src/stateless/cp/trex_stream.h +++ b/src/stateless/cp/trex_stream.h @@ -429,6 +429,7 @@ public: dp->m_ibg_usec = m_ibg_usec; dp->m_flags = m_flags; dp->m_action_count = m_action_count; + dp->m_random_seed = m_random_seed; dp->m_rate = m_rate; @@ -485,6 +486,7 @@ public: uint16_t m_flags; uint32_t m_stream_id; /* id from RPC can be anything */ uint16_t m_action_count; + uint32_t m_random_seed; /* config fields */ diff --git a/src/stateless/cp/trex_stream_vm.h b/src/stateless/cp/trex_stream_vm.h index c1db090d..4a0b1d59 100644 --- a/src/stateless/cp/trex_stream_vm.h +++ b/src/stateless/cp/trex_stream_vm.h @@ -1276,7 +1276,8 @@ public: uint16_t prog_size, uint16_t max_pkt_offset, uint16_t prefix_size, - bool a_is_pkt_size_var + bool a_is_pkt_size_var, + bool a_is_random_seed ){ if (bss) { @@ -1303,6 +1304,7 @@ public: m_max_pkt_offset_change = max_pkt_offset; m_prefix_size = prefix_size; m_is_pkt_size_var=a_is_pkt_size_var; + m_is_random_seed=a_is_random_seed; } ~StreamVmDp(){ @@ -1325,7 +1327,8 @@ public: m_program_size, m_max_pkt_offset_change, m_prefix_size, - m_is_pkt_size_var + m_is_pkt_size_var, + m_is_random_seed ); assert(lp); return (lp); @@ -1373,6 +1376,9 @@ public: bool is_pkt_size_var(){ return (m_is_pkt_size_var); } + bool is_random_seed(){ + return (m_is_random_seed); + } private: @@ -1383,6 +1389,7 @@ private: uint16_t m_max_pkt_offset_change; uint16_t m_prefix_size; bool m_is_pkt_size_var; + bool m_is_random_seed; }; @@ -1445,7 +1452,8 @@ public: get_dp_instruction_buffer()->get_program_size(), get_max_packet_update_offset(), get_prefix_size(), - is_var_pkt_size() + is_var_pkt_size(), + m_is_random_var ); assert(lp); return (lp); diff --git a/src/stateless/dp/trex_stateless_dp_core.cpp b/src/stateless/dp/trex_stateless_dp_core.cpp index 39080453..549f923f 100644 --- a/src/stateless/dp/trex_stateless_dp_core.cpp +++ b/src/stateless/dp/trex_stateless_dp_core.cpp @@ -75,6 +75,13 @@ void CGenNodeStateless::refresh_vm_bss(){ StreamVmDp * vm_s=m_ref_stream_info->m_vm_dp; assert(vm_s); memcpy(m_vm_flow_var,vm_s->get_bss(),vm_s->get_bss_size()); + + if ( vm_s->is_random_seed() ){ + /* if we have random seed for this program */ + if (m_ref_stream_info->m_random_seed) { + set_random_seed(m_ref_stream_info->m_random_seed); + } + } } } @@ -670,6 +677,14 @@ TrexStatelessDpCore::add_stream(TrexStatelessDpPerPort * lp_port, node->m_vm_program_size = lpDpVm->get_program_size(); + /* set the random seed if was set */ + if ( lpDpVm->is_random_seed() ){ + /* if we have random seed for this program */ + if (stream->m_random_seed) { + node->set_random_seed(stream->m_random_seed); + } + } + /* we need to copy the object */ if ( pkt_size > lpDpVm->get_prefix_size() ) { /* we need const packet */ diff --git a/src/stateless/dp/trex_stream_node.h b/src/stateless/dp/trex_stream_node.h index ab43defe..b366a770 100644 --- a/src/stateless/dp/trex_stream_node.h +++ b/src/stateless/dp/trex_stream_node.h @@ -116,6 +116,15 @@ private: public: + void set_random_seed(uint32_t seed){ + uint32_t *p=get_random_bss_seed_memory(); + *p=seed; + } + + uint32_t* get_random_bss_seed_memory(){ + return (uint32_t*)m_vm_flow_var;/* always the first 4 bytes */ + } + uint8_t get_port_id(){ return (m_port_id); } -- 2.16.6