X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofp-actions.at;h=452bdbfe234da8597a93f2493d1df3be79d72847;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=244c9eee1aca720747dfe7cb22659e0f2704f216;hpb=64fcc0731396b64b27976df016d8f465723a66be;p=sliver-openvswitch.git

diff --git a/tests/ofp-actions.at b/tests/ofp-actions.at
index 244c9eee1..452bdbfe2 100644
--- a/tests/ofp-actions.at
+++ b/tests/ofp-actions.at
@@ -39,7 +39,7 @@ AT_DATA([test-data], [dnl
 # actions=mod_tp_dst:443
 000a 0008 01bb 0000
 
-# actions=enqueue:10q55
+# actions=enqueue:10:55
 000b 0010 000a 000000000000 00000037
 
 # actions=resubmit:5
@@ -477,3 +477,15 @@ AT_CHECK(
   [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-instructions < input.txt],
   [0], [expout], [experr])
 AT_CLEANUP
+
+AT_SETUP([ofp-actions - inconsistent MPLS actions])
+OVS_VSWITCHD_START
+dnl OK: Use fin_timeout action on TCP flow
+AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'])
+dnl Bad: Use fin_timeout action on TCP flow that has been converted to MPLS
+AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'],
+         [1], [], [dnl
+ovs-ofctl: none of the usable flow formats (OpenFlow10,NXM) is among the allowed flow formats (OpenFlow11)
+])
+OVS_VSWITCHD_STOP
+AT_CLEANUP