X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovs-ofctl.at;h=b1b4c6c17c2211ff5fe0c0ee7b9c6b77230de00a;hb=98f7f427bf8bb339d4d1f1df1ff9b3310f8f5bc4;hp=d3f173b1b0c3d18434288bd726822fee14cc48a8;hpb=32455024044444678a8d500d716dad7fb77e18d0;p=sliver-openvswitch.git diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index d3f173b1b..b1b4c6c17 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -1308,6 +1308,26 @@ OXM_OF_ETH_SRC(020898456ddb) OXM_OF_ETH_TYPE(0800) OXM_OF_ETH_TYPE(0800) OXM_OF_IN_PORT(00000012) +# vlan +OXM_OF_VLAN_VID(1009) OXM_OF_VLAN_VID(1009) # Duplicate Field +OXM_OF_VLAN_VID(f009) # Bad Value +OXM_OF_VLAN_PCP(00) # Bad Pre-Requisite +OXM_OF_VLAN_VID(0000) # Packets without 802.1Q header or with VID=0 +OXM_OF_VLAN_VID(1123) # Packets with VID=123, any PCP +OXM_OF_VLAN_VID(1123) OXM_OF_VLAN_PCP(01) # Packets with VID=123, PCP=1. +OXM_OF_VLAN_VID(0123) # Does not make sense (but supported anyway) +OXM_OF_VLAN_VID_W(0123/0123) # Does not make sense (but supported anyway) +OXM_OF_VLAN_VID_W(1123/0123) # Does not make sense (but supported anyway) +OXM_OF_VLAN_VID_W(0123/1123) # Does not make sense (but supported anyway) +OXM_OF_VLAN_VID(0123) OXM_OF_VLAN_PCP(01) #Bad Pre-Requisite +OXM_OF_VLAN_VID_W(1123/1fff) # Packets with VID=123, any PCP. +OXM_OF_VLAN_VID_W(1123/ffff) # Packets with VID=123, any PCP. +OXM_OF_VLAN_VID_W(1123/0000) # Packets with or without 802.1Q header +OXM_OF_VLAN_VID_W(1123/1f0f), # Packets with # VID=123 (masked) +OXM_OF_VLAN_VID_W(1123/1f0f), OXM_OF_VLAN_PCP(01) # Packets with VID=123 (masked), any PCP. +OXM_OF_VLAN_VID_W(1000/1000) # Packets with any VID, any PCP +OXM_OF_VLAN_VID_W(1000/1000), OXM_OF_VLAN_PCP(01) # Packets with any VID, PCP=1. + # IP ECN OXM_OF_ETH_TYPE(0800) OXM_OF_IP_ECN(03) OXM_OF_ETH_TYPE(0800) OXM_OF_IP_ECN(06) @@ -1399,11 +1419,17 @@ OXM_OF_ARP_TPA_W(C0D80000/FFFF0000) OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_SHA(0002e30f80a4) OXM_OF_ARP_SHA(0002e30f80a4) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/ffffffffffff) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/000000000000) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_SHA_W(0002e30f80a4/00000000000f) # ARP destination hardware address OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ETH_TYPE(0800) OXM_OF_ARP_THA(0002e30f80a4) OXM_OF_ARP_THA(0002e30f80a4) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/ffffffffffff) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/000000000000) +OXM_OF_ETH_TYPE(0806) OXM_OF_ARP_THA_W(0002e30f80a4/00000000000f) # IPv6 source OXM_OF_ETH_TYPE(86dd) OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005) @@ -1477,6 +1503,26 @@ OXM_OF_ETH_SRC(020898456ddb) OXM_OF_ETH_TYPE(0800) OXM_OF_IN_PORT(00000012), OXM_OF_ETH_TYPE(0800) +# vlan +nx_pull_match() returned error OFPBMC_DUP_FIELD +nx_pull_match() returned error OFPBMC_BAD_VALUE +nx_pull_match() returned error OFPBMC_BAD_PREREQ +OXM_OF_VLAN_VID(0000) +OXM_OF_VLAN_VID(1123) +OXM_OF_VLAN_VID(1123), OXM_OF_VLAN_PCP(01) +OXM_OF_VLAN_VID(0123) +OXM_OF_VLAN_VID_W(0123/0123) +OXM_OF_VLAN_VID_W(0123/0123) +OXM_OF_VLAN_VID_W(0123/1123) +nx_pull_match() returned error OFPBMC_BAD_PREREQ +OXM_OF_VLAN_VID(1123) +OXM_OF_VLAN_VID(1123) + +OXM_OF_VLAN_VID_W(1103/1f0f) +OXM_OF_VLAN_VID_W(1103/1f0f), OXM_OF_VLAN_PCP(01) +OXM_OF_VLAN_VID_W(1000/1000) +OXM_OF_VLAN_VID_W(1000/1000), OXM_OF_VLAN_PCP(01) + # IP ECN OXM_OF_ETH_TYPE(0800), OXM_OF_IP_ECN(03) nx_pull_match() returned error OFPBMC_BAD_VALUE @@ -1568,11 +1614,17 @@ nx_pull_match() returned error OFPBMC_BAD_PREREQ OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA(0002e30f80a4) nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ +OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA(0002e30f80a4) +OXM_OF_ETH_TYPE(0806) +OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_SHA_W(000000000004/00000000000f) # ARP destination hardware address OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA(0002e30f80a4) nx_pull_match() returned error OFPBMC_BAD_PREREQ nx_pull_match() returned error OFPBMC_BAD_PREREQ +OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA(0002e30f80a4) +OXM_OF_ETH_TYPE(0806) +OXM_OF_ETH_TYPE(0806), OXM_OF_ARP_THA_W(000000000004/00000000000f) # IPv6 source OXM_OF_ETH_TYPE(86dd), OXM_OF_IPV6_SRC(20010db83c4d00010002000300040005) @@ -1633,6 +1685,103 @@ OXM_OF_IN_PORT(00000001), OXM_OF_ETH_TYPE(0800) ]) AT_CLEANUP +dnl Check all of the patterns mentioned in the "VLAN Matching" section +dnl in the DESIGN file at top level. +AT_SETUP([ovs-ofctl check-vlan]) +AT_KEYWORDS([VLAN]) + +dnl [1] +AT_CHECK([ovs-ofctl check-vlan 0000 0000], [0], [dnl + -> 0000/0000 +NXM: -> 0000/0000 +OXM: -> 0000/0000,-- +OF1.0: 0000/1,00/1 -> 0000/0000 +OF1.1: 0000/1,00/1 -> 0000/0000 +]) + +dnl [2] +AT_CHECK([ovs-ofctl check-vlan 0000 ffff], [0], [dnl +vlan_tci=0x0000 -> 0000/ffff +NXM: NXM_OF_VLAN_TCI(0000) -> 0000/ffff +OXM: OXM_OF_VLAN_VID(0000) -> 0000/1fff,-- +OF1.0: ffff/0,00/1 -> 0000/ffff +OF1.1: ffff/0,00/1 -> 0000/ffff +]) + +dnl [3] +AT_CHECK([ovs-ofctl check-vlan 1abc 1fff], [0], [dnl +dl_vlan=2748 -> 1abc/1fff +NXM: NXM_OF_VLAN_TCI_W(1abc/1fff) -> 1abc/1fff +OXM: OXM_OF_VLAN_VID(1abc) -> 1abc/1fff,-- +OF1.0: 0abc/0,00/1 -> 1abc/1fff +OF1.1: 0abc/0,00/1 -> 1abc/1fff +]) + +dnl [4] +AT_CHECK([ovs-ofctl check-vlan b000 f000], [0], [dnl +dl_vlan_pcp=5 -> b000/f000 +NXM: NXM_OF_VLAN_TCI_W(b000/f000) -> b000/f000 +OXM: OXM_OF_VLAN_VID_W(1000/1000), OXM_OF_VLAN_PCP(05) -> 1000/1000,05 +OF1.0: 0000/1,05/0 -> b000/f000 +OF1.1: fffe/0,05/0 -> b000/f000 +]) + +dnl [5] +AT_CHECK([ovs-ofctl check-vlan babc ffff], [0], [dnl +dl_vlan=2748,dl_vlan_pcp=5 -> babc/ffff +NXM: NXM_OF_VLAN_TCI(babc) -> babc/ffff +OXM: OXM_OF_VLAN_VID(1abc), OXM_OF_VLAN_PCP(05) -> 1abc/1fff,05 +OF1.0: 0abc/0,05/0 -> babc/ffff +OF1.1: 0abc/0,05/0 -> babc/ffff +]) + +dnl [6] +AT_CHECK([ovs-ofctl check-vlan 0000 0fff], [0], [dnl +vlan_tci=0x0000/0x0fff -> 0000/0fff +NXM: NXM_OF_VLAN_TCI_W(0000/0fff) -> 0000/0fff +OXM: OXM_OF_VLAN_VID_W(0000/0fff) -> 0000/0fff,-- +OF1.0: 0000/0,00/1 -> 1000/1fff +OF1.1: 0000/0,00/1 -> 1000/1fff +]) + +dnl [7] +AT_CHECK([ovs-ofctl check-vlan 0000 f000], [0], [dnl +vlan_tci=0x0000/0xf000 -> 0000/f000 +NXM: NXM_OF_VLAN_TCI_W(0000/f000) -> 0000/f000 +OXM: OXM_OF_VLAN_VID_W(0000/1000) -> 0000/1000,-- +OF1.0: ffff/0,00/1 -> 0000/ffff +OF1.1: ffff/0,00/1 -> 0000/ffff +]) + +dnl [8] +AT_CHECK([ovs-ofctl check-vlan 0000 efff], [0], [dnl +vlan_tci=0x0000/0xefff -> 0000/efff +NXM: NXM_OF_VLAN_TCI_W(0000/efff) -> 0000/efff +OXM: OXM_OF_VLAN_VID_W(0000/0fff) -> 0000/0fff,-- +OF1.0: 0000/0,00/0 -> 1000/ffff +OF1.1: 0000/0,00/0 -> 1000/ffff +]) + +dnl [9] +AT_CHECK([ovs-ofctl check-vlan 1001 1001], [0], [dnl +vlan_tci=0x1001/0x1001 -> 1001/1001 +NXM: NXM_OF_VLAN_TCI_W(1001/1001) -> 1001/1001 +OXM: OXM_OF_VLAN_VID_W(1001/1001) -> 1001/1001,-- +OF1.0: 0001/0,00/1 -> 1001/1fff +OF1.1: 0001/0,00/1 -> 1001/1fff +]) + +dnl [10] +AT_CHECK([ovs-ofctl check-vlan 3000 3000], [0], [dnl +vlan_tci=0x3000/0x3000 -> 3000/3000 +NXM: NXM_OF_VLAN_TCI_W(3000/3000) -> 3000/3000 +OXM: OXM_OF_VLAN_VID_W(1000/1000), OXM_OF_VLAN_PCP(01) -> 1000/1000,01 +OF1.0: 0000/1,01/0 -> 3000/f000 +OF1.1: fffe/0,01/0 -> 3000/f000 +]) +AT_CHECK +AT_CLEANUP + dnl Check that "-F openflow10" rejects a flow_mod with unsupported features, dnl such as tunnels and metadata. AT_SETUP([ovs-ofctl -F option and NXM features]) @@ -1813,3 +1962,28 @@ AT_CHECK([ovs-ofctl diff-flows add-flows.txt br0 | sort], [0], [expout]) OVS_VSWITCHD_STOP AT_CLEANUP + +dnl ofpacts that differ bytewise don't necessarily differ when +dnl converted to another representation, such as OpenFlow 1.0 +dnl or to a string. "resubmit(,1)" is an example of an action +dnl of this type: "ofpact_resubmit"s can differ in their "compat" +dnl values even though this doesn't affect the string format. +dnl +dnl This test checks that "ovs-ofctl diff-flows" doesn't report +dnl false ofpacts differences. +AT_SETUP([ovs-ofctl diff-flows - suppress false differences]) +OVS_VSWITCHD_START +AT_DATA([flows.txt], [actions=resubmit(,1) +]) +AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) +AT_CHECK([ovs-ofctl diff-flows br0 flows.txt]) +AT_CHECK([ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1]) +AT_CHECK([ovs-ofctl diff-flows br0 flows.txt], [2], [dnl +-dl_vlan=9 idle_timeout=60 actions=output:1 +]) +AT_CHECK([ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1]) +AT_CHECK([ovs-ofctl diff-flows flows.txt br0], [2], [dnl ++dl_vlan=9 cookie=0x4d2 hard_timeout=120 actions=output:1 +]) +OVS_VSWITCHD_STOP +AT_CLEANUP