adding missing example flows

source https://wiki.opendaylight.org/view/Editing_OpenDaylight_OpenFlow_Plugin:End_to_End_Flows:Example_Flows
especially mpls actions

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

diff --git a/test/csit/variables/xmls/f156.xml b/test/csit/variables/xmls/f156.xml
new file mode 100644 (file)
index 0000000..add5295
--- /dev/null
+++ b/test/csit/variables/xmls/f156.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>279</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-pcp>3</vlan-pcp>
+      </vlan-match>
+    </match>
+    <cookie>15</cookie>
+    <flow-name>FooXf156</flow-name>
+    <priority>156</priority>
+    <barrier>false</barrier>
+</flow>

diff --git a/test/csit/variables/xmls/f157.xml b/test/csit/variables/xmls/f157.xml
new file mode 100644 (file)
index 0000000..8025d9e
--- /dev/null
+++ b/test/csit/variables/xmls/f157.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>
+                    <dec-mpls-ttl/>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <table_id>2</table_id>
+    <id>280</id>
+    <cookie_mask>255</cookie_mask>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34887</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.3/24</ipv4-source>
+        <ipv4-destination>20.4.5.6/16</ipv4-destination>
+        <in-port>0</in-port>
+    </match>
+    <cookie>5</cookie>
+    <flow-name>FooXf157</flow-name>
+    <priority>157</priority>
+    <barrier>false</barrier>
+</flow>

diff --git a/test/csit/variables/xmls/f158.xml b/test/csit/variables/xmls/f158.xml
new file mode 100644 (file)
index 0000000..7b225ff
--- /dev/null
+++ b/test/csit/variables/xmls/f158.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>push-mpls-action</flow-name>
+    <instructions>
+        <instruction>
+            <order>3</order>
+            <apply-actions>
+                <action>
+                    <push-mpls-action>
+                        <ethernet-type>34887</ethernet-type>
+                    </push-mpls-action>
+                    <order>0</order>
+                </action>
+                <action>
+                    <set-field>
+                        <protocol-match-fields>
+                            <mpls-label>27</mpls-label>
+                        </protocol-match-fields>
+                    </set-field>
+                    <order>1</order>
+                </action>
+                <action>
+                    <output-action>
+                        <output-node-connector>2</output-node-connector>
+                    </output-action>
+                    <order>2</order>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <strict>false</strict>
+    <id>281</id>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>2048</type>
+            </ethernet-type>
+        </ethernet-match>
+        <in-port>1</in-port>
+        <ipv4-destination>10.0.0.4/32</ipv4-destination>
+    </match>
+    <cookie_mask>255</cookie_mask>
+    <cookie>401</cookie>
+    <priority>158</priority>
+    <installHw>false</installHw>
+    <table_id>2</table_id>
+</flow>

diff --git a/test/csit/variables/xmls/f159.xml b/test/csit/variables/xmls/f159.xml
new file mode 100644 (file)
index 0000000..b313327
--- /dev/null
+++ b/test/csit/variables/xmls/f159.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>FooXf159</flow-name>
+    <instructions>
+        <instruction>
+            <order>0</order>
+            <apply-actions>
+                <action>
+                    <pop-mpls-action>
+                        <ethernet-type>2048</ethernet-type>
+                    </pop-mpls-action>
+                    <order>1</order>
+                </action>
+                <action>
+                    <output-action>
+                        <output-node-connector>2</output-node-connector>
+                        <max-length>60</max-length>
+                    </output-action>
+                    <order>2</order>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <id>282</id>
+    <strict>false</strict>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34887</type>
+            </ethernet-type>
+        </ethernet-match>
+        <in-port>1</in-port>
+        <protocol-match-fields>
+            <mpls-label>37</mpls-label>
+        </protocol-match-fields>
+    </match>
+    <cookie>889</cookie>
+    <cookie_mask>255</cookie_mask>
+    <installHw>false</installHw>
+    <priority>159</priority>
+    <table_id>2</table_id>
+</flow>

diff --git a/test/csit/variables/xmls/f160.xml b/test/csit/variables/xmls/f160.xml
new file mode 100644 (file)
index 0000000..c0f71de
--- /dev/null
+++ b/test/csit/variables/xmls/f160.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flow 
+    xmlns="urn:opendaylight:flow:inventory">
+    <flow-name>swap-mpls-action</flow-name>
+    <instructions>
+        <instruction>
+            <order>2</order>
+            <apply-actions>
+                <action>
+                    <set-field>
+                        <protocol-match-fields>
+                            <mpls-label>37</mpls-label>
+                        </protocol-match-fields>
+                    </set-field>
+                    <order>1</order>
+                </action>
+                <action>
+                    <output-action>
+                        <output-node-connector>2</output-node-connector>
+                    </output-action>
+                    <order>2</order>
+                </action>
+            </apply-actions>
+        </instruction>
+    </instructions>
+    <strict>false</strict>
+    <id>283</id>
+    <match>
+        <ethernet-match>
+            <ethernet-type>
+                <type>34887</type>
+            </ethernet-type>
+        </ethernet-match>
+        <in-port>1</in-port>
+        <protocol-match-fields>
+            <mpls-label>27</mpls-label>
+        </protocol-match-fields>
+    </match>
+    <cookie_mask>255</cookie_mask>
+    <cookie>401</cookie>
+    <priority>160</priority>
+    <installHw>false</installHw>
+    <table_id>2</table_id>
+</flow>

diff --git a/test/tools/OF_Test/robot_suites/075__Flows_OF13_Stat_Manager_extended/010_SM_add_upd_del_flows.txt b/test/tools/OF_Test/robot_suites/075__Flows_OF13_Stat_Manager_extended/010_SM_add_upd_del_flows.txt
index 6b61ad011818350d440f9bee2ae8d0dd3f80b1f8..5c4edfecfffdaf21b7c9d6fbbc7e5f837fbec1b0 100644 (file)
--- a/test/tools/OF_Test/robot_suites/075__Flows_OF13_Stat_Manager_extended/010_SM_add_upd_del_flows.txt
+++ b/test/tools/OF_Test/robot_suites/075__Flows_OF13_Stat_Manager_extended/010_SM_add_upd_del_flows.txt
@@ -16,7 +16,7 @@ Suite Teardown    Teardown Phase
 ${XmlsDir}=       ${CURDIR}/../../../../csit/variables/xmls
 ${switch_idx}=    1
 ${switch_name}=   s${switch_idx}
-@{flowlist0}=     f1.xml  f2.xml  f3.xml  f4.xml  f5.xml  f6.xml  f7.xml  f8.xml  f9.xml  f10.xml  f11.xml  f12.xml  f13.xml  f14.xml  f15.xml  f16.xml  f17.xml  f18.xml  f19.xml  f20.xml  f21.xml  f22.xml  f23.xml  f24.xml  f25.xml  f29.xml  f30.xml  f31.xml  f32.xml  f33.xml  f34.xml  f35.xml  f36.xml  f38.xml  f41.xml  f42.xml  f43.xml  f45.xml  f47.xml  f101.xml  f102.xml  f103.xml  f104.xml  f105.xml  f106.xml  f107.xml  f108.xml  f109.xml  f110.xml  f111.xml  f112.xml  f113.xml  f114.xml  f201.xml  f202.xml  f203.xml  f204.xml  f205.xml  f206.xml  f207.xml  f208.xml  f209.xml  f210.xml  f211.xml  f214.xml  f218.xml  f219.xml  f220.xml
+@{flowlist0}=     f1.xml  f2.xml  f3.xml  f4.xml  f5.xml  f6.xml  f7.xml  f8.xml  f9.xml  f10.xml  f11.xml  f12.xml  f13.xml  f14.xml  f15.xml  f16.xml  f17.xml  f18.xml  f19.xml  f20.xml  f21.xml  f22.xml  f23.xml  f24.xml  f25.xml  f29.xml  f30.xml  f31.xml  f32.xml  f33.xml  f34.xml  f35.xml  f36.xml  f38.xml  f41.xml  f42.xml  f43.xml  f45.xml  f47.xml  f101.xml  f102.xml  f103.xml  f104.xml  f105.xml  f106.xml  f107.xml  f108.xml  f109.xml  f110.xml  f111.xml  f112.xml  f113.xml  f114.xml  f156.xml  f157.xml  f158.xml  f159.xml  f160.xml  f201.xml  f202.xml  f203.xml  f204.xml  f205.xml  f206.xml  f207.xml  f208.xml  f209.xml  f210.xml  f211.xml  f214.xml  f218.xml  f219.xml  f220.xml
 
 
 *** Test Cases ***
@@ -296,6 +296,31 @@ Test Is Flow 114 Added
       Init Flow Variables       f114.xml
       Check Config Flow         ${True}   ${data}
       Check Operational Table   ${True}   ${data}
+Test Is Flow 156 Added
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f156.xml
+      Check Config Flow         ${True}   ${data}
+      Check Operational Table   ${True}   ${data}
+Test Is Flow 157 Added
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f157.xml
+      Check Config Flow         ${True}   ${data}
+      Check Operational Table   ${True}   ${data}
+Test Is Flow 158 Added
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f158.xml
+      Check Config Flow         ${True}   ${data}
+      Check Operational Table   ${True}   ${data}
+Test Is Flow 159 Added
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f159.xml
+      Check Config Flow         ${True}   ${data}
+      Check Operational Table   ${True}   ${data}
+Test Is Flow 160 Added
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f160.xml
+      Check Config Flow         ${True}   ${data}
+      Check Operational Table   ${True}   ${data}
 Test Is Flow 201 Added
     [Documentation]    Checks if flow is configured and operational
       Init Flow Variables       f201.xml
@@ -647,6 +672,31 @@ Test Is Flow 114 Updated
       Init Flow Variables       f114.xml
       Check Config Flow         ${True}   ${upddata}
       Check Operational Table   ${True}   ${upddata}
+Test Is Flow 156 Updated
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f156.xml
+      Check Config Flow         ${True}   ${upddata}
+      Check Operational Table   ${True}   ${upddata}
+Test Is Flow 157 Updated
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f157.xml
+      Check Config Flow         ${True}   ${upddata}
+      Check Operational Table   ${True}   ${upddata}
+Test Is Flow 158 Updated
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f158.xml
+      Check Config Flow         ${True}   ${upddata}
+      Check Operational Table   ${True}   ${upddata}
+Test Is Flow 159 Updated
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f159.xml
+      Check Config Flow         ${True}   ${upddata}
+      Check Operational Table   ${True}   ${upddata}
+Test Is Flow 160 Updated
+    [Documentation]    Checks if flow is configured and operational
+      Init Flow Variables       f160.xml
+      Check Config Flow         ${True}   ${upddata}
+      Check Operational Table   ${True}   ${upddata}
 Test Is Flow 201 Updated
     [Documentation]    Checks if flow is configured and operational
       Init Flow Variables       f201.xml
@@ -998,6 +1048,31 @@ Test Is Flow 114 Deleted
       Init Flow Variables       f114.xml
       Check Config Flow         ${False}   ${upddata}
       Check Operational Table   ${False}   ${upddata}
+Test Is Flow 156 Deleted
+    [Documentation]    Checks if flow is not configured and operational 
+      Init Flow Variables       f156.xml
+      Check Config Flow         ${False}   ${upddata}
+      Check Operational Table   ${False}   ${upddata}
+Test Is Flow 157 Deleted
+    [Documentation]    Checks if flow is not configured and operational 
+      Init Flow Variables       f157.xml
+      Check Config Flow         ${False}   ${upddata}
+      Check Operational Table   ${False}   ${upddata}
+Test Is Flow 158 Deleted
+    [Documentation]    Checks if flow is not configured and operational 
+      Init Flow Variables       f158.xml
+      Check Config Flow         ${False}   ${upddata}
+      Check Operational Table   ${False}   ${upddata}
+Test Is Flow 159 Deleted
+    [Documentation]    Checks if flow is not configured and operational 
+      Init Flow Variables       f159.xml
+      Check Config Flow         ${False}   ${upddata}
+      Check Operational Table   ${False}   ${upddata}
+Test Is Flow 160 Deleted
+    [Documentation]    Checks if flow is not configured and operational 
+      Init Flow Variables       f160.xml
+      Check Config Flow         ${False}   ${upddata}
+      Check Operational Table   ${False}   ${upddata}
 Test Is Flow 201 Deleted
     [Documentation]    Checks if flow is not configured and operational 
       Init Flow Variables       f201.xml