From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 23 Sep 2015 00:41:45 +0000 (-0700)
Subject: Fix flow templates so that they all have different cookie
X-Git-Tag: release/lithium-sr2~22
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=fad9738992da8c2b59b74e64d1b2b4628e81faf8

Fix flow templates so that they all have different cookie

If cookies are used to update flows, these have to be all different

This will fix some false failures in current openflow "more" suite

Change-Id: I4a03962cf66f316d64332afbf353ed1528070ee7
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
index 46965e166a..32d57a81b9 100644
--- a/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
+++ b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation     Test suite for the OpenDaylight base edition with of13, aimed for statistics manager
+Documentation     Test suite for the OpenDaylight OpenFlow statistics manager
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library           SSHLibrary
@@ -7,4 +7,4 @@ Resource           ../../../../libraries/Utils.robot
 
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13
\ No newline at end of file
+${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo tree,1 --switch ovsk,protocols=OpenFlow13
diff --git a/csit/variables/xmls/f110.xml b/csit/variables/xmls/f110.xml
index f71707a30d..421f980219 100644
--- a/csit/variables/xmls/f110.xml
+++ b/csit/variables/xmls/f110.xml
@@ -4,7 +4,7 @@
     <flow-name>push-vlan-action</flow-name>
     <id>233</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>201</cookie>
+    <cookie>110</cookie>
     <table_id>2</table_id>
     <priority>110</priority>
     <installHw>false</installHw>
@@ -37,4 +37,4 @@
         <tcp-source-port>183</tcp-source-port>
         <tcp-destination-port>8080</tcp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f111.xml b/csit/variables/xmls/f111.xml
index 4c9413caf0..5beb8d48ed 100644
--- a/csit/variables/xmls/f111.xml
+++ b/csit/variables/xmls/f111.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>234</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
     <match>
@@ -25,8 +25,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.1/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>111</cookie>
     <flow-name>pop-vlan-action</flow-name>
     <priority>111</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f112.xml b/csit/variables/xmls/f112.xml
index 410dbcb7aa..f6e675c0a8 100644
--- a/csit/variables/xmls/f112.xml
+++ b/csit/variables/xmls/f112.xml
@@ -4,7 +4,7 @@
     <flow-name>set-mpls-ttl-action</flow-name>
     <id>235</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>112</cookie>
     <table_id>2</table_id>
     <priority>112</priority>
     <installHw>false</installHw>
@@ -40,4 +40,4 @@
         <tcp-source-port>183</tcp-source-port>
         <tcp-destination-port>8080</tcp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f113.xml b/csit/variables/xmls/f113.xml
index 474200095f..64d61944a7 100644
--- a/csit/variables/xmls/f113.xml
+++ b/csit/variables/xmls/f113.xml
@@ -4,7 +4,7 @@
     <flow-name>push-mpls-action</flow-name>
     <id>236</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>401</cookie>
+    <cookie>113</cookie>
     <table_id>2</table_id>
     <priority>113</priority>
     <installHw>false</installHw>
@@ -44,4 +44,4 @@
         <udp-destination-port>8080</udp-destination-port>
         <in-port>0</in-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f114.xml b/csit/variables/xmls/f114.xml
index 30a1675bba..924707ae0d 100644
--- a/csit/variables/xmls/f114.xml
+++ b/csit/variables/xmls/f114.xml
@@ -4,7 +4,7 @@
     <flow-name>pop-mpls-action</flow-name>
     <id>237</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>889</cookie>
+    <cookie>114</cookie>
     <table_id>2</table_id>
     <priority>114</priority>
     <installHw>false</installHw>
@@ -44,4 +44,4 @@
         <udp-destination-port>8080</udp-destination-port>
         <in-port>0</in-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f156.xml b/csit/variables/xmls/f156.xml
index add5295451..619e64df37 100644
--- a/csit/variables/xmls/f156.xml
+++ b/csit/variables/xmls/f156.xml
@@ -35,7 +35,7 @@
             <vlan-pcp>3</vlan-pcp>
       </vlan-match>
     </match>
-    <cookie>15</cookie>
+    <cookie>156</cookie>
     <flow-name>FooXf156</flow-name>
     <priority>156</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f157.xml b/csit/variables/xmls/f157.xml
index 8025d9e6f5..895d7602fe 100644
--- a/csit/variables/xmls/f157.xml
+++ b/csit/variables/xmls/f157.xml
@@ -31,7 +31,7 @@
         <ipv4-destination>20.4.5.6/16</ipv4-destination>
         <in-port>0</in-port>
     </match>
-    <cookie>5</cookie>
+    <cookie>157</cookie>
     <flow-name>FooXf157</flow-name>
     <priority>157</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f158.xml b/csit/variables/xmls/f158.xml
index 7b225ff0a2..27dd13c3f2 100644
--- a/csit/variables/xmls/f158.xml
+++ b/csit/variables/xmls/f158.xml
@@ -41,7 +41,7 @@
         <ipv4-destination>10.0.0.4/32</ipv4-destination>
     </match>
     <cookie_mask>255</cookie_mask>
-    <cookie>401</cookie>
+    <cookie>158</cookie>
     <priority>158</priority>
     <installHw>false</installHw>
     <table_id>2</table_id>
diff --git a/csit/variables/xmls/f159.xml b/csit/variables/xmls/f159.xml
index b31332750a..5f20ceaa99 100644
--- a/csit/variables/xmls/f159.xml
+++ b/csit/variables/xmls/f159.xml
@@ -35,7 +35,7 @@
             <mpls-label>37</mpls-label>
         </protocol-match-fields>
     </match>
-    <cookie>889</cookie>
+    <cookie>159</cookie>
     <cookie_mask>255</cookie_mask>
     <installHw>false</installHw>
     <priority>159</priority>
diff --git a/csit/variables/xmls/f160.xml b/csit/variables/xmls/f160.xml
index c0f71de643..c083d64d46 100644
--- a/csit/variables/xmls/f160.xml
+++ b/csit/variables/xmls/f160.xml
@@ -37,7 +37,7 @@
         </protocol-match-fields>
     </match>
     <cookie_mask>255</cookie_mask>
-    <cookie>401</cookie>
+    <cookie>160</cookie>
     <priority>160</priority>
     <installHw>false</installHw>
     <table_id>2</table_id>
diff --git a/csit/variables/xmls/f201.xml b/csit/variables/xmls/f201.xml
index ad38fc18fa..6c38cd120a 100644
--- a/csit/variables/xmls/f201.xml
+++ b/csit/variables/xmls/f201.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-tcp-src</flow-name>
     <id>324</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>201</cookie>
     <table_id>2</table_id>
     <priority>201</priority>
     <installHw>false</installHw>
@@ -39,4 +39,4 @@
         <tcp-source-port>183</tcp-source-port>
         <tcp-destination-port>8080</tcp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f202.xml b/csit/variables/xmls/f202.xml
index 7ab2be7754..3bdf4abf43 100644
--- a/csit/variables/xmls/f202.xml
+++ b/csit/variables/xmls/f202.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-tcp-dst</flow-name>
     <id>325</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>202</cookie>
     <table_id>2</table_id>
     <priority>202</priority>
     <installHw>false</installHw>
@@ -39,4 +39,4 @@
         <tcp-source-port>183</tcp-source-port>
         <tcp-destination-port>8080</tcp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f203.xml b/csit/variables/xmls/f203.xml
index c143d2f850..26c30385b8 100644
--- a/csit/variables/xmls/f203.xml
+++ b/csit/variables/xmls/f203.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-udp-src</flow-name>
     <id>326</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>203</cookie>
     <table_id>2</table_id>
     <priority>203</priority>
     <installHw>false</installHw>
@@ -39,4 +39,4 @@
         <udp-source-port>183</udp-source-port>
         <udp-destination-port>8080</udp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f204.xml b/csit/variables/xmls/f204.xml
index 6204dbb166..9f0cad4495 100644
--- a/csit/variables/xmls/f204.xml
+++ b/csit/variables/xmls/f204.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-udp-dst</flow-name>
     <id>327</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>204</cookie>
     <table_id>2</table_id>
     <priority>204</priority>
     <installHw>false</installHw>
@@ -39,4 +39,4 @@
         <udp-source-port>183</udp-source-port>
         <udp-destination-port>8080</udp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f205.xml b/csit/variables/xmls/f205.xml
index fbc519ec60..22f491ca52 100644
--- a/csit/variables/xmls/f205.xml
+++ b/csit/variables/xmls/f205.xml
@@ -40,8 +40,8 @@
         <sctp-destination-port>384</sctp-destination-port>
         <in-port>0</in-port>
     </match>
-    <cookie>10</cookie>
+    <cookie>205</cookie>
     <flow-name>sctp-source-port-action</flow-name>
     <priority>205</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f206.xml b/csit/variables/xmls/f206.xml
index 25068e7dc3..82638bb121 100644
--- a/csit/variables/xmls/f206.xml
+++ b/csit/variables/xmls/f206.xml
@@ -40,8 +40,8 @@
         <sctp-destination-port>384</sctp-destination-port>
         <in-port>0</in-port>
     </match>
-    <cookie>10</cookie>
+    <cookie>206</cookie>
     <flow-name>sctp-destination-port</flow-name>
     <priority>206</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f207.xml b/csit/variables/xmls/f207.xml
index 4da1d73dc2..9a52ccff80 100644
--- a/csit/variables/xmls/f207.xml
+++ b/csit/variables/xmls/f207.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ipv6-source-addr</flow-name>
     <id>330</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>207</cookie>
     <table_id>2</table_id>
     <priority>207</priority>
     <installHw>false</installHw>
diff --git a/csit/variables/xmls/f208.xml b/csit/variables/xmls/f208.xml
index 95804e898c..a569017b25 100644
--- a/csit/variables/xmls/f208.xml
+++ b/csit/variables/xmls/f208.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ipv6-dest-addr</flow-name>
     <id>331</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>208</cookie>
     <table_id>2</table_id>
     <priority>208</priority>
     <installHw>false</installHw>
diff --git a/csit/variables/xmls/f209.xml b/csit/variables/xmls/f209.xml
index 05f5fba34b..49ea773e3f 100644
--- a/csit/variables/xmls/f209.xml
+++ b/csit/variables/xmls/f209.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-tunnel-id</flow-name>
     <id>332</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>209</cookie>
     <table_id>2</table_id>
     <priority>209</priority>
     <installHw>false</installHw>
@@ -42,4 +42,4 @@
         <tcp-source-port>183</tcp-source-port>
         <tcp-destination-port>8080</tcp-destination-port>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f210.xml b/csit/variables/xmls/f210.xml
index 390e1c38b0..f2194f4b84 100644
--- a/csit/variables/xmls/f210.xml
+++ b/csit/variables/xmls/f210.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ipv4-dst</flow-name>
     <id>333</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>210</cookie>
     <table_id>2</table_id>
     <priority>210</priority>
     <installHw>false</installHw>
diff --git a/csit/variables/xmls/f211.xml b/csit/variables/xmls/f211.xml
index 72372d5411..b3f89f2a61 100644
--- a/csit/variables/xmls/f211.xml
+++ b/csit/variables/xmls/f211.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ipv4-src</flow-name>
     <id>334</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>211</cookie>
     <table_id>2</table_id>
     <priority>211</priority>
     <installHw>false</installHw>
diff --git a/csit/variables/xmls/f212.xml b/csit/variables/xmls/f212.xml
index 4144719959..488fc56b1b 100644
--- a/csit/variables/xmls/f212.xml
+++ b/csit/variables/xmls/f212.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ip-protocol</flow-name>
     <id>335</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>212</cookie>
     <table_id>2</table_id>
     <priority>212</priority>
     <installHw>false</installHw>
@@ -37,4 +37,4 @@
 	    <ip-ecn>1</ip-ecn>
         </ip-match>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f213.xml b/csit/variables/xmls/f213.xml
index 968aedeb57..9e526d2e74 100644
--- a/csit/variables/xmls/f213.xml
+++ b/csit/variables/xmls/f213.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ip-dscp</flow-name>
     <id>336</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>213</cookie>
     <table_id>2</table_id>
     <priority>213</priority>
     <installHw>false</installHw>
@@ -37,4 +37,4 @@
 	    <ip-ecn>1</ip-ecn>
         </ip-match>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f214.xml b/csit/variables/xmls/f214.xml
index 25a524d1c4..1abc7c5082 100644
--- a/csit/variables/xmls/f214.xml
+++ b/csit/variables/xmls/f214.xml
@@ -4,7 +4,7 @@
     <flow-name>set-field-ip-ecn</flow-name>
     <id>337</id>
     <cookie_mask>255</cookie_mask>
-    <cookie>101</cookie>
+    <cookie>214</cookie>
     <table_id>2</table_id>
     <priority>214</priority>
     <installHw>false</installHw>
@@ -37,4 +37,4 @@
 	    <ip-ecn>1</ip-ecn>
         </ip-match>
     </match>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f215.xml b/csit/variables/xmls/f215.xml
index 099e02abf9..0273652088 100644
--- a/csit/variables/xmls/f215.xml
+++ b/csit/variables/xmls/f215.xml
@@ -17,7 +17,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>338</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -30,8 +30,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>215</cookie>
     <flow-name>flow-instruction-apply-actions-push-pbb</flow-name>
     <priority>215</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f216.xml b/csit/variables/xmls/f216.xml
index f21fc4e11f..785d093ffd 100644
--- a/csit/variables/xmls/f216.xml
+++ b/csit/variables/xmls/f216.xml
@@ -15,7 +15,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>339</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>216</cookie>
     <flow-name>flow-instruction-apply-actions-pop-pbb</flow-name>
     <priority>216</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f217.xml b/csit/variables/xmls/f217.xml
index a84bb2f7c5..7ba5f335b3 100644
--- a/csit/variables/xmls/f217.xml
+++ b/csit/variables/xmls/f217.xml
@@ -12,7 +12,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>340</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -25,8 +25,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-   <cookie>10</cookie>
+   <cookie>217</cookie>
     <flow-name>flow-instruction-meter-id</flow-name>
     <priority>217</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f218.xml b/csit/variables/xmls/f218.xml
index 93a1ae7054..53c4bfe569 100644
--- a/csit/variables/xmls/f218.xml
+++ b/csit/variables/xmls/f218.xml
@@ -11,7 +11,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>341</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -21,8 +21,8 @@
             <tunnel-id>10668</tunnel-id>
         </tunnel>
     </match>
-    <cookie>10</cookie>
+    <cookie>218</cookie>
     <flow-name>flow-instruction-go-to-table</flow-name>
     <priority>218</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f219.xml b/csit/variables/xmls/f219.xml
index 750599a185..0ed2c4c94c 100644
--- a/csit/variables/xmls/f219.xml
+++ b/csit/variables/xmls/f219.xml
@@ -17,7 +17,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>342</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -30,8 +30,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>219</cookie>
     <flow-name>flow-instruction-clear-actions</flow-name>
     <priority>219</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f220.xml b/csit/variables/xmls/f220.xml
index ebfd0a3e75..f7824a0355 100644
--- a/csit/variables/xmls/f220.xml
+++ b/csit/variables/xmls/f220.xml
@@ -12,7 +12,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>343</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -24,8 +24,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.1/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>220</cookie>
     <flow-name>flow-instruction-write-metadata</flow-name>
     <priority>220</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f221.xml b/csit/variables/xmls/f221.xml
index 5131b6c84e..e736ef320e 100644
--- a/csit/variables/xmls/f221.xml
+++ b/csit/variables/xmls/f221.xml
@@ -26,7 +26,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>344</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -39,8 +39,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>221</cookie>
     <flow-name>flow-instruction-write-actions</flow-name>
     <priority>221</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f29.xml b/csit/variables/xmls/f29.xml
index 2dc105ed4d..b57995bfdc 100644
--- a/csit/variables/xmls/f29.xml
+++ b/csit/variables/xmls/f29.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>152</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -26,8 +26,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>29</cookie>
     <flow-name>FooXf29</flow-name>
     <priority>29</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f30.xml b/csit/variables/xmls/f30.xml
index 4370497b55..1a5dc41f17 100644
--- a/csit/variables/xmls/f30.xml
+++ b/csit/variables/xmls/f30.xml
@@ -30,4 +30,4 @@
     <flow-name>FooXf30</flow-name>
     <priority>30</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f31.xml b/csit/variables/xmls/f31.xml
index a025f53117..cc4f6d7d53 100644
--- a/csit/variables/xmls/f31.xml
+++ b/csit/variables/xmls/f31.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>154</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -26,8 +26,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>31</cookie>
     <flow-name>FooXf31</flow-name>
     <priority>31</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f32.xml b/csit/variables/xmls/f32.xml
index 2547abbf7f..264de0318f 100644
--- a/csit/variables/xmls/f32.xml
+++ b/csit/variables/xmls/f32.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>155</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>32</cookie>
     <flow-name>FooXf32</flow-name>
     <priority>32</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f33.xml b/csit/variables/xmls/f33.xml
index c3f8b405ce..51811709f6 100644
--- a/csit/variables/xmls/f33.xml
+++ b/csit/variables/xmls/f33.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>156</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>33</cookie>
     <flow-name>FooXf33</flow-name>
     <priority>33</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f34.xml b/csit/variables/xmls/f34.xml
index b7dc39eaac..718d7c038d 100644
--- a/csit/variables/xmls/f34.xml
+++ b/csit/variables/xmls/f34.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>157</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,7 +28,7 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>34</cookie>
     <flow-name>FooXf34</flow-name>
     <priority>34</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f35.xml b/csit/variables/xmls/f35.xml
index b603f4a332..865e83d4ff 100644
--- a/csit/variables/xmls/f35.xml
+++ b/csit/variables/xmls/f35.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>158</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,7 +28,7 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>35</cookie>
     <flow-name>FooXf35</flow-name>
     <priority>35</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f37.xml b/csit/variables/xmls/f37.xml
index 0b3ecba391..607765c5ba 100644
--- a/csit/variables/xmls/f37.xml
+++ b/csit/variables/xmls/f37.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>160</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>37</cookie>
     <flow-name>FooXf37</flow-name>
     <priority>37</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f38.xml b/csit/variables/xmls/f38.xml
index 4ed7cd027d..8c45c10ebb 100644
--- a/csit/variables/xmls/f38.xml
+++ b/csit/variables/xmls/f38.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>161</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>38</cookie>
     <flow-name>FooXf38</flow-name>
     <priority>38</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f39.xml b/csit/variables/xmls/f39.xml
index 81142d36e5..c873fbb1ba 100644
--- a/csit/variables/xmls/f39.xml
+++ b/csit/variables/xmls/f39.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>162</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>39</cookie>
     <flow-name>FooXf39</flow-name>
     <priority>39</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f40.xml b/csit/variables/xmls/f40.xml
index 0fb886078e..cd82cacc03 100644
--- a/csit/variables/xmls/f40.xml
+++ b/csit/variables/xmls/f40.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>163</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>40</cookie>
     <flow-name>FooXf40</flow-name>
     <priority>40</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f41.xml b/csit/variables/xmls/f41.xml
index 1640a97aa2..6098c98305 100644
--- a/csit/variables/xmls/f41.xml
+++ b/csit/variables/xmls/f41.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>164</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -28,8 +28,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>41</cookie>
     <flow-name>FooXf41</flow-name>
     <priority>41</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f42.xml b/csit/variables/xmls/f42.xml
index d22d3944b6..25663fabf1 100644
--- a/csit/variables/xmls/f42.xml
+++ b/csit/variables/xmls/f42.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>165</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -26,8 +26,8 @@
         </ethernet-match>
         <ipv4-destination>10.0.0.0/24</ipv4-destination>
     </match>
-    <cookie>10</cookie>
+    <cookie>42</cookie>
     <flow-name>FooXf42</flow-name>
     <priority>42</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f43.xml b/csit/variables/xmls/f43.xml
index 0f2be4c7e5..262c208dbd 100644
--- a/csit/variables/xmls/f43.xml
+++ b/csit/variables/xmls/f43.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>166</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -32,8 +32,8 @@
             <ip-protocol>58</ip-protocol>
         </ip-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>43</cookie>
     <flow-name>FooXf43</flow-name>
     <priority>43</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f44.xml b/csit/variables/xmls/f44.xml
index b0c0d556d3..30fcc54aa4 100644
--- a/csit/variables/xmls/f44.xml
+++ b/csit/variables/xmls/f44.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>167</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -22,8 +22,8 @@
         <in-port>202</in-port>
         <in-phy-port>10122</in-phy-port>
     </match>
-    <cookie>10</cookie>
+    <cookie>44</cookie>
     <flow-name>FooXf44</flow-name>
     <priority>44</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f45.xml b/csit/variables/xmls/f45.xml
index 1acaca792b..c34e023583 100644
--- a/csit/variables/xmls/f45.xml
+++ b/csit/variables/xmls/f45.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>168</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -24,7 +24,7 @@
             <metadata>500</metadata>
         </metadata>
     </match>
-    <cookie>10</cookie>
+    <cookie>45</cookie>
     <flow-name>FooXf45</flow-name>
     <priority>45</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f46.xml b/csit/variables/xmls/f46.xml
index 9e68bd7f9c..8fcccd3eb7 100644
--- a/csit/variables/xmls/f46.xml
+++ b/csit/variables/xmls/f46.xml
@@ -14,7 +14,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>169</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -34,8 +34,8 @@
             <icmpv6-code>0</icmpv6-code>
         </icmpv6-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>46</cookie>
     <flow-name>FooXf46</flow-name>
     <priority>46</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f47.xml b/csit/variables/xmls/f47.xml
index 7c384f6777..e00afc15d5 100644
--- a/csit/variables/xmls/f47.xml
+++ b/csit/variables/xmls/f47.xml
@@ -16,7 +16,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>170</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -32,8 +32,8 @@
             <ip-protocol>132</ip-protocol>
         </ip-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>47</cookie>
     <flow-name>FooXf47</flow-name>
     <priority>47</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f48.xml b/csit/variables/xmls/f48.xml
index 993a1f8571..fe39924294 100644
--- a/csit/variables/xmls/f48.xml
+++ b/csit/variables/xmls/f48.xml
@@ -11,7 +11,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>171</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -21,7 +21,7 @@
             <tunnel-id>10668</tunnel-id>
         </tunnel>
     </match>
-    <cookie>10</cookie>
+    <cookie>48</cookie>
     <flow-name>FooXf48</flow-name>
     <priority>48</priority>
     <barrier>false</barrier>
diff --git a/csit/variables/xmls/f49.xml b/csit/variables/xmls/f49.xml
index b54a3c591f..607af86893 100644
--- a/csit/variables/xmls/f49.xml
+++ b/csit/variables/xmls/f49.xml
@@ -12,7 +12,7 @@
     </instructions>
     <table_id>2</table_id>
     <id>172</id>
-    <cookie_mask>10</cookie_mask>
+    <cookie_mask>255</cookie_mask>
     <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
     <out_group>0xffffffff</out_group>
@@ -25,8 +25,8 @@
             <vlan-pcp>3</vlan-pcp>
         </vlan-match>
     </match>
-    <cookie>10</cookie>
+    <cookie>49</cookie>
     <flow-name>FooXf49</flow-name>
     <priority>49</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>
diff --git a/csit/variables/xmls/f6.xml b/csit/variables/xmls/f6.xml
index 554fca57e8..d5c0efbea1 100644
--- a/csit/variables/xmls/f6.xml
+++ b/csit/variables/xmls/f6.xml
@@ -30,8 +30,8 @@
         <ipv4-source>10.1.2.0/24</ipv4-source>
         <ipv4-destination>40.4.0.0/16</ipv4-destination>
     </match>
-    <cookie>5</cookie>
+    <cookie>6</cookie>
     <flow-name>FooXf5</flow-name>
     <priority>6</priority>
     <barrier>false</barrier>
-</flow>
\ No newline at end of file
+</flow>