updating out_port and out_group to 0xffffffff (any)

- we had a problem with flow deletion, because the group
  was not present on the switch while deletion and
  error was returned and flow remained on the switch
- xml compare library opdated, because 0xffffffff is
  in operational represented as decimal, so be able to
  compare these two values

Change-Id: I3da7a403b2157f902f2c056ca3b88927d5e60ab6
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/test/csit/libraries/XmlComparator.py b/test/csit/libraries/XmlComparator.py
index 3dca1c1ba507c1c089229be0701cd59129b9dfb6..5685ca2f2019d81c8e21ec88c661ab2a34a6b09b 100644 (file)
--- a/test/csit/libraries/XmlComparator.py
+++ b/test/csit/libraries/XmlComparator.py
@@ -77,7 +77,7 @@ class XMLtoDictParserTools():
                 if key in ['ipv4-destination', 'ipv4-source', 'ipv6-destination', 'ipv6-source', 'ipv6-nd-target']:
                     nvalue = _allign_address(value)
                     m_dict[key] = nvalue
-                elif key in ['tunnel-mask','type','metadata-mask']:
+                elif key in ['tunnel-mask','type','metadata-mask','out_port','out_group']:
                     nvalue = _convert_numbers(value)
                     m_dict[key] = nvalue
                 else:

diff --git a/test/csit/variables/xmls/f111.xml b/test/csit/variables/xmls/f111.xml
index 34eea91edbc7e309a18f55df48642d35ae6906d2..4c9413caf04c0db8581735a48de39006ac93eea6 100644 (file)
--- a/test/csit/variables/xmls/f111.xml
+++ b/test/csit/variables/xmls/f111.xml
@@ -16,7 +16,7 @@
     <id>234</id>
     <cookie_mask>10</cookie_mask>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f215.xml b/test/csit/variables/xmls/f215.xml
index c03c3a398b784f918c0a14571e2a2814e39b3e73..099e02abf9968f1d8b81268bc6c4652703012583 100644 (file)
--- a/test/csit/variables/xmls/f215.xml
+++ b/test/csit/variables/xmls/f215.xml
@@ -18,9 +18,9 @@
     <table_id>2</table_id>
     <id>338</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>

diff --git a/test/csit/variables/xmls/f216.xml b/test/csit/variables/xmls/f216.xml
index 2ca734410fab74b3ac3ff68a0aa86346af3d9197..f21fc4e11f7980a866b87b899943e6be05f62b93 100644 (file)
--- a/test/csit/variables/xmls/f216.xml
+++ b/test/csit/variables/xmls/f216.xml
@@ -16,9 +16,9 @@
     <table_id>2</table_id>
     <id>339</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>

diff --git a/test/csit/variables/xmls/f217.xml b/test/csit/variables/xmls/f217.xml
index 3cfc3b772a56104a79a63e8a18753c4c5a4c8a31..a84bb2f7c5381f214fbd632709c288fde6103879 100644 (file)
--- a/test/csit/variables/xmls/f217.xml
+++ b/test/csit/variables/xmls/f217.xml
@@ -13,9 +13,9 @@
     <table_id>2</table_id>
     <id>340</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>

diff --git a/test/csit/variables/xmls/f218.xml b/test/csit/variables/xmls/f218.xml
index f7d0dd5baa20b4ea46cfb86880f1672128f04781..93a1ae70546791e1558baa85c7afa697c4bb13fb 100644 (file)
--- a/test/csit/variables/xmls/f218.xml
+++ b/test/csit/variables/xmls/f218.xml
@@ -12,9 +12,9 @@
     <table_id>2</table_id>
     <id>341</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <tunnel>
             <tunnel-mask>0xf7d120c</tunnel-mask>

diff --git a/test/csit/variables/xmls/f219.xml b/test/csit/variables/xmls/f219.xml
index 068865db7f9d00784e3c6780fa6a08c59d6ea05c..750599a1858f2006503925db3090d82bbf1a93d0 100644 (file)
--- a/test/csit/variables/xmls/f219.xml
+++ b/test/csit/variables/xmls/f219.xml
@@ -18,9 +18,9 @@
     <table_id>2</table_id>
     <id>342</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>

diff --git a/test/csit/variables/xmls/f220.xml b/test/csit/variables/xmls/f220.xml
index 59b0a664f9a7c209b33707bcb1c76d2c6c82cb1a..ebfd0a3e751cefc76e33d02606b6503408f89fc2 100644 (file)
--- a/test/csit/variables/xmls/f220.xml
+++ b/test/csit/variables/xmls/f220.xml
@@ -13,9 +13,9 @@
     <table_id>2</table_id>
     <id>343</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f221.xml b/test/csit/variables/xmls/f221.xml
index caf8e96b6ecb2455328225719b703ab6b4ba4ce9..5131b6c84edfba2ac15585281bf71863d6880090 100644 (file)
--- a/test/csit/variables/xmls/f221.xml
+++ b/test/csit/variables/xmls/f221.xml
@@ -27,9 +27,9 @@
     <table_id>2</table_id>
     <id>344</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>

diff --git a/test/csit/variables/xmls/f29.xml b/test/csit/variables/xmls/f29.xml
index 5f30c9e0cceaa4fb54f3efa4c65d941eabbf666c..2dc105ed4d09f781ac59011660ee2cba21c41c38 100644 (file)
--- a/test/csit/variables/xmls/f29.xml
+++ b/test/csit/variables/xmls/f29.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>152</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f31.xml b/test/csit/variables/xmls/f31.xml
index 0af0f8bff29b78fbbe58e9c8649377387b08b062..a025f53117526f3c656b0f06cecf4d2d1fbad797 100644 (file)
--- a/test/csit/variables/xmls/f31.xml
+++ b/test/csit/variables/xmls/f31.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>154</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f32.xml b/test/csit/variables/xmls/f32.xml
index 4ab4519e2aa87cb0e320ddd4d7e9915917c6b750..2547abbf7f6bfa834480b6eb7c95a53090d3648c 100644 (file)
--- a/test/csit/variables/xmls/f32.xml
+++ b/test/csit/variables/xmls/f32.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>155</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f33.xml b/test/csit/variables/xmls/f33.xml
index 94240850b0f06edb25fb266053dde182c032ef01..c3f8b405ceee76cb6de1d341f0a52e179390ac4e 100644 (file)
--- a/test/csit/variables/xmls/f33.xml
+++ b/test/csit/variables/xmls/f33.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>156</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f34.xml b/test/csit/variables/xmls/f34.xml
index d3ad498eb9362369b47a31e6edb405a5d2af0636..f81c4cf9d2a073e1a66b60053eacf6248172fd61 100644 (file)
--- a/test/csit/variables/xmls/f34.xml
+++ b/test/csit/variables/xmls/f34.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>157</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f35.xml b/test/csit/variables/xmls/f35.xml
index d918f755f14e1353a238461a099513b5103a14b7..7a550e0ea576abe3b7c028c43fc309f1c20ae731 100644 (file)
--- a/test/csit/variables/xmls/f35.xml
+++ b/test/csit/variables/xmls/f35.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>158</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f37.xml b/test/csit/variables/xmls/f37.xml
index b128a1cddee26f1d872767f9176fde38c69d5fdd..0b3ecba3916e63cb3c4f758dabac44edc2138420 100644 (file)
--- a/test/csit/variables/xmls/f37.xml
+++ b/test/csit/variables/xmls/f37.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>160</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f38.xml b/test/csit/variables/xmls/f38.xml
index ddf5813db920bf223a5e522b7d865d178633f44c..4ed7cd027dc17fb5e431cb3dc7d028e5df443152 100644 (file)
--- a/test/csit/variables/xmls/f38.xml
+++ b/test/csit/variables/xmls/f38.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>161</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f39.xml b/test/csit/variables/xmls/f39.xml
index 4a68a9eb03d07cd5334660aff16b23e7d4b4d404..81142d36e538a338653d89cae259dea35ce7aa12 100644 (file)
--- a/test/csit/variables/xmls/f39.xml
+++ b/test/csit/variables/xmls/f39.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>162</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f40.xml b/test/csit/variables/xmls/f40.xml
index 15f724438e288eeac94920a022e2dd6253199d40..0fb886078e5ce842a32efaf432644690fc31e48a 100644 (file)
--- a/test/csit/variables/xmls/f40.xml
+++ b/test/csit/variables/xmls/f40.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>163</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f41.xml b/test/csit/variables/xmls/f41.xml
index 2be638603eadb477ed8c1588df532caa0cbee8f9..1640a97aa23cf734cd53754e2e801f61fa72e110 100644 (file)
--- a/test/csit/variables/xmls/f41.xml
+++ b/test/csit/variables/xmls/f41.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>164</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f42.xml b/test/csit/variables/xmls/f42.xml
index 80de6495a8a0644bd5cbc7f737f64367e292535a..d22d3944b60861d2b0fdb7c01a4f2334eeee08e4 100644 (file)
--- a/test/csit/variables/xmls/f42.xml
+++ b/test/csit/variables/xmls/f42.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>165</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f43.xml b/test/csit/variables/xmls/f43.xml
index cd6bb29981d94222677ae0b958f56fe928f8fe58..0f2be4c7e58577042c3bd4e62ea3c5ab9cec3c19 100644 (file)
--- a/test/csit/variables/xmls/f43.xml
+++ b/test/csit/variables/xmls/f43.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>166</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f44.xml b/test/csit/variables/xmls/f44.xml
index 2bf6630fa89576124654fc1874b2c2cad9c8ef20..b0c0d556d30a93d483e481a89544606e980d2e53 100644 (file)
--- a/test/csit/variables/xmls/f44.xml
+++ b/test/csit/variables/xmls/f44.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>167</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <in-port>202</in-port>
         <in-phy-port>10122</in-phy-port>

diff --git a/test/csit/variables/xmls/f45.xml b/test/csit/variables/xmls/f45.xml
index d0a252cfc1951208e30e9c3464a8ea9cd8b4a97a..1acaca792bdbc5494e31e769f40d35c6d2118250 100644 (file)
--- a/test/csit/variables/xmls/f45.xml
+++ b/test/csit/variables/xmls/f45.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>168</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <metadata>
             <metadata-mask>0x46645a66</metadata-mask>

diff --git a/test/csit/variables/xmls/f46.xml b/test/csit/variables/xmls/f46.xml
index aa4b089ecda2a788b913f2f0ed3e10e8d893d4b0..9e68bd7f9cbdb42030752953dd3ecaa8004f8e9b 100644 (file)
--- a/test/csit/variables/xmls/f46.xml
+++ b/test/csit/variables/xmls/f46.xml
@@ -15,9 +15,9 @@
     <table_id>2</table_id>
     <id>169</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f47.xml b/test/csit/variables/xmls/f47.xml
index ffaafcac2f1bfd8f5f6f3f03f28ccf2e9469c8c8..7c384f6777a5916c5d45141fc65d9a3dc8455af2 100644 (file)
--- a/test/csit/variables/xmls/f47.xml
+++ b/test/csit/variables/xmls/f47.xml
@@ -17,9 +17,9 @@
     <table_id>2</table_id>
     <id>170</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <ethernet-match>
             <ethernet-type>

diff --git a/test/csit/variables/xmls/f48.xml b/test/csit/variables/xmls/f48.xml
index 3051b1e8a283ccc1aae3c586924b1da819ef19cc..993a1f8571d275b19f275a4c7dcf2843a7e1f5c8 100644 (file)
--- a/test/csit/variables/xmls/f48.xml
+++ b/test/csit/variables/xmls/f48.xml
@@ -12,9 +12,9 @@
     <table_id>2</table_id>
     <id>171</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <tunnel>
             <tunnel-mask>0xf7d120c</tunnel-mask>

diff --git a/test/csit/variables/xmls/f49.xml b/test/csit/variables/xmls/f49.xml
index 35947972335a83c59b198eba41c223a277549238..b54a3c591f3c508994da80f6580c83453d3f448d 100644 (file)
--- a/test/csit/variables/xmls/f49.xml
+++ b/test/csit/variables/xmls/f49.xml
@@ -13,9 +13,9 @@
     <table_id>2</table_id>
     <id>172</id>
     <cookie_mask>10</cookie_mask>
-    <out_port>10</out_port>
+    <out_port>0xffffffff</out_port>
     <installHw>false</installHw>
-    <out_group>2</out_group>
+    <out_group>0xffffffff</out_group>
     <match>
         <vlan-match>
             <vlan-id>