X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofp-actions.at;h=452bdbfe234da8597a93f2493d1df3be79d72847;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=aa51e0846e14718a5ec1ac67c715b262d3872773;hpb=6813ee7c06fbd2496fb73edd54a462a9053c6161;p=sliver-openvswitch.git diff --git a/tests/ofp-actions.at b/tests/ofp-actions.at index aa51e0846..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 @@ -78,10 +78,6 @@ ffff 0020 00002320 0016 000000000000 fedcba9876543210 ffff0000ffff0000 # actions=multipath(eth_src,50,modulo_n,1,0,NXM_NX_REG0[]) ffff 0020 00002320 000a 0000 0032 0000 0000 0000 0000 0000 0000 001f 00010004 -# actions=autopath(2,NXM_NX_REG0[2..30]) -& autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. -ffff 0018 00002320 000b 009c 00010004 00000002 00000000 - # actions=bundle(eth_src,0,hrw,ofport,slaves:4,8) ffff 0028 00002320 000c 0001 0000 0000 00000002 0002 0000 00000000 00000000 dnl 0004 0008 00000000 @@ -118,6 +114,9 @@ ffff 0010 00002320 0014 04d2 162e 02 00 # actions=dec_ttl(32768,12345,90,765,1024) ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000 +# actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) +ffff 0018 00002320 001d 3039 00005BA0 00008707 0000B26E + ]) sed '/^[[#&]]/d' < test-data > input.txt sed -n 's/^# //p; /^$/p' < test-data > expout @@ -139,10 +138,10 @@ AT_DATA([test-data], [dnl # actions=CONTROLLER:1234 0000 0010 fffffffd 04d2 000000000000 -# actions=mod_vlan_vid:9 +# actions=set_vlan_vid:9 0001 0008 0009 0000 -# actions=mod_vlan_pcp:6 +# actions=set_vlan_pcp:6 0002 0008 06 000000 # actions=mod_dl_src:00:11:22:33:44:55 @@ -166,7 +165,7 @@ AT_DATA([test-data], [dnl # actions=mod_tp_dst:443 000a 0008 01bb 0000 -# actions=strip_vlan +# actions=pop_vlan 0012 0008 00000000 # actions=set_queue:2309737729 @@ -252,10 +251,6 @@ ffff 0020 00002320 0016 000000000000 fedcba9876543210 ffffffffffffffff ffff 0010 # actions=multipath(eth_src,50,modulo_n,1,0,NXM_NX_REG0[]) ffff 0020 00002320 000a 0000 0032 0000 0000 0000 0000 0000 0000 001f 00010004 -# actions=autopath(2,NXM_NX_REG0[2..30]) -& autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. -ffff 0018 00002320 000b 009c 00010004 00000002 00000000 - # actions=bundle(eth_src,0,hrw,ofport,slaves:4,8) ffff 0028 00002320 000c 0001 0000 0000 00000002 0002 0000 00000000 00000000 dnl 0004 0008 00000000 @@ -297,6 +292,9 @@ ffff 0010 00002320 0014 04d2 162e 02 00 # actions=dec_ttl(32768,12345,90,765,1024) ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000 +# actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) +ffff 0018 00002320 001d 3039 00005BA0 00008707 0000B26E + ]) sed '/^[[#&]]/d' < test-data > input.txt sed -n 's/^# //p; /^$/p' < test-data > expout @@ -341,7 +339,7 @@ dnl Check that an empty Apply-Actions instruction gets dropped. 0004 0008 00000000 dnl Duplicate instruction type: -# bad OF1.1 instructions: OFPBAC_UNSUPPORTED_ORDER +# bad OF1.1 instructions: ONFBIC_DUP_INSTRUCTION 0004 0008 00000000 0004 0008 00000000 dnl Instructions not multiple of 8 in length. @@ -358,6 +356,10 @@ dnl Goto-Table 1 instruction non-zero padding # 7: 01 -> 00 0001 0008 01 000001 +dnl Goto-Table 1 instruction go back to the previous table. +# bad OF1.1 instructions: OFPBRC_BAD_TABLE_ID +2,0001 0008 01 000000 + dnl Goto-Table 1 # actions=goto_table:1 0001 0008 01 000000 @@ -379,7 +381,7 @@ dnl Write-Metadata too long. 0002 0020 00000000 fedcba9876543210 ffffffffffffffff 0000000000000000 dnl Write-Metadata duplicated. -# bad OF1.1 instructions: OFPBAC_UNSUPPORTED_ORDER +# bad OF1.1 instructions: ONFBIC_DUP_INSTRUCTION 0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00 0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00 dnl Write-Metadata in wrong position (OpenFlow 1.1+ disregards the order @@ -414,9 +416,29 @@ dnl and OVS reorders it to the canonical order) # 31: ff -> 00 0001 0008 01 000000 0002 0018 00000000 fedcba9876543210 ffffffffffffffff -dnl Write-Actions not supported yet. -# bad OF1.1 instructions: OFPBIC_UNSUP_INST -0003 0008 01 000000 +dnl empty Write-Actions non-zero padding +# actions=write_actions(drop) +# 0: 00 -> (none) +# 1: 03 -> (none) +# 2: 00 -> (none) +# 3: 08 -> (none) +# 4: 00 -> (none) +# 5: 00 -> (none) +# 6: 00 -> (none) +# 7: 01 -> (none) +0003 0008 00000001 + +dnl Check that an empty Write-Actions instruction gets dropped. +# actions=write_actions(drop) +# 0: 00 -> (none) +# 1: 03 -> (none) +# 2: 00 -> (none) +# 3: 08 -> (none) +# 4: 00 -> (none) +# 5: 00 -> (none) +# 6: 00 -> (none) +# 7: 00 -> (none) +0003 0008 00000000 dnl Clear-Actions too-long # bad OF1.1 instructions: OFPBIC_BAD_LEN @@ -455,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