From 38defe118db360190121c44a9b65c1477f54afa3 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Thu, 18 Feb 2016 16:49:09 +0200
Subject: [PATCH] fix mpls example to use write_mask instruction

---
 .../unit_tests/functional_tests/stl_basic_tests.py    |   4 ++--
 scripts/exp/udp_1pkt_mpls_vm.pcap                     | Bin 8624 -> 8624 bytes
 scripts/stl/udp_1pkt_mpls_vm.py                       |   2 +-
 3 files changed, 3 insertions(+), 3 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 9419ab62..cd12bff7 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
@@ -139,7 +139,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
 
     def test_stl_profiles (self):
 
-        p0 = [ 
+        p = [ 
             ["udp_1pkt_1mac_override.py","-m 1 -l 50",True],
             ["syn_attack.py","-m 1 -l 50",False],               # can't compare random now 
             ["udp_1pkt_1mac.py","-m 1 -l 50",True],
@@ -185,7 +185,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
           ];
 
 
-        p  = [ ["udp_1pkt_mac_mask3.py","-m 1 -l 20 ",True] ]
+        p1  = [ ["udp_1pkt_mpls_vm.py","-m 1 ",True] ]
         
 
         for obj in p:
diff --git a/scripts/exp/udp_1pkt_mpls_vm.pcap b/scripts/exp/udp_1pkt_mpls_vm.pcap
index f205b3341a14af50fdf9180101095f04e9acbc16..23fdc7fec03e056335f03a6efedc3bd0bda09e89 100644
GIT binary patch
literal 8624
zcmb8zNsg639LMqE@%lME?E!~YTW!U8Y{jviT2b41!g*GXz{Wir_ng3R16jJ{0w#C^
zj=%wwhy8X2e&1hGsZ;`={8K50s^9sK?>*Bu<NR7>j5QwA{jHTY)nvBGw`F6^{4vHE
z-ZW-mbotWs;?Jr2#)Z1|Ei*K8gX-&lGM3v^7puLMdfQYFtG1x}SRK!FTde_BCxlu<
ztPTV<!fL(1nzYS8jMdeGnqYN}pr%+|E2tS(*9mHl)uEskSY0ouB~~{GYK7IwZq>4}
zTE8uuv^)itgVkw4b+I}ls2)}wLG`h^QBVV{ZW7cGtD6Ni!s-@5jj=i_s0miL3Tleg
zZGxI%b-SSESe+Bp0;@X&wZ!U9L9MX5t6S~aSe+MC2dldU)y3)_LG`fe3aXFQy@DEG
zb)TSySlutE5mpZfYK+x`f|_9Ukf5emJuIjhR*wj3j@6@rT442<pq5xYE~ph&Pjsuc
zjn#Um-=yXL)poFYQczv2o)T0KtDd0xSUoMM0anilYKYadf*N7<oS?>7Juj#URxb!@
ziq%Cy&9Hh=P;;za64U~#mj$)N>J>q)uzIyy?b}#g5>yAP*96tY>UBZ&u<8q{kJTH3
z8ep|P2XE5yHSC929ciPqsS#F}|DmmFjMdwMnqc*gpr%;8E2tS(?+I#-)%${4VD*8Z
zmRNl#s1;Tpb*mFLRv!zhgViU3>SFb&pn6yh1l7mtGeHfo`dm;$tiBM`2&*pzHOA^I
zK~1pwT2NE0z7f<6t8WE0$Lc#lEwK7tP)n?S5Y!5*AG_6ojnz+r>R|P=pt@N7BB&l#
JLqYYi`WJ<uf9C)I

literal 8624
zcmb8zMQ$8H7>3~<kJ)1yGcz+YGc&WDL*xj#My`-;mbpL{xk(O?v?rcj)UV!8DwRs=
ze)OwU4OPE>eEXUaWCrQ{%n5>6dJy)TAFU*n>QugL1+nCxAQn$-1i|q8<;$hB-%G+9
zhr^Z`3lc$n_V3UCNm`CjGrXGdQE!AA_iCKgOs}SAI-=GruV!(r*<Q_NHOH&r0!t-g
z26DZc%W9ri^H|OIYCfw4UM*lX;nf7Ig<dUWwaBYQtQLE<nAH-mhHuMMBA$X$ua>f!
z^lFmTGOw1gTJF_yRx7+(!D^*fD_O1bY89*1Uae-e#;Y}~)_S#;)jF@%v0CrddR7~}
z+Q4d~R~uPv@@f;S&0cM0wZ*F~thRc!mDM({wz1mo)pk}pyxPHPr&l{!?ec0DtKDAh
zX0^wwJ*@V6wU^aCulBLp@6~=*2fRAK>Y!H#Ssn7~5Uayp4R`vfMEt*wcy)x;QLm1&
zI_A|eR>!?M&gz6$Cs>{I>LjaEUY%lf+N;y7&Ukf()mg93vO4G0IacSrI?w8YR~J}a
z^y(t3OI}@Kb=j-Stgd)<h1FHBuClu3)iqYvy}HiohF8OL@KhqchMQh}*WMGMZh3X<
z9~z}@dv%-D9k1@Ny6e?lR`<NR$LhXU_gOvg>H({VUOi;>$g4-J9((ne)f2CtuzKp%
zQ&!KsddBLxSI=3!@ahGtmtMVO^~$SPtX_Ndn$;Vx-mrS>)mv8Yyn4s#y;tv9eemi7
ktB+oNWcA6bPpm$B^_kTdufDMQ>eW|P-@N+9>L;)M1t831^8f$<

diff --git a/scripts/stl/udp_1pkt_mpls_vm.py b/scripts/stl/udp_1pkt_mpls_vm.py
index 262a662f..57cfb7ee 100644
--- a/scripts/stl/udp_1pkt_mpls_vm.py
+++ b/scripts/stl/udp_1pkt_mpls_vm.py
@@ -12,7 +12,7 @@ class STLS1(object):
         pkt =  Ether()/MPLS(label=17,cos=1,s=0,ttl=255)/MPLS(label=0,cos=1,s=1,ttl=12)/IP(src="16.0.0.1",dst="48.0.0.1")/UDP(dport=12,sport=1025)/('x'*20)
 
         vm = CTRexScRaw( [ STLVmFlowVar(name="mlabel", min_value=1, max_value=2000, size=2, op="inc"), # 2 bytes var
-                           STLVmWrFlowVar(fv_name="mlabel", pkt_offset= "MPLS:1.label")                # LABEL is 20 bits expected is val*8 as 3 LSB are off, 16,32,64 .. using new instruction it will be possible to write to any bits
+                           STLVmWrMaskFlowVar(fv_name="mlabel", pkt_offset= "MPLS:1.label",pkt_cast_size=4, mask=0xFFFFF000,shift=12) # write to 20bit MSB
                           ]
                        )
 
-- 
2.16.6