X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-ofctl.at;h=793e1d5a5ce2552a04f0dac903150f0e7d3f6cbb;hb=7fa710e43fdf2dbf7fe41877cf73e04ccc4a7166;hp=33a1734785fbb23c8fd17852a2c8962aaa8c96ee;hpb=09246b99d1601e2ba7ff85bb26f9b0235632a76d;p=openvswitch diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 33a17347..793e1d5a 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -10,6 +10,7 @@ udp dl_vlan_pcp=7 idle_timeout=5 actions=strip_vlan output:0 tcp,nw_src=192.168.0.3,tp_dst=80 actions=set_queue:37,output:1 udp,nw_src=192.168.0.3,tp_dst=53 actions=pop_queue,output:1 cookie=0x123456789abcdef hard_timeout=10 priority=60000 actions=controller +actions=note:41.42.43,note:00.01.02.03.04.05.06.07,note actions=drop ]) AT_CHECK([ovs-ofctl parse-flows flows.txt], [0], [stdout]) @@ -21,6 +22,7 @@ flow_mod: udp,dl_vlan_pcp=7, ADD: idle:5 actions=strip_vlan,output:0 flow_mod: tcp,nw_src=192.168.0.3,tp_dst=80, ADD: actions=set_queue:37,output:1 flow_mod: udp,nw_src=192.168.0.3,tp_dst=53, ADD: actions=pop_queue,output:1 flow_mod: ADD: cookie:0x123456789abcdef hard:10 pri:60000 actions=CONTROLLER:65535 +flow_mod: ADD: actions=note:41.42.43.00.00.00,note:00.01.02.03.04.05.06.07.00.00.00.00.00.00,note:00.00.00.00.00.00 flow_mod: ADD: actions=drop ]) AT_CLEANUP @@ -36,6 +38,11 @@ NXM_OF_IN_PORT(fffe) # eth dst NXM_OF_ETH_DST(0002e30f80a4) +NXM_OF_ETH_DST_W(010000000000/010000000000) +NXM_OF_ETH_DST_W(000000000000/010000000000) +NXM_OF_ETH_DST_W(ffffffffffff/010000000000) +NXM_OF_ETH_DST_W(0002e30f80a4/ffffffffffff) +NXM_OF_ETH_DST_W(0002e30f80a4/feffffffffff) # eth src NXM_OF_ETH_SRC(020898456ddb) @@ -49,10 +56,10 @@ NXM_OF_VLAN_TCI(f009) NXM_OF_VLAN_TCI(f009) NXM_OF_VLAN_TCI(f009) NXM_OF_VLAN_TCI(0000) # Packets without 802.1Q header. NXM_OF_VLAN_TCI(3123) # Packets with VID=123, PCP=1. -NXM_OF_VLAN_TCI(0123) # Does not make sense. +NXM_OF_VLAN_TCI(0123) # Does not make sense (but supported anyway) NXM_OF_VLAN_TCI_W(1123/1fff) # Packets with VID=123, any PCP. NXM_OF_VLAN_TCI_W(f000/f000) # Packets with any VID, PCP=7. -NXM_OF_VLAN_TCI_W(0000/e000) # No 802.1Q or with VID=0 (not yet supported) +NXM_OF_VLAN_TCI_W(0000/e000) # No 802.1Q or with VID=0 # IP TOS NXM_OF_ETH_TYPE(0800) NXM_OF_IP_TOS(f0) @@ -71,7 +78,7 @@ NXM_OF_IP_SRC_W(C0D80000/FFFF0000) # IP destination NXM_OF_ETH_TYPE(0800) NXM_OF_IP_DST(ac100014) -NXM_OF_ETH_TYPE(0800) NXM_OF_IP_DST_W(C0a80000/FFFF0000) +NXM_OF_ETH_TYPE(0800) NXM_OF_IP_DST_W(C0a88012/FFFF0000) NXM_OF_IP_DST(ac100014) NXM_OF_ETH_TYPE(0806) NXM_OF_IP_DST_W(C0D80000/FFFF0000) @@ -110,21 +117,24 @@ NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_OP(0001) NXM_OF_ARP_OP(0001) # ARP source NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_SPA(ac100014) -NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_SPA_W(C0a81200/FFFFFF00) +NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_SPA_W(C0a81234/FFFFFF00) NXM_OF_ETH_TYPE(0800) NXM_OF_ARP_SPA(ac100014) -NXM_OF_ARP_SPA_W(C0D80000/FFFF0000) +NXM_OF_ARP_SPA_W(C0D8fedc/FFFF0000) # ARP destination NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_TPA(ac100014) -NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_TPA_W(C0a81200/FFFFFF00) +NXM_OF_ETH_TYPE(0806) NXM_OF_ARP_TPA_W(C0a812fe/FFFFFF00) NXM_OF_ETH_TYPE(0800) NXM_OF_ARP_TPA(ac100014) NXM_OF_ARP_TPA_W(C0D80000/FFFF0000) # Tunnel ID. NXM_NX_TUN_ID(00000000abcdef01) + +# Register 0. +NXM_NX_REG0(acebdf56) +NXM_NX_REG0_W(a0e0d050/f0f0f0f0) ]) -AT_CHECK([ovs-ofctl parse-nx-match < nx-match.txt], [0], [stdout]) -AT_CHECK([cat stdout], [0], [dnl +AT_CHECK([ovs-ofctl parse-nx-match < nx-match.txt], [0], [dnl # in port @@ -133,6 +143,11 @@ NXM_OF_IN_PORT(fffe) # eth dst NXM_OF_ETH_DST(0002e30f80a4) +NXM_OF_ETH_DST_W(010000000000/010000000000) +NXM_OF_ETH_DST_W(000000000000/010000000000) +NXM_OF_ETH_DST_W(010000000000/010000000000) +NXM_OF_ETH_DST(0002e30f80a4) +NXM_OF_ETH_DST_W(0002e30f80a4/feffffffffff) # eth src NXM_OF_ETH_SRC(020898456ddb) @@ -146,10 +161,10 @@ NXM_OF_VLAN_TCI(f009) nx_pull_match() returned error 44010105 NXM_OF_VLAN_TCI(0000) NXM_OF_VLAN_TCI(3123) -nx_pull_match() returned error 44010100 +NXM_OF_VLAN_TCI(0123) NXM_OF_VLAN_TCI_W(1123/1fff) NXM_OF_VLAN_TCI_W(f000/f000) -nx_pull_match() returned error 44010100 +NXM_OF_VLAN_TCI_W(0000/e000) # IP TOS NXM_OF_ETH_TYPE(0800), NXM_OF_IP_TOS(f0) @@ -219,5 +234,9 @@ nx_pull_match() returned error 44010104 # Tunnel ID. NXM_NX_TUN_ID(00000000abcdef01) + +# Register 0. +NXM_NX_REG0(acebdf56) +NXM_NX_REG0_W(a0e0d050/f0f0f0f0) ]) AT_CLEANUP