From 6d6929406b3d6fde0fd2feb8b5aea65563d15f44 Mon Sep 17 00:00:00 2001
From: Christopher O'Shea <christopher.o.shea@ericsson.com>
Date: Thu, 8 May 2014 15:03:40 -0700
Subject: [PATCH] Adding XML files for OpenFlowplugin Test Edit Variables to
 add XML Accept context

Change-Id: I25da75e1214cc01d672b3575a0f173132329a5b5
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>
---
 test/csit/variables/Variables.py  |   8 +-
 test/csit/variables/xmls/f1.xml   |  34 +++++
 test/csit/variables/xmls/f10.xml  |  48 ++++++
 test/csit/variables/xmls/f101.xml |  47 ++++++
 test/csit/variables/xmls/f102.xml |  50 +++++++
 test/csit/variables/xmls/f103.xml |  50 +++++++
 test/csit/variables/xmls/f104.xml |  47 ++++++
 test/csit/variables/xmls/f105.xml |  47 ++++++
 test/csit/variables/xmls/f106.xml |  47 ++++++
 test/csit/variables/xmls/f107.xml |  51 +++++++
 test/csit/variables/xmls/f108.xml |  51 +++++++
 test/csit/variables/xmls/f109.xml |  51 +++++++
 test/csit/variables/xmls/f11.xml  |  49 ++++++
 test/csit/variables/xmls/f110.xml |  43 ++++++
 test/csit/variables/xmls/f111.xml |  35 +++++
 test/csit/variables/xmls/f112.xml |  46 ++++++
 test/csit/variables/xmls/f113.xml |  50 +++++++
 test/csit/variables/xmls/f114.xml |  50 +++++++
 test/csit/variables/xmls/f12.xml  |  43 ++++++
 test/csit/variables/xmls/f13.xml  |  46 ++++++
 test/csit/variables/xmls/f14.xml  |  52 +++++++
 test/csit/variables/xmls/f15.xml  |  45 ++++++
 test/csit/variables/xmls/f16.xml  |  44 ++++++
 test/csit/variables/xmls/f17.xml  |  42 ++++++
 test/csit/variables/xmls/f18.xml  |  34 +++++
 test/csit/variables/xmls/f19.xml  |  29 ++++
 test/csit/variables/xmls/f2.xml   |  34 +++++
 test/csit/variables/xmls/f20.xml  |  30 ++++
 test/csit/variables/xmls/f201.xml |  45 ++++++
 test/csit/variables/xmls/f202.xml |  45 ++++++
 test/csit/variables/xmls/f203.xml |  45 ++++++
 test/csit/variables/xmls/f204.xml |  45 ++++++
 test/csit/variables/xmls/f205.xml |  50 +++++++
 test/csit/variables/xmls/f206.xml |  50 +++++++
 test/csit/variables/xmls/f207.xml |  46 ++++++
 test/csit/variables/xmls/f208.xml |  46 ++++++
 test/csit/variables/xmls/f209.xml |  48 ++++++
 test/csit/variables/xmls/f21.xml  |  43 ++++++
 test/csit/variables/xmls/f210.xml |  39 +++++
 test/csit/variables/xmls/f211.xml |  39 +++++
 test/csit/variables/xmls/f212.xml |  42 ++++++
 test/csit/variables/xmls/f213.xml |  42 ++++++
 test/csit/variables/xmls/f214.xml |  42 ++++++
 test/csit/variables/xmls/f215.xml |  40 +++++
 test/csit/variables/xmls/f216.xml |  38 +++++
 test/csit/variables/xmls/f217.xml |  35 +++++
 test/csit/variables/xmls/f218.xml |  31 ++++
 test/csit/variables/xmls/f219.xml |  40 +++++
 test/csit/variables/xmls/f22.xml  |  44 ++++++
 test/csit/variables/xmls/f220.xml |  34 +++++
 test/csit/variables/xmls/f221.xml |  46 ++++++
 test/csit/variables/xmls/f23.xml  |  46 ++++++
 test/csit/variables/xmls/f24.xml  |  30 ++++
 test/csit/variables/xmls/f25.xml  |  48 ++++++
 test/csit/variables/xmls/f26.xml  |  46 ++++++
 test/csit/variables/xmls/f27.xml  |  50 +++++++
 test/csit/variables/xmls/f28.xml  |  43 ++++++
 test/csit/variables/xmls/f29.xml  |  36 +++++
 test/csit/variables/xmls/f3.xml   |  33 ++++
 test/csit/variables/xmls/f30.xml  |  36 +++++
 test/csit/variables/xmls/f31.xml  |  33 ++++
 test/csit/variables/xmls/f32.xml  |  38 +++++
 test/csit/variables/xmls/f33.xml  |  38 +++++
 test/csit/variables/xmls/f34.xml  |  38 +++++
 test/csit/variables/xmls/f35.xml  |  38 +++++
 test/csit/variables/xmls/f36.xml  |  36 +++++
 test/csit/variables/xmls/f37.xml  |  38 +++++
 test/csit/variables/xmls/f38.xml  |  38 +++++
 test/csit/variables/xmls/f39.xml  |  38 +++++
 test/csit/variables/xmls/f4.xml   |  39 +++++
 test/csit/variables/xmls/f40.xml  |  38 +++++
 test/csit/variables/xmls/f41.xml  |  38 +++++
 test/csit/variables/xmls/f42.xml  |  36 +++++
 test/csit/variables/xmls/f43.xml  |  42 ++++++
 test/csit/variables/xmls/f44.xml  |  32 ++++
 test/csit/variables/xmls/f45.xml  |  34 +++++
 test/csit/variables/xmls/f46.xml  |  44 ++++++
 test/csit/variables/xmls/f47.xml  |  42 ++++++
 test/csit/variables/xmls/f48.xml  |  31 ++++
 test/csit/variables/xmls/f49.xml  |  34 +++++
 test/csit/variables/xmls/f5.xml   |  41 +++++
 test/csit/variables/xmls/f6.xml   |  44 ++++++
 test/csit/variables/xmls/f7.xml   |  46 ++++++
 test/csit/variables/xmls/f8.xml   |  50 +++++++
 test/csit/variables/xmls/f9.xml   |  49 ++++++
 test/csit/variables/xmls/g1.xml   | 241 ++++++++++++++++++++++++++++++
 test/csit/variables/xmls/g2.xml   | 241 ++++++++++++++++++++++++++++++
 test/csit/variables/xmls/g3.xml   |  18 +++
 test/csit/variables/xmls/m1.xml   |  20 +++
 test/csit/variables/xmls/m2.xml   |  20 +++
 test/csit/variables/xmls/m3.xml   |  20 +++
 91 files changed, 4074 insertions(+), 7 deletions(-)
 create mode 100644 test/csit/variables/xmls/f1.xml
 create mode 100644 test/csit/variables/xmls/f10.xml
 create mode 100644 test/csit/variables/xmls/f101.xml
 create mode 100644 test/csit/variables/xmls/f102.xml
 create mode 100644 test/csit/variables/xmls/f103.xml
 create mode 100644 test/csit/variables/xmls/f104.xml
 create mode 100644 test/csit/variables/xmls/f105.xml
 create mode 100644 test/csit/variables/xmls/f106.xml
 create mode 100644 test/csit/variables/xmls/f107.xml
 create mode 100644 test/csit/variables/xmls/f108.xml
 create mode 100644 test/csit/variables/xmls/f109.xml
 create mode 100644 test/csit/variables/xmls/f11.xml
 create mode 100644 test/csit/variables/xmls/f110.xml
 create mode 100644 test/csit/variables/xmls/f111.xml
 create mode 100644 test/csit/variables/xmls/f112.xml
 create mode 100644 test/csit/variables/xmls/f113.xml
 create mode 100644 test/csit/variables/xmls/f114.xml
 create mode 100644 test/csit/variables/xmls/f12.xml
 create mode 100644 test/csit/variables/xmls/f13.xml
 create mode 100644 test/csit/variables/xmls/f14.xml
 create mode 100644 test/csit/variables/xmls/f15.xml
 create mode 100644 test/csit/variables/xmls/f16.xml
 create mode 100644 test/csit/variables/xmls/f17.xml
 create mode 100644 test/csit/variables/xmls/f18.xml
 create mode 100644 test/csit/variables/xmls/f19.xml
 create mode 100644 test/csit/variables/xmls/f2.xml
 create mode 100644 test/csit/variables/xmls/f20.xml
 create mode 100644 test/csit/variables/xmls/f201.xml
 create mode 100644 test/csit/variables/xmls/f202.xml
 create mode 100644 test/csit/variables/xmls/f203.xml
 create mode 100644 test/csit/variables/xmls/f204.xml
 create mode 100644 test/csit/variables/xmls/f205.xml
 create mode 100644 test/csit/variables/xmls/f206.xml
 create mode 100644 test/csit/variables/xmls/f207.xml
 create mode 100644 test/csit/variables/xmls/f208.xml
 create mode 100644 test/csit/variables/xmls/f209.xml
 create mode 100644 test/csit/variables/xmls/f21.xml
 create mode 100644 test/csit/variables/xmls/f210.xml
 create mode 100644 test/csit/variables/xmls/f211.xml
 create mode 100644 test/csit/variables/xmls/f212.xml
 create mode 100644 test/csit/variables/xmls/f213.xml
 create mode 100644 test/csit/variables/xmls/f214.xml
 create mode 100644 test/csit/variables/xmls/f215.xml
 create mode 100644 test/csit/variables/xmls/f216.xml
 create mode 100644 test/csit/variables/xmls/f217.xml
 create mode 100644 test/csit/variables/xmls/f218.xml
 create mode 100644 test/csit/variables/xmls/f219.xml
 create mode 100644 test/csit/variables/xmls/f22.xml
 create mode 100644 test/csit/variables/xmls/f220.xml
 create mode 100644 test/csit/variables/xmls/f221.xml
 create mode 100644 test/csit/variables/xmls/f23.xml
 create mode 100644 test/csit/variables/xmls/f24.xml
 create mode 100644 test/csit/variables/xmls/f25.xml
 create mode 100644 test/csit/variables/xmls/f26.xml
 create mode 100644 test/csit/variables/xmls/f27.xml
 create mode 100644 test/csit/variables/xmls/f28.xml
 create mode 100644 test/csit/variables/xmls/f29.xml
 create mode 100644 test/csit/variables/xmls/f3.xml
 create mode 100644 test/csit/variables/xmls/f30.xml
 create mode 100644 test/csit/variables/xmls/f31.xml
 create mode 100644 test/csit/variables/xmls/f32.xml
 create mode 100644 test/csit/variables/xmls/f33.xml
 create mode 100644 test/csit/variables/xmls/f34.xml
 create mode 100644 test/csit/variables/xmls/f35.xml
 create mode 100644 test/csit/variables/xmls/f36.xml
 create mode 100644 test/csit/variables/xmls/f37.xml
 create mode 100644 test/csit/variables/xmls/f38.xml
 create mode 100644 test/csit/variables/xmls/f39.xml
 create mode 100644 test/csit/variables/xmls/f4.xml
 create mode 100644 test/csit/variables/xmls/f40.xml
 create mode 100644 test/csit/variables/xmls/f41.xml
 create mode 100644 test/csit/variables/xmls/f42.xml
 create mode 100644 test/csit/variables/xmls/f43.xml
 create mode 100644 test/csit/variables/xmls/f44.xml
 create mode 100644 test/csit/variables/xmls/f45.xml
 create mode 100644 test/csit/variables/xmls/f46.xml
 create mode 100644 test/csit/variables/xmls/f47.xml
 create mode 100644 test/csit/variables/xmls/f48.xml
 create mode 100644 test/csit/variables/xmls/f49.xml
 create mode 100644 test/csit/variables/xmls/f5.xml
 create mode 100644 test/csit/variables/xmls/f6.xml
 create mode 100644 test/csit/variables/xmls/f7.xml
 create mode 100644 test/csit/variables/xmls/f8.xml
 create mode 100644 test/csit/variables/xmls/f9.xml
 create mode 100644 test/csit/variables/xmls/g1.xml
 create mode 100644 test/csit/variables/xmls/g2.xml
 create mode 100644 test/csit/variables/xmls/g3.xml
 create mode 100644 test/csit/variables/xmls/m1.xml
 create mode 100644 test/csit/variables/xmls/m2.xml
 create mode 100644 test/csit/variables/xmls/m3.xml

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index 1bb32a7e71..5289435c37 100644
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -15,6 +15,7 @@ PWD = 'admin'
 AUTH = [u'admin',u'admin']
 HEADERS={'Content-Type': 'application/json'}
 HEADERS_XML={'Content-Type': 'application/xml'}
+HEADERS_ACCEPT={'Accept': 'application/xml'}
 ODL_CONTROLLER_SESSION=None
 TOPO_TREE_LEVEL=2
 
@@ -28,7 +29,6 @@ VTNWEBAPI='/vtn-webapi'
 #controllers URL
 CTRLS_CREATE='controllers.json'
 CTRLS='controllers'
-SW='switches'
 
 #vtn URL
 VTNS_CREATE='vtns.json'
@@ -44,9 +44,3 @@ VBRIFS='interfaces'
 
 #portmap URL
 PORTMAP_CREATE='portmap.json'
-
-#vlanmap URL
-VLANMAP_CREATE='vlanmaps.json'
-
-#ports URL
-PORTS='ports/detail.json'
diff --git a/test/csit/variables/xmls/f1.xml b/test/csit/variables/xmls/f1.xml
new file mode 100644
index 0000000000..9779efbc70
--- /dev/null
+++ b/test/csit/variables/xmls/f1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>124</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.1.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>1</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf1</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f10.xml b/test/csit/variables/xmls/f10.xml
new file mode 100644
index 0000000000..5efd6c916d
--- /dev/null
+++ b/test/csit/variables/xmls/f10.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>133</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.0.0.0/8</ipv4-source>
+        <ipv4-destination>172.168.0.0/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>132</ip-protocol>
+            <ip-dscp>0</ip-dscp>
+            <ip-ecn>0</ip-ecn>
+        </ip-match>
+        <sctp-source-port>768</sctp-source-port>
+        <sctp-destination-port>384</sctp-destination-port>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>FooXf10</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f101.xml b/test/csit/variables/xmls/f101.xml
new file mode 100644
index 0000000000..4db119e0e7
--- /dev/null
+++ b/test/csit/variables/xmls/f101.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf101</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>TABLE</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f102.xml b/test/csit/variables/xmls/f102.xml
new file mode 100644
index 0000000000..68610ae4e9
--- /dev/null
+++ b/test/csit/variables/xmls/f102.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf102</flow-name>
+    <id>257</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>102</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>INPORT</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.1.2.3/8</ipv4-source>
+        <ipv4-destination>172.168.5.6/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>2</ip-dscp>
+            <ip-ecn>2</ip-ecn>
+        </ip-match>
+        <tcp-source-port>25364</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f103.xml b/test/csit/variables/xmls/f103.xml
new file mode 100644
index 0000000000..c692b736e9
--- /dev/null
+++ b/test/csit/variables/xmls/f103.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf103</flow-name>
+    <id>258</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>103</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>1</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.1.2.3/8</ipv4-source>
+        <ipv4-destination>172.168.5.6/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>2</ip-dscp>
+            <ip-ecn>2</ip-ecn>
+        </ip-match>
+        <tcp-source-port>25364</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f104.xml b/test/csit/variables/xmls/f104.xml
new file mode 100644
index 0000000000..9d8635774a
--- /dev/null
+++ b/test/csit/variables/xmls/f104.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf104</flow-name>
+    <id>259</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>104</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>LOCAL</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f105.xml b/test/csit/variables/xmls/f105.xml
new file mode 100644
index 0000000000..ef286a6e41
--- /dev/null
+++ b/test/csit/variables/xmls/f105.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf105</flow-name>
+    <id>260</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>105</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>NORMAL</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/84</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/90</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>45</ip-dscp>
+            <ip-ecn>2</ip-ecn>
+        </ip-match>
+        <tcp-source-port>20345</tcp-source-port>
+        <tcp-destination-port>80</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f106.xml b/test/csit/variables/xmls/f106.xml
new file mode 100644
index 0000000000..5cac20d850
--- /dev/null
+++ b/test/csit/variables/xmls/f106.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf106</flow-name>
+    <id>261</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>106</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>FLOOD</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/100</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/67</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>45</ip-dscp>
+            <ip-ecn>2</ip-ecn>
+        </ip-match>
+        <tcp-source-port>20345</tcp-source-port>
+        <tcp-destination-port>80</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f107.xml b/test/csit/variables/xmls/f107.xml
new file mode 100644
index 0000000000..2fecf76a19
--- /dev/null
+++ b/test/csit/variables/xmls/f107.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf107</flow-name>
+    <id>262</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>107</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>ALL</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.2.3/10</ipv4-source>
+        <ipv4-destination>172.168.5.6/18</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f108.xml b/test/csit/variables/xmls/f108.xml
new file mode 100644
index 0000000000..425f6ca939
--- /dev/null
+++ b/test/csit/variables/xmls/f108.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf108</flow-name>
+    <id>263</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>108</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>CONTROLLER</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.2.3/10</ipv4-source>
+        <ipv4-destination>172.168.5.6/18</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f109.xml b/test/csit/variables/xmls/f109.xml
new file mode 100644
index 0000000000..6424a515d2
--- /dev/null
+++ b/test/csit/variables/xmls/f109.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf109</flow-name>
+    <id>264</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>109</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>ANY</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.2.3/10</ipv4-source>
+        <ipv4-destination>172.168.5.6/18</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f11.xml b/test/csit/variables/xmls/f11.xml
new file mode 100644
index 0000000000..690a4a8f22
--- /dev/null
+++ b/test/csit/variables/xmls/f11.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>134</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.0.0.0/8</ipv4-source>
+        <ipv4-destination>172.168.0.0/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>1</ip-protocol>
+            <ip-dscp>27</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <icmpv4-match>
+            <icmpv4-type>6</icmpv4-type>
+            <icmpv4-code>3</icmpv4-code>
+        </icmpv4-match>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <cookie>11</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>FooXf11</flow-name>
+    <priority>2</priority>
+</flow>
+
diff --git a/test/csit/variables/xmls/f110.xml b/test/csit/variables/xmls/f110.xml
new file mode 100644
index 0000000000..7242ea73a0
--- /dev/null
+++ b/test/csit/variables/xmls/f110.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>push-vlan-action</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>201</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <push-vlan-action>
+                        <ethernet-type>33024</ethernet-type>
+                        <vlan-id>1234</vlan-id>
+                    </push-vlan-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f111.xml b/test/csit/variables/xmls/f111.xml
new file mode 100644
index 0000000000..fd226b53ee
--- /dev/null
+++ b/test/csit/variables/xmls/f111.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <pop-vlan-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>152</id>
+    <cookie_mask>10</cookie_mask>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.1/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>pop-vlan-action</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f112.xml b/test/csit/variables/xmls/f112.xml
new file mode 100644
index 0000000000..90b94bb4da
--- /dev/null
+++ b/test/csit/variables/xmls/f112.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-mpls-ttl-action</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+               <action>
+                    <order>0</order>
+                    <set-mpls-ttl-action>
+                        <mpls-ttl>1</mpls-ttl>
+                    </set-mpls-ttl-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f113.xml b/test/csit/variables/xmls/f113.xml
new file mode 100644
index 0000000000..f6b241141a
--- /dev/null
+++ b/test/csit/variables/xmls/f113.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>push-mpls-action</flow-name>
+    <id>263</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>401</cookie>
+    <table_id>2</table_id>
+    <priority>8</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <push-mpls-action>
+                        <ethernet-type>34888</ethernet-type>
+                    </push-mpls-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.2.3/10</ipv4-source>
+        <ipv4-destination>172.168.5.6/18</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f114.xml b/test/csit/variables/xmls/f114.xml
new file mode 100644
index 0000000000..1a902b5632
--- /dev/null
+++ b/test/csit/variables/xmls/f114.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>pop-mpls-action</flow-name>
+    <id>263</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>889</cookie>
+    <table_id>2</table_id>
+    <priority>8</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <pop-mpls-action>
+                        <ethernet-type>2048</ethernet-type>
+                    </pop-mpls-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.2.3/10</ipv4-source>
+        <ipv4-destination>172.168.5.6/18</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f12.xml b/test/csit/variables/xmls/f12.xml
new file mode 100644
index 0000000000..1eb7559d0f
--- /dev/null
+++ b/test/csit/variables/xmls/f12.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+                <action>
+                    <order>1</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>135</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2054</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:01:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <arp-op>1</arp-op>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>12</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf12</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f13.xml b/test/csit/variables/xmls/f13.xml
new file mode 100644
index 0000000000..e93b571366
--- /dev/null
+++ b/test/csit/variables/xmls/f13.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+                <action>
+                    <order>1</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>136</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2054</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:01:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <arp-op>1</arp-op>
+        <arp-source-transport-address>192.168.4.1</arp-source-transport-address>
+        <arp-target-transport-address>10.21.22.23</arp-target-transport-address>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>13</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf13</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
+
diff --git a/test/csit/variables/xmls/f14.xml b/test/csit/variables/xmls/f14.xml
new file mode 100644
index 0000000000..6c075ae7d9
--- /dev/null
+++ b/test/csit/variables/xmls/f14.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+                <action>
+                    <order>1</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>137</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2054</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:FF:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:FC:01:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <arp-op>1</arp-op>
+        <arp-source-transport-address>192.168.4.1</arp-source-transport-address>
+        <arp-target-transport-address>10.21.22.23</arp-target-transport-address>
+        <arp-source-hardware-address>
+            <address>12:34:56:78:98:AB</address>
+        </arp-source-hardware-address>
+        <arp-target-hardware-address>
+            <address>FE:DC:BA:98:76:54</address>
+        </arp-target-hardware-address>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>14</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf14</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
+
diff --git a/test/csit/variables/xmls/f15.xml b/test/csit/variables/xmls/f15.xml
new file mode 100644
index 0000000000..99d3eeddda
--- /dev/null
+++ b/test/csit/variables/xmls/f15.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>138</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>78</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+        </vlan-match>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>15</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>FooXf15</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
+
diff --git a/test/csit/variables/xmls/f16.xml b/test/csit/variables/xmls/f16.xml
new file mode 100644
index 0000000000..1c418052fa
--- /dev/null
+++ b/test/csit/variables/xmls/f16.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>FooXf16</flow-name>
+    <id>139</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>16</cookie>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <priority>2</priority>
+    <table_id>2</table_id>
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>78</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+</flow>
diff --git a/test/csit/variables/xmls/f17.xml b/test/csit/variables/xmls/f17.xml
new file mode 100644
index 0000000000..8fa2a46404
--- /dev/null
+++ b/test/csit/variables/xmls/f17.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>FooXf17</flow-name>
+    <id>140</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>17</cookie>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <priority>2</priority>
+    <table_id>2</table_id>
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34887</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <protocol-match-fields>
+            <mpls-label>567</mpls-label>
+            <mpls-tc>3</mpls-tc>
+            <mpls-bos>1</mpls-bos>
+        </protocol-match-fields>
+    </match>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+</flow>
diff --git a/test/csit/variables/xmls/f18.xml b/test/csit/variables/xmls/f18.xml
new file mode 100644
index 0000000000..dc2804bbc1
--- /dev/null
+++ b/test/csit/variables/xmls/f18.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf18</flow-name>
+    <id>141</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>18</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>fe80::2acf:e9ff:fe21:6431/128</ipv6-source>
+        <ipv6-destination>aabb:1234:2acf:e9ff::fe21:6431/64</ipv6-destination>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f19.xml b/test/csit/variables/xmls/f19.xml
new file mode 100644
index 0000000000..4e9261949b
--- /dev/null
+++ b/test/csit/variables/xmls/f19.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf19</flow-name>
+    <id>142</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>19</cookie>
+    <table_id>2</table_id>
+    <priority>1</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f2.xml b/test/csit/variables/xmls/f2.xml
new file mode 100644
index 0000000000..46c1885bec
--- /dev/null
+++ b/test/csit/variables/xmls/f2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <drop-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>125</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.0.0.1</ipv4-source>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>2</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf2</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f20.xml b/test/csit/variables/xmls/f20.xml
new file mode 100644
index 0000000000..75ceb28f36
--- /dev/null
+++ b/test/csit/variables/xmls/f20.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf20</flow-name>
+    <id>143</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>20</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <metadata>
+            <metadata>12345</metadata>
+            <metadata-mask>1234578</metadata-mask>
+        </metadata>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f201.xml b/test/csit/variables/xmls/f201.xml
new file mode 100644
index 0000000000..f1f7f46a2a
--- /dev/null
+++ b/test/csit/variables/xmls/f201.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-tcp-src</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <tcp-source-port>2059</tcp-source-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f202.xml b/test/csit/variables/xmls/f202.xml
new file mode 100644
index 0000000000..21abaa3480
--- /dev/null
+++ b/test/csit/variables/xmls/f202.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-tcp-dst</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <tcp-destination-port>1234</tcp-destination-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f203.xml b/test/csit/variables/xmls/f203.xml
new file mode 100644
index 0000000000..6779409a62
--- /dev/null
+++ b/test/csit/variables/xmls/f203.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-udp-src</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <udp-source-port>2059</udp-source-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>183</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f204.xml b/test/csit/variables/xmls/f204.xml
new file mode 100644
index 0000000000..0b2901ac26
--- /dev/null
+++ b/test/csit/variables/xmls/f204.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-udp-dst</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <udp-destination-port>1234</udp-destination-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>183</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f205.xml b/test/csit/variables/xmls/f205.xml
new file mode 100644
index 0000000000..7e8f2c28dd
--- /dev/null
+++ b/test/csit/variables/xmls/f205.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <sctp-source-port>1111</sctp-source-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>133</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.1.2.3/8</ipv4-source>
+        <ipv4-destination>172.168.5.6/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>132</ip-protocol>
+            <ip-dscp>0</ip-dscp>
+            <ip-ecn>0</ip-ecn>
+        </ip-match>
+        <sctp-source-port>768</sctp-source-port>
+        <sctp-destination-port>384</sctp-destination-port>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>sctp-source-port-action</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f206.xml b/test/csit/variables/xmls/f206.xml
new file mode 100644
index 0000000000..c05437476a
--- /dev/null
+++ b/test/csit/variables/xmls/f206.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <sctp-destination-port>1111</sctp-destination-port>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>133</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.1.2.3/8</ipv4-source>
+        <ipv4-destination>172.168.5.6/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>132</ip-protocol>
+            <ip-dscp>0</ip-dscp>
+            <ip-ecn>0</ip-ecn>
+        </ip-match>
+        <sctp-source-port>768</sctp-source-port>
+        <sctp-destination-port>384</sctp-destination-port>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>sctp-destination-port</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f207.xml b/test/csit/variables/xmls/f207.xml
new file mode 100644
index 0000000000..da1e2771f7
--- /dev/null
+++ b/test/csit/variables/xmls/f207.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ipv6-source-addr</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <ipv6-source>1004:5608:900c:d000:f00d::200f</ipv6-source>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f208.xml b/test/csit/variables/xmls/f208.xml
new file mode 100644
index 0000000000..c05acdc481
--- /dev/null
+++ b/test/csit/variables/xmls/f208.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ipv6-dest-addr</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <ipv6-destination>2160:2160:216::6431</ipv6-destination>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f209.xml b/test/csit/variables/xmls/f209.xml
new file mode 100644
index 0000000000..6465bcca02
--- /dev/null
+++ b/test/csit/variables/xmls/f209.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-tunnel-id</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <tunnel>
+                            <tunnel-id>2591</tunnel-id>
+                        </tunnel>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f21.xml b/test/csit/variables/xmls/f21.xml
new file mode 100644
index 0000000000..9357a8d4f3
--- /dev/null
+++ b/test/csit/variables/xmls/f21.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf21</flow-name>
+    <id>144</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>21</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80::2acf:e9ff:fe21:6431/128</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f210.xml b/test/csit/variables/xmls/f210.xml
new file mode 100644
index 0000000000..cdcebb0f54
--- /dev/null
+++ b/test/csit/variables/xmls/f210.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ipv4-dst</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+                        <ipv4-destination>10.2.3.4</ipv4-destination>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.1.2.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+		<ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-ecn>1</ip-ecn>
+        </ip-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f211.xml b/test/csit/variables/xmls/f211.xml
new file mode 100644
index 0000000000..7750e72d46
--- /dev/null
+++ b/test/csit/variables/xmls/f211.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ipv4-src</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+        		<ipv4-source>20.1.2.3</ipv4-source>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.1.2.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+		<ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-ecn>1</ip-ecn>
+        </ip-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f212.xml b/test/csit/variables/xmls/f212.xml
new file mode 100644
index 0000000000..95e1532ee2
--- /dev/null
+++ b/test/csit/variables/xmls/f212.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ip-protocol</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+		    <ip-match>
+        		<ip-protocol>6</ip-protocol>
+		    </ip-match>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.1.2.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+		<ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-dscp>60</ip-dscp> 
+	    <ip-ecn>1</ip-ecn>
+        </ip-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f213.xml b/test/csit/variables/xmls/f213.xml
new file mode 100644
index 0000000000..a632f3bd0c
--- /dev/null
+++ b/test/csit/variables/xmls/f213.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ip-dscp</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+		    <ip-match>
+        		<ip-dscp>8</ip-dscp>
+		    </ip-match>
+                    </set-field>
+                </actin>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.1.2.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+		<ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-dscp>60</ip-dscp> 
+	    <ip-ecn>1</ip-ecn>
+        </ip-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f214.xml b/test/csit/variables/xmls/f214.xml
new file mode 100644
index 0000000000..5b236a7198
--- /dev/null
+++ b/test/csit/variables/xmls/f214.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>set-field-ip-ecn</flow-name>
+    <id>256</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>101</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-field>
+		    <ip-match>
+        		<ip-ecn>2</ip-ecn>
+		    </ip-match>
+                    </set-field>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-source>10.1.2.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+		<ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-dscp>60</ip-dscp> 
+	    <ip-ecn>1</ip-ecn>
+        </ip-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f215.xml b/test/csit/variables/xmls/f215.xml
new file mode 100644
index 0000000000..fe8c1b88cc
--- /dev/null
+++ b/test/csit/variables/xmls/f215.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <push-pbb-action>
+                        <ethernet-type>35047</ethernet-type>
+                    </push-pbb-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>flow-instruction-apply-actions-push-pbb</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f216.xml b/test/csit/variables/xmls/f216.xml
new file mode 100644
index 0000000000..0133f503df
--- /dev/null
+++ b/test/csit/variables/xmls/f216.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <pop-pbb-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>flow-instruction-apply-actions-pop-pbb</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f217.xml b/test/csit/variables/xmls/f217.xml
new file mode 100644
index 0000000000..54270c2d80
--- /dev/null
+++ b/test/csit/variables/xmls/f217.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <meter>
+                <meter-id>1</meter-id>
+            </meter>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>flow-instruction-meter-id</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f218.xml b/test/csit/variables/xmls/f218.xml
new file mode 100644
index 0000000000..8779e6c643
--- /dev/null
+++ b/test/csit/variables/xmls/f218.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <go-to-table>
+                <table_id>3</table_id>
+            </go-to-table>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>171</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <tunnel>
+            <tunnel-mask>6B6f7d120c</tunnel-mask>
+            <tunnel-id>10668</tunnel-id>
+        </tunnel>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>flow-instruction-go-to-table</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f219.xml b/test/csit/variables/xmls/f219.xml
new file mode 100644
index 0000000000..01acbe3eba
--- /dev/null
+++ b/test/csit/variables/xmls/f219.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+        	<order>0</order>
+		<clear-actions>
+		<action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>INPORT</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+		</clear-actions>
+	</instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>flow-instruction-clear-actions</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f22.xml b/test/csit/variables/xmls/f22.xml
new file mode 100644
index 0000000000..1eb84586b8
--- /dev/null
+++ b/test/csit/variables/xmls/f22.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf22</flow-name>
+    <id>145</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>22</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f220.xml b/test/csit/variables/xmls/f220.xml
new file mode 100644
index 0000000000..ad82260d0d
--- /dev/null
+++ b/test/csit/variables/xmls/f220.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <write-metadata>
+                <metadata-mask>12</metadata-mask>
+                <metadata>10</metadata>
+            </write-metadata>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>150</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.1/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>flow-instruction-write-metadata</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f221.xml b/test/csit/variables/xmls/f221.xml
new file mode 100644
index 0000000000..0bed300e59
--- /dev/null
+++ b/test/csit/variables/xmls/f221.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+	    <write-actions>
+		<action>
+                    <order>0</order>
+		    <dec-mpls-ttl/>
+                </action>
+	    </write-actions>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <output-action>
+                        <output-node-connector>1</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                </action>
+            </apply-actions>
+	</instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>flow-instruction-write-actions</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f23.xml b/test/csit/variables/xmls/f23.xml
new file mode 100644
index 0000000000..0f4e119b34
--- /dev/null
+++ b/test/csit/variables/xmls/f23.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf23</flow-name>
+    <id>146</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>23</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ipv6-label>
+            <ipv6-flabel>33</ipv6-flabel>
+        </ipv6-label>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f24.xml b/test/csit/variables/xmls/f24.xml
new file mode 100644
index 0000000000..6818990c22
--- /dev/null
+++ b/test/csit/variables/xmls/f24.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf24</flow-name>
+    <id>147</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>24</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <tunnel>
+            <tunnel-id>2591</tunnel-id>
+        </tunnel>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f25.xml b/test/csit/variables/xmls/f25.xml
new file mode 100644
index 0000000000..a82539bc62
--- /dev/null
+++ b/test/csit/variables/xmls/f25.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf25</flow-name>
+    <id>148</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>25</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ipv6-label>
+            <ipv6-flabel>33</ipv6-flabel>
+        </ipv6-label>
+        <ip-match>
+            <ip-protocol>58</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <icmpv6-match>
+            <icmpv6-type>6</icmpv6-type>
+            <icmpv6-code>3</icmpv6-code>
+        </icmpv6-match>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f26.xml b/test/csit/variables/xmls/f26.xml
new file mode 100644
index 0000000000..d53ea53fc6
--- /dev/null
+++ b/test/csit/variables/xmls/f26.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf26</flow-name>
+    <id>149</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>26</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:0/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::0/94</ipv6-destination>
+        <ipv6-nd-target>fe80:3456:789A:fe21::6431</ipv6-nd-target>
+        <ipv6-nd-sll>12:34:56:78:9A:BC</ipv6-nd-sll>
+        <ipv6-nd-tll>FE:DC:BA:98:76:54</ipv6-nd-tll>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
diff --git a/test/csit/variables/xmls/f27.xml b/test/csit/variables/xmls/f27.xml
new file mode 100644
index 0000000000..134e1c97cb
--- /dev/null
+++ b/test/csit/variables/xmls/f27.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <flow-name>FooXf27</flow-name>
+    <id>150</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>27</cookie>
+    <table_id>2</table_id>
+    <priority>2</priority>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <installHw>false</installHw>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-source>1234:5678:9ABC:DEF0:FDCD:A987:6543:210F/76</ipv6-source>
+        <ipv6-destination>fe80:2acf:e9ff:fe21::6431/94</ipv6-destination>
+        <metadata>
+            <metadata>12345</metadata>
+        </metadata>
+        <ipv6-label>
+            <ipv6-flabel>33</ipv6-flabel>
+        </ipv6-label>
+        <ipv6-ext-header>
+            <ipv6-exthdr>0</ipv6-exthdr>
+        </ipv6-ext-header>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>60</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <tcp-source-port>183</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+    </match>
+</flow>
+
diff --git a/test/csit/variables/xmls/f28.xml b/test/csit/variables/xmls/f28.xml
new file mode 100644
index 0000000000..c0112ef49a
--- /dev/null
+++ b/test/csit/variables/xmls/f28.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>FooXf28</flow-name>
+    <id>151</id>
+    <cookie_mask>255</cookie_mask>
+    <cookie>28</cookie>
+    <hard-timeout>1200</hard-timeout>
+    <idle-timeout>3400</idle-timeout>
+    <priority>2</priority>
+    <table_id>2</table_id>
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34887</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <protocol-match-fields>
+            <pbb>
+                <pbb-isid>45</pbb-isid>
+            </pbb>
+        </protocol-match-fields>
+    </match>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+</flow>
+
diff --git a/test/csit/variables/xmls/f29.xml b/test/csit/variables/xmls/f29.xml
new file mode 100644
index 0000000000..c2bf729a92
--- /dev/null
+++ b/test/csit/variables/xmls/f29.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <pop-vlan-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>152</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf29</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f3.xml b/test/csit/variables/xmls/f3.xml
new file mode 100644
index 0000000000..07e4ebe591
--- /dev/null
+++ b/test/csit/variables/xmls/f3.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <drop-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>126</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-source>
+                <address>00:00:00:00:00:01</address>
+            </ethernet-source>
+        </ethernet-match>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>3</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf3</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f30.xml b/test/csit/variables/xmls/f30.xml
new file mode 100644
index 0000000000..8cd7e77618
--- /dev/null
+++ b/test/csit/variables/xmls/f30.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-dl-type-action>
+                        <dl-type>8</dl-type>
+                    </set-dl-type-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>153</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>30</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf30</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f31.xml b/test/csit/variables/xmls/f31.xml
new file mode 100644
index 0000000000..7b83e99a10
--- /dev/null
+++ b/test/csit/variables/xmls/f31.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action/>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>154</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf31</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f32.xml b/test/csit/variables/xmls/f32.xml
new file mode 100644
index 0000000000..bf05bd129e
--- /dev/null
+++ b/test/csit/variables/xmls/f32.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-mpls-ttl-action>
+                        <mpls-ttl>1</mpls-ttl>
+                    </set-mpls-ttl-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>155</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf32</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f33.xml b/test/csit/variables/xmls/f33.xml
new file mode 100644
index 0000000000..716e688884
--- /dev/null
+++ b/test/csit/variables/xmls/f33.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-next-hop-action>
+                        <ipv4-address>10.0.0.1/24</ipv4-address>
+                    </set-next-hop-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>156</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf33</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f34.xml b/test/csit/variables/xmls/f34.xml
new file mode 100644
index 0000000000..adc8a10d51
--- /dev/null
+++ b/test/csit/variables/xmls/f34.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-nw-dst-action>
+                        <ipv4-address>10.0.0.21/24</ipv4-address>
+                    </set-nw-dst-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>157</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf34</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f35.xml b/test/csit/variables/xmls/f35.xml
new file mode 100644
index 0000000000..1647b8272b
--- /dev/null
+++ b/test/csit/variables/xmls/f35.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-nw-src-action>
+                        <ipv4-address>10.0.23.21/24</ipv4-address>
+                    </set-nw-src-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>158</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf35</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f36.xml b/test/csit/variables/xmls/f36.xml
new file mode 100644
index 0000000000..04d2f86b72
--- /dev/null
+++ b/test/csit/variables/xmls/f36.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-nw-tos-action>
+                        <tos>1</tos>
+                    </set-nw-tos-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>159</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>36</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf36</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f37.xml b/test/csit/variables/xmls/f37.xml
new file mode 100644
index 0000000000..cd7e92cce3
--- /dev/null
+++ b/test/csit/variables/xmls/f37.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-nw-ttl-action>
+                        <nw-ttl>1</nw-ttl>
+                    </set-nw-ttl-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>160</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf37</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f38.xml b/test/csit/variables/xmls/f38.xml
new file mode 100644
index 0000000000..81f1306719
--- /dev/null
+++ b/test/csit/variables/xmls/f38.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-queue-action>
+                        <queue-id>1</queue-id>
+                    </set-queue-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>161</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf38</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f39.xml b/test/csit/variables/xmls/f39.xml
new file mode 100644
index 0000000000..55c8a762af
--- /dev/null
+++ b/test/csit/variables/xmls/f39.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-tp-dst-action>
+                        <port>109</port>
+                    </set-tp-dst-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>162</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf39</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f4.xml b/test/csit/variables/xmls/f4.xml
new file mode 100644
index 0000000000..0f08362ee3
--- /dev/null
+++ b/test/csit/variables/xmls/f4.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>127</id>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>45</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:00:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>4</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf4</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f40.xml b/test/csit/variables/xmls/f40.xml
new file mode 100644
index 0000000000..578df7b674
--- /dev/null
+++ b/test/csit/variables/xmls/f40.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-tp-src-action>
+                        <port>109</port>
+                    </set-tp-src-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>163</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf40</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f41.xml b/test/csit/variables/xmls/f41.xml
new file mode 100644
index 0000000000..82c4b51084
--- /dev/null
+++ b/test/csit/variables/xmls/f41.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <set-vlan-cfi-action>
+                        <vlan-cfi>2</vlan-cfi>
+                    </set-vlan-cfi-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>164</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf41</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f42.xml b/test/csit/variables/xmls/f42.xml
new file mode 100644
index 0000000000..fb5850b3ed
--- /dev/null
+++ b/test/csit/variables/xmls/f42.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <sw-path-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>165</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv4-destination>10.0.0.0/24</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf42</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f43.xml b/test/csit/variables/xmls/f43.xml
new file mode 100644
index 0000000000..b720bdcc79
--- /dev/null
+++ b/test/csit/variables/xmls/f43.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>166</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <icmpv6-match>
+            <icmpv6-type>135</icmpv6-type>
+            <icmpv6-code>1</icmpv6-code>
+        </icmpv6-match>
+        <ip-match>
+            <ip-protocol>58</ip-protocol>
+        </ip-match>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf43</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f44.xml b/test/csit/variables/xmls/f44.xml
new file mode 100644
index 0000000000..ed37acc8b5
--- /dev/null
+++ b/test/csit/variables/xmls/f44.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <drop-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>167</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <in-port>202</in-port>
+        <in-phy-port>10122</in-phy-port>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf44</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f45.xml b/test/csit/variables/xmls/f45.xml
new file mode 100644
index 0000000000..00d934e756
--- /dev/null
+++ b/test/csit/variables/xmls/f45.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <drop-action/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>168</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <metadata>
+            <metadata-mask>[B@46645a66</metadata-mask>
+            <metadata>500</metadata>
+        </metadata>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf45</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f46.xml b/test/csit/variables/xmls/f46.xml
new file mode 100644
index 0000000000..59d482c0f1
--- /dev/null
+++ b/test/csit/variables/xmls/f46.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>169</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34525</type>
+            </ethernet-type>
+        </ethernet-match>
+        <ipv6-label>
+            <ipv6-flabel>10028</ipv6-flabel>
+        </ipv6-label>
+        <ipv6-nd-tll>00:0c:29:0e:4c:67</ipv6-nd-tll>
+        <ipv6-nd-sll>c2:00:54:f5:00:00</ipv6-nd-sll>
+        <icmpv6-match>
+            <icmpv6-type>135</icmpv6-type>
+            <icmpv6-code>0</icmpv6-code>
+        </icmpv6-match>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf46</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f47.xml b/test/csit/variables/xmls/f47.xml
new file mode 100644
index 0000000000..ba6fa1384c
--- /dev/null
+++ b/test/csit/variables/xmls/f47.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <controller-action>
+                        <max-length>5</max-length>
+                    </controller-action>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>170</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <sctp-destination-port>22</sctp-destination-port>
+        <sctp-source-port>1435</sctp-source-port>
+        <ip-match>
+            <ip-protocol>132</ip-protocol>
+        </ip-match>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf47</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f48.xml b/test/csit/variables/xmls/f48.xml
new file mode 100644
index 0000000000..f20d5d791d
--- /dev/null
+++ b/test/csit/variables/xmls/f48.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+                    <order>0</order>
+            <go-to-table>
+                <table_id>2</table_id>
+            </go-to-table>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>171</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <tunnel>
+            <tunnel-mask>[B@f7d120c</tunnel-mask>
+            <tunnel-id>10668</tunnel-id>
+        </tunnel>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf48</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f49.xml b/test/csit/variables/xmls/f49.xml
new file mode 100644
index 0000000000..1f8c5d7c80
--- /dev/null
+++ b/test/csit/variables/xmls/f49.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <meter>
+                <meter-id>1</meter-id>
+            </meter>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>172</id>
+    <cookie_mask>10</cookie_mask>
+    <out_port>10</out_port>
+    <installHw>false</installHw>
+    <out_group>2</out_group>
+    <match>
+        <vlan-match>
+            <vlan-id>
+                <vlan-id>10</vlan-id>
+                <vlan-id-present>true</vlan-id-present>
+            </vlan-id>
+            <vlan-pcp>3</vlan-pcp>
+        </vlan-match>
+    </match>
+    <hard-timeout>0</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>10</cookie>
+    <idle-timeout>0</idle-timeout>
+    <flow-name>FooXf49</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f5.xml b/test/csit/variables/xmls/f5.xml
new file mode 100644
index 0000000000..4d318056e3
--- /dev/null
+++ b/test/csit/variables/xmls/f5.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>128</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:00:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>10.1.2.0/24</ipv4-source>
+        <ipv4-destination>20.4.0.0/16</ipv4-destination>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>5</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf5</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f6.xml b/test/csit/variables/xmls/f6.xml
new file mode 100644
index 0000000000..2ed289889a
--- /dev/null
+++ b/test/csit/variables/xmls/f6.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+                <action>
+                    <order>1</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>129</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:ff</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:01:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>10.1.2.0/24</ipv4-source>
+        <ipv4-destination>40.4.0.0/16</ipv4-destination>
+    </match>
+    <hard-timeout>12</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>5</cookie>
+    <idle-timeout>34</idle-timeout>
+    <flow-name>FooXf5</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f7.xml b/test/csit/variables/xmls/f7.xml
new file mode 100644
index 0000000000..d11ea8b227
--- /dev/null
+++ b/test/csit/variables/xmls/f7.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-nw-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>130</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:ff:ff:ff:aa</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>10.1.2.0/24</ipv4-source>
+        <ipv4-destination>20.4.0.0/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>56</ip-protocol>
+            <ip-dscp>15</ip-dscp>
+            <ip-ecn>1</ip-ecn>
+        </ip-match>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>12000</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>7</cookie>
+    <idle-timeout>12000</idle-timeout>
+    <flow-name>FooXf7</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
diff --git a/test/csit/variables/xmls/f8.xml b/test/csit/variables/xmls/f8.xml
new file mode 100644
index 0000000000..9f65dff72c
--- /dev/null
+++ b/test/csit/variables/xmls/f8.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>131</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>ff:ff:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>17.0.0.0/8</ipv4-source>
+        <ipv4-destination>172.168.0.0/16</ipv4-destination>
+        <ip-match>
+            <ip-protocol>6</ip-protocol>
+            <ip-dscp>2</ip-dscp>
+            <ip-ecn>2</ip-ecn>
+        </ip-match>
+        <tcp-source-port>25364</tcp-source-port>
+        <tcp-destination-port>8080</tcp-destination-port>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>8</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>FooXf8</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
+
+
diff --git a/test/csit/variables/xmls/f9.xml b/test/csit/variables/xmls/f9.xml
new file mode 100644
index 0000000000..24c9fee850
--- /dev/null
+++ b/test/csit/variables/xmls/f9.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow xmlns="urn:opendaylight:flow:inventory">
+    <strict>false</strict>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <order>0</order>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>132</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+            <ethernet-destination>
+                <address>20:14:29:01:19:61</address>
+            </ethernet-destination>
+            <ethernet-source>
+                <address>00:00:00:11:23:ae</address>
+            </ethernet-source>
+        </ethernet-match>
+        <ipv4-source>19.1.0.0/16</ipv4-source>
+        <ipv4-destination>172.168.5.0/24</ipv4-destination>
+        <ip-match>
+            <ip-protocol>17</ip-protocol>
+            <ip-dscp>8</ip-dscp>
+            <ip-ecn>3</ip-ecn>
+        </ip-match>
+        <udp-source-port>25364</udp-source-port>
+        <udp-destination-port>8080</udp-destination-port>
+        <in-port>0</in-port>
+    </match>
+    <hard-timeout>1200</hard-timeout>
+    <flags>FlowModFlags [_cHECKOVERLAP=false, _rESETCOUNTS=false, _nOPKTCOUNTS=false, _nOBYTCOUNTS=false, _sENDFLOWREM=false]</flags>
+    <cookie>9</cookie>
+    <idle-timeout>3400</idle-timeout>
+    <flow-name>FooXf9</flow-name>
+    <priority>2</priority>
+    <barrier>false</barrier>
+</flow>
+
diff --git a/test/csit/variables/xmls/g1.xml b/test/csit/variables/xmls/g1.xml
new file mode 100644
index 0000000000..5d4b7a79c4
--- /dev/null
+++ b/test/csit/variables/xmls/g1.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<group xmlns="urn:opendaylight:flow:inventory">
+    <group-type>group-all</group-type>
+    <buckets>
+        <bucket>
+            <action>
+                <pop-vlan-action/>
+                <order>0</order>
+            </action>
+            <bucket-id>12</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-field>
+                    <ipv4-source>100.1.1.1</ipv4-source>
+                </set-field>
+                <order>0</order>
+            </action>
+            <action>
+                <set-field>
+                    <ipv4-destination>200.71.9.5210</ipv4-destination>
+                </set-field>
+                <order>1</order>
+            </action>
+            <bucket-id>13</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-pbb-action>
+                    <ethernet-type>35047</ethernet-type>
+                </push-pbb-action>
+                  <order>0</order>
+            </action>
+            <bucket-id>14</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <pop-pbb-action/>
+                   <order>1</order>
+            </action>
+            <bucket-id>15</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-mpls-action>
+                    <ethernet-type>34887</ethernet-type>
+                </push-mpls-action>
+                    <order>0</order>
+            </action>
+            <bucket-id>16</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <pop-mpls-action>
+                    <ethernet-type>11</ethernet-type>
+                </pop-mpls-action>
+                   <order>0</order>
+            </action>
+            <bucket-id>17</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-vlan-action>
+                    <ethernet-type>33024</ethernet-type>
+                </push-vlan-action>
+                    <order>0</order>
+            </action>
+            <bucket-id>18</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>ALL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>19</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <dec-mpls-ttl/>
+                 <order>0</order>
+            </action>
+            <bucket-id>20</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-mpls-ttl-action>
+                    <mpls-ttl>1</mpls-ttl>
+                </set-mpls-ttl-action>
+                <order>0</order>    
+            </action>
+            <bucket-id>21</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-nw-ttl-action>
+                    <nw-ttl>1</nw-ttl>
+                </set-nw-ttl-action>
+                 <order>0</order>
+            </action>
+            <bucket-id>22</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <dec-nw-ttl/>
+                 <order>0</order>
+            </action>
+            <bucket-id>23</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>INPORT</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>24</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>FLOOD</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>25</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>NORMAL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>26</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>LOCAL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>27</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>TABLE</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>28</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <copy-ttl-in/>
+		 <order>0</order>
+            </action>
+            <bucket-id>29</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <copy-ttl-out/>
+                <order>0</order>  
+            </action>
+            <bucket-id>30</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-queue-action>
+                    <queue-id>1</queue-id>
+                </set-queue-action>
+               <order>0</order>
+            </action>
+            <bucket-id>31</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>56</max-length>
+                    <output-node-connector>CONTROLLER</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>31</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+    </buckets>
+    <barrier>false</barrier>
+    <group-name>Foo</group-name>
+    <group-id>140</group-id>
+</group>
diff --git a/test/csit/variables/xmls/g2.xml b/test/csit/variables/xmls/g2.xml
new file mode 100644
index 0000000000..79529becff
--- /dev/null
+++ b/test/csit/variables/xmls/g2.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<group xmlns="urn:opendaylight:flow:inventory">
+    <group-type>group-ff</group-type>
+    <buckets>
+        <bucket>
+            <action>
+                <pop-vlan-action/>
+                <order>0</order>
+            </action>
+            <bucket-id>12</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-field>
+                    <ipv4-source>100.1.1.1</ipv4-source>
+                </set-field>
+                <order>0</order>
+            </action>
+            <action>
+                <set-field>
+                    <ipv4-destination>200.71.9.5210</ipv4-destination>
+                </set-field>
+                <order>1</order>
+            </action>
+            <bucket-id>13</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-pbb-action>
+                    <ethernet-type>35047</ethernet-type>
+                </push-pbb-action>
+                  <order>0</order>
+            </action>
+            <bucket-id>14</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <pop-pbb-action/>
+                   <order>1</order>
+            </action>
+            <bucket-id>15</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-mpls-action>
+                    <ethernet-type>34887</ethernet-type>
+                </push-mpls-action>
+                    <order>0</order>
+            </action>
+            <bucket-id>16</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <pop-mpls-action>
+                    <ethernet-type>11</ethernet-type>
+                </pop-mpls-action>
+                   <order>0</order>
+            </action>
+            <bucket-id>17</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <push-vlan-action>
+                    <ethernet-type>33024</ethernet-type>
+                </push-vlan-action>
+                    <order>0</order>
+            </action>
+            <bucket-id>18</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>ALL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>19</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <dec-mpls-ttl/>
+                 <order>0</order>
+            </action>
+            <bucket-id>20</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-mpls-ttl-action>
+                    <mpls-ttl>1</mpls-ttl>
+                </set-mpls-ttl-action>
+                <order>0</order>    
+            </action>
+            <bucket-id>21</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-nw-ttl-action>
+                    <nw-ttl>1</nw-ttl>
+                </set-nw-ttl-action>
+                 <order>0</order>
+            </action>
+            <bucket-id>22</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <dec-nw-ttl/>
+                 <order>0</order>
+            </action>
+            <bucket-id>23</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>INPORT</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>24</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>FLOOD</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>25</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>NORMAL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>26</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>LOCAL</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>27</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>30</max-length>
+                    <output-node-connector>TABLE</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>28</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <copy-ttl-in/>
+		 <order>0</order>
+            </action>
+            <bucket-id>29</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <copy-ttl-out/>
+                <order>0</order>  
+            </action>
+            <bucket-id>30</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <set-queue-action>
+                    <queue-id>1</queue-id>
+                </set-queue-action>
+               <order>0</order>
+            </action>
+            <bucket-id>31</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+        <bucket>
+            <action>
+                <output-action>
+                    <max-length>56</max-length>
+                    <output-node-connector>CONTROLLER</output-node-connector>
+                </output-action>
+                <order>0</order>
+            </action>
+            <bucket-id>31</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+    </buckets>
+    <barrier>false</barrier>
+    <group-name>Foo</group-name>
+    <group-id>140</group-id>
+</group>
diff --git a/test/csit/variables/xmls/g3.xml b/test/csit/variables/xmls/g3.xml
new file mode 100644
index 0000000000..54abb9a476
--- /dev/null
+++ b/test/csit/variables/xmls/g3.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<group xmlns="urn:opendaylight:flow:inventory">
+    <group-type>group-indirect</group-type>
+    <buckets>
+        <bucket>
+            <action>
+                <pop-vlan-action/>
+                <order>0</order>
+            </action>
+            <bucket-id>12</bucket-id>
+            <watch_group>14</watch_group>
+            <watch_port>1234</watch_port>
+        </bucket>
+    </buckets>
+    <barrier>false</barrier>
+    <group-name>Foo</group-name>
+    <group-id>130</group-id>
+</group>
diff --git a/test/csit/variables/xmls/m1.xml b/test/csit/variables/xmls/m1.xml
new file mode 100644
index 0000000000..32c38d2078
--- /dev/null
+++ b/test/csit/variables/xmls/m1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<meter xmlns="urn:opendaylight:flow:inventory">
+    <container-name>abcd</container-name>
+    <flags>meter-burst</flags>
+    <meter-band-headers>
+        <meter-band-header>
+            <band-burst-size>444</band-burst-size>
+            <band-id>0</band-id>
+            <band-rate>234</band-rate>
+            <dscp-remark-burst-size>5</dscp-remark-burst-size>
+            <dscp-remark-rate>12</dscp-remark-rate>
+            <perc_level>1</perc_level>
+            <meter-band-types>
+                <flags>ofpmbt-dscp-remark</flags>
+            </meter-band-types>
+        </meter-band-header>
+    </meter-band-headers>
+    <meter-id>14</meter-id>
+    <meter-name>Foo</meter-name>
+</meter>
diff --git a/test/csit/variables/xmls/m2.xml b/test/csit/variables/xmls/m2.xml
new file mode 100644
index 0000000000..32c38d2078
--- /dev/null
+++ b/test/csit/variables/xmls/m2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<meter xmlns="urn:opendaylight:flow:inventory">
+    <container-name>abcd</container-name>
+    <flags>meter-burst</flags>
+    <meter-band-headers>
+        <meter-band-header>
+            <band-burst-size>444</band-burst-size>
+            <band-id>0</band-id>
+            <band-rate>234</band-rate>
+            <dscp-remark-burst-size>5</dscp-remark-burst-size>
+            <dscp-remark-rate>12</dscp-remark-rate>
+            <perc_level>1</perc_level>
+            <meter-band-types>
+                <flags>ofpmbt-dscp-remark</flags>
+            </meter-band-types>
+        </meter-band-header>
+    </meter-band-headers>
+    <meter-id>14</meter-id>
+    <meter-name>Foo</meter-name>
+</meter>
diff --git a/test/csit/variables/xmls/m3.xml b/test/csit/variables/xmls/m3.xml
new file mode 100644
index 0000000000..32c38d2078
--- /dev/null
+++ b/test/csit/variables/xmls/m3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<meter xmlns="urn:opendaylight:flow:inventory">
+    <container-name>abcd</container-name>
+    <flags>meter-burst</flags>
+    <meter-band-headers>
+        <meter-band-header>
+            <band-burst-size>444</band-burst-size>
+            <band-id>0</band-id>
+            <band-rate>234</band-rate>
+            <dscp-remark-burst-size>5</dscp-remark-burst-size>
+            <dscp-remark-rate>12</dscp-remark-rate>
+            <perc_level>1</perc_level>
+            <meter-band-types>
+                <flags>ofpmbt-dscp-remark</flags>
+            </meter-band-types>
+        </meter-band-header>
+    </meter-band-headers>
+    <meter-id>14</meter-id>
+    <meter-name>Foo</meter-name>
+</meter>
-- 
2.36.6