Added more functionality to flow test suite
- Added MPLS class
- Testing MPLS selector
- Testing TCP selector
- Testing UDP selector
- Checks flow tables in Mininet

Change-Id: Ibd624e7055fb0bcd736811cd2aff563f29fc2c38
diff --git a/TestON/tests/FUNCflow/FUNCflow.params b/TestON/tests/FUNCflow/FUNCflow.params
index 7353e69..d1a3c58 100755
--- a/TestON/tests/FUNCflow/FUNCflow.params
+++ b/TestON/tests/FUNCflow/FUNCflow.params
@@ -8,17 +8,22 @@
     # 9 - Report logs
     # 10 - Start mininet and verify topology
     # 66 - Testing Scapy
-    # 1000 - Add flows with MAC selectors
-    # 1100 - Add flows with IPv4 selectors
-    # 1200 - Add flows with vlan selector
+    # 1000 - Add flows with MAC selector
+    # 1100 - Add flows with IPv4 selector
+    # 1200 - Add flows with VLAN selector
+    # 1300 - Add flows with MPLS selector
+    # 1400 - Add flows with TCP selectors
+    # 1500 - Add flows with UDP selectors
     # 2000 - Delete flows
 
-    <testcases>1,2,10,1000,2,1100,2,1200,100</testcases>
+    <testcases>1,2,10,1000,2000,1200,2000,1300,2000,1400,2000,1500,100</testcases>
 
     <SCALE>
         <max>1</max>
     </SCALE>
 
+    <DEBUG>on</DEBUG>
+
     <DEPENDENCY>
         <path>/tests/FUNCflow/Dependency/</path>
         <wrapper1>startUp</wrapper1>
@@ -42,9 +47,14 @@
 
     <TEST>
         <vlan>10</vlan>
+        <mpls>22</mpls>
+        <tcpDst>40001</tcpDst>
+        <udpDst>40051</udpDst>
         <ip4Type>2048</ip4Type>
-        <ip6Type>34525</ip6Type>
+        <tcpProto>6</tcpProto>
+        <udpProto>17</udpProto>
         <vlanType>33024</vlanType>
+        <mplsType>34887</mplsType>
         <swDPID>of:0000000000000001</swDPID>
     </TEST>