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 46965e166a3c34344dee99534edfbbb64aeafb56..32d57a81b9f25ae295ea51d06349b68802325d04 100644 (file)
--- 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 f71707a30dbaad8ebfd2fe725bef1337429a91a4..421f980219abc83aac237bc75920237157f59646 100644 (file)
--- 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 4c9413caf04c0db8581735a48de39006ac93eea6..5beb8d48ed0ab2fcbbd717dcbadecfd585c79c6b 100644 (file)
--- 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 410dbcb7aa843527dea881334b2f59c553014f7c..f6e675c0a8ebe24d9fc25be5aa53ffa0787edcdf 100644 (file)
--- 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 474200095fd171da2b30859dd6fe3232487d9f06..64d61944a749ca176904dc12388c885936f35ae7 100644 (file)
--- 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 30a1675bba768848fb447537d16e132e655c1db5..924707ae0d0b48827c53588a616f85a588309b3f 100644 (file)
--- 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 add52954515f29233432c3163f989ca2d0fe5afe..619e64df37052e54c6150eeb2f4511f6556060a5 100644 (file)
--- 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 8025d9e6f5111c506e2275cf5728ea1e7d31cfd9..895d7602fe0ca83f8942a2a0372ed4d0be06efe4 100644 (file)
--- 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 7b225ff0a254ea1d5ce3d42e5d111521afb6b55f..27dd13c3f277d0b1f33af85df927f3fd9791c361 100644 (file)
--- 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 b31332750ad5cddc4418795cba3284696e4e9aa8..5f20ceaa9929d38a0bb450743b127575083d359a 100644 (file)
--- 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 c0f71de6431ad2a2166fbb9767c21867c24830e3..c083d64d46ec4778660ae34135bf11abc362cbc2 100644 (file)
--- 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 ad38fc18fa053b21076e520ae377f646e1ee744e..6c38cd120a367dabe29cdc61019594ae64790119 100644 (file)
--- 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 7ab2be7754b6d49faa980d7d0cb9e31a65b2ff4f..3bdf4abf43b34831d29e0c0ab1b113c55e3577f8 100644 (file)
--- 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 c143d2f850fe1e12732deb7935cdb1fc7efaab67..26c30385b891a2756eae006f9c7de7d6f53f1457 100644 (file)
--- 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 6204dbb166d98f8196641118b02226421581294e..9f0cad44957cba0efc2215ce5abd139614ca5fb8 100644 (file)
--- 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 fbc519ec6056d2b1910b5d43b2e6b3fadafa9424..22f491ca52201318bee401f0d1a207d95ad8000c 100644 (file)
--- 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 25068e7dc3be18a50d0df3f00fd8d1a1a8221029..82638bb121d5900f74e7f97ab66df6746317a6a8 100644 (file)
--- 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 4da1d73dc2deb4477b58f999bd55c8244c4bda57..9a52ccff8057f2a8312ea77a306feb71d91878b0 100644 (file)
--- 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 95804e898cc3dc91d258958c3eadd1e4fec6bcdb..a569017b25905d236f2b8bdd33d9073d5f4ee65a 100644 (file)
--- 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 05f5fba34b624d62ea699a594c30ec7bfec3a974..49ea773e3f6d0fdbc800ca08740565f7a6bf7f97 100644 (file)
--- 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 390e1c38b008574822d9d7a224f8015b804aee2f..f2194f4b846f359570676bec531ad70c6a10e319 100644 (file)
--- 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 72372d541136a8bd84f933d3ca586dc1eb34011e..b3f89f2a6109310f2fddca6e59ffd24b1192bb0c 100644 (file)
--- 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 4144719959519da2e24216050cee3a8a2f3be231..488fc56b1b9cd2347957091dfc7f8dfd8dced411 100644 (file)
--- 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 968aedeb572cffedb84342cadcfa8d5a81e8ba28..9e526d2e74a6223338bd16f2b9502e0babddd8b9 100644 (file)
--- 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 25a524d1c42b10725a1d8a3e7601ede5b2dfa4f6..1abc7c5082c3f063bbcd2910ae334e9cf566c2dd 100644 (file)
--- 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 099e02abf9968f1d8b81268bc6c4652703012583..0273652088bebf2a0004a2d0313741de54ce50fa 100644 (file)
--- 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 f21fc4e11f7980a866b87b899943e6be05f62b93..785d093ffd27333076990257251c98109207d2b2 100644 (file)
--- 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 a84bb2f7c5381f214fbd632709c288fde6103879..7ba5f335b31eb9b0ae2a81da09579f10e4afdc06 100644 (file)
--- 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 93a1ae70546791e1558baa85c7afa697c4bb13fb..53c4bfe569ca966dd1a04f957cc8cab1bd281806 100644 (file)
--- 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 750599a1858f2006503925db3090d82bbf1a93d0..0ed2c4c94cc2aad00bda7dfbaab99a4762facafb 100644 (file)
--- 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 ebfd0a3e751cefc76e33d02606b6503408f89fc2..f7824a0355b11c4cb1e43b9155e1230ce2aa45b0 100644 (file)
--- 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 5131b6c84edfba2ac15585281bf71863d6880090..e736ef320eb7e82b71ec811d746633d2991f8594 100644 (file)
--- 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 2dc105ed4d09f781ac59011660ee2cba21c41c38..b57995bfdcae0bf30b1404f0d8a5024efc6fcbda 100644 (file)
--- 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 4370497b55dbf0f9de0ff4bcadf83329e04d906f..1a5dc41f17e44977bdfe9c90aed7bbb220464f95 100644 (file)
--- 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 a025f53117526f3c656b0f06cecf4d2d1fbad797..cc4f6d7d53ae9dce854108787b9ddfa9e13e158f 100644 (file)
--- 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 2547abbf7f6bfa834480b6eb7c95a53090d3648c..264de0318f98759eddff4db152703772e6c3ff5d 100644 (file)
--- 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 c3f8b405ceee76cb6de1d341f0a52e179390ac4e..51811709f669132ef8eb9909523ab3fae7664fe0 100644 (file)
--- 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 b7dc39eaac86cac0949f403c91717130aed59c04..718d7c038da161ea81a8fcb517f735562ee123d0 100644 (file)
--- 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 b603f4a3327abf24b6ee0ef0b897a5f946859863..865e83d4ff32f35966156f171255f1c3735a2c1f 100644 (file)
--- 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 0b3ecba3916e63cb3c4f758dabac44edc2138420..607765c5ba25c27d8f6016f4e96a35e000c573c9 100644 (file)
--- 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 4ed7cd027dc17fb5e431cb3dc7d028e5df443152..8c45c10ebb0e90ca5e247fbc650b180caa1bf456 100644 (file)
--- 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 81142d36e538a338653d89cae259dea35ce7aa12..c873fbb1ba80c3e317b2e8787d780a7dfa7c64f1 100644 (file)
--- 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 0fb886078e5ce842a32efaf432644690fc31e48a..cd82cacc036827fd7e47a29988e964c2c971ad8a 100644 (file)
--- 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 1640a97aa23cf734cd53754e2e801f61fa72e110..6098c983055ae0e80eb573db0aa69c64b73f8e24 100644 (file)
--- 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 d22d3944b60861d2b0fdb7c01a4f2334eeee08e4..25663fabf1f7fd83241e1952b5fb3079693fa6d1 100644 (file)
--- 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 0f2be4c7e58577042c3bd4e62ea3c5ab9cec3c19..262c208dbd98fd898fe94c8f0e6e6e0acdecee14 100644 (file)
--- 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 b0c0d556d30a93d483e481a89544606e980d2e53..30fcc54aa49fd55cd12dc9cb5ae67fb094b9a129 100644 (file)
--- 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 1acaca792bdbc5494e31e769f40d35c6d2118250..c34e023583823cd26af10365a1cc8cb863db90e0 100644 (file)
--- 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 9e68bd7f9cbdb42030752953dd3ecaa8004f8e9b..8fcccd3eb785c660a7faaf73221634c87ab5ef12 100644 (file)
--- 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 7c384f6777a5916c5d45141fc65d9a3dc8455af2..e00afc15d5150865537ef4fdd863d4c78cd70655 100644 (file)
--- 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 993a1f8571d275b19f275a4c7dcf2843a7e1f5c8..fe39924294a1d23a63e8ffa52f072c655ad356c1 100644 (file)
--- 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 b54a3c591f3c508994da80f6580c83453d3f448d..607af868933ac3baea769a10922237de2a5531b9 100644 (file)
--- 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 554fca57e8b0e699774df5d371ca33df7a94cda7..d5c0efbea128752a26af34e3b20d4ded3c274af8 100644 (file)
--- 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>