X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fovs-ofctl.at;h=2a458c8df3e13c740bccffd3e738b95b1437d0ae;hb=e926dfe3ba5a78acec3b9866ba2dab4095f33ebe;hp=9dcd2493b6f46d0df8ee80e112cb4c485e4e4d43;hpb=05b8f1c2b47a64d1eee5d3fa4ab325b0784c5003;p=openvswitch diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 9dcd2493..2a458c8d 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -21,10 +21,12 @@ actions=bundle(symmetric_l4,60,hrw,ofport,slaves:) actions=output:1,bundle(eth_src,0,hrw,ofport,slaves:1),output:2 actions=bundle_load(eth_src,50,active_backup,ofport,NXM_NX_REG0[],slaves:1) actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..15],slaves:2,3) +actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..15],slaves:[2,3]) actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..30],slaves:) actions=output:1,bundle_load(eth_src,0,hrw,ofport,NXM_NX_REG0[16..31],slaves:1),output:2 actions=resubmit:1,resubmit(2),resubmit(,3),resubmit(2,3) actions=output:1,output:NXM_NX_REG0[],output:2,output:NXM_NX_REG1[16..31],output:3 +actions=output:1,exit,output:2 ]]) AT_CHECK([ovs-ofctl parse-flows flows.txt @@ -50,10 +52,12 @@ NXT_FLOW_MOD: ADD table:255 actions=bundle(symmetric_l4,60,hrw,ofport,slaves:) NXT_FLOW_MOD: ADD table:255 actions=output:1,bundle(eth_src,0,hrw,ofport,slaves:1),output:2 NXT_FLOW_MOD: ADD table:255 actions=bundle_load(eth_src,50,active_backup,ofport,NXM_NX_REG0[],slaves:1) NXT_FLOW_MOD: ADD table:255 actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..15],slaves:2,3) +NXT_FLOW_MOD: ADD table:255 actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..15],slaves:2,3) NXT_FLOW_MOD: ADD table:255 actions=bundle_load(symmetric_l4,60,hrw,ofport,NXM_NX_REG0[0..30],slaves:) NXT_FLOW_MOD: ADD table:255 actions=output:1,bundle_load(eth_src,0,hrw,ofport,NXM_NX_REG0[16..31],slaves:1),output:2 NXT_FLOW_MOD: ADD table:255 actions=resubmit:1,resubmit:2,resubmit(,3),resubmit(2,3) NXT_FLOW_MOD: ADD table:255 actions=output:1,output:NXM_NX_REG0[],output:2,output:NXM_NX_REG1[16..31],output:3 +NXT_FLOW_MOD: ADD table:255 actions=output:1,exit,output:2 ]]) AT_CLEANUP @@ -63,6 +67,7 @@ AT_DATA([flows.txt], [ tcp,tp_src=123,actions=flood in_port=LOCAL dl_vlan=9 dl_src=00:0A:E4:25:6B:B0 actions=drop arp,dl_src=00:0A:E4:25:6B:B0,arp_sha=00:0A:E4:25:6B:B0 actions=drop +ipv6,ipv6_label=0x12345 actions=2 ipv6,ipv6_src=2001:db8:3c4d:1:2:3:4:5 actions=3 ipv6,ipv6_src=2001:db8:3c4d:1:2:3:4:5/64 actions=4 ipv6,ipv6_dst=2001:db8:3c4d:1:2:3:4:5/127 actions=5 @@ -90,6 +95,7 @@ AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], [dnl NXT_FLOW_MOD: ADD tcp,tp_src=123 actions=FLOOD NXT_FLOW_MOD: ADD in_port=65534,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop NXT_FLOW_MOD: ADD arp,dl_src=00:0a:e4:25:6b:b0,arp_sha=00:0a:e4:25:6b:b0 actions=drop +NXT_FLOW_MOD: ADD ipv6,ipv6_label=0x12345 actions=output:2 NXT_FLOW_MOD: ADD ipv6,ipv6_src=2001:db8:3c4d:1:2:3:4:5 actions=output:3 NXT_FLOW_MOD: ADD ipv6,ipv6_src=2001:db8:3c4d:1::/64 actions=output:4 NXT_FLOW_MOD: ADD ipv6,ipv6_dst=2001:db8:3c4d:1:2:3:4:4/127 actions=output:5 @@ -120,6 +126,7 @@ AT_DATA([flows.txt], [[ tcp,tp_src=123,actions=flood in_port=LOCAL dl_vlan=9 dl_src=00:0A:E4:25:6B:B0 actions=drop arp,dl_src=00:0A:E4:25:6B:B0,arp_sha=00:0A:E4:25:6B:B0 actions=drop +ipv6,ipv6_label=0x12345 actions=2 ipv6,ipv6_src=2001:db8:3c4d:1:2:3:4:5 actions=3 ipv6,ipv6_src=2001:db8:3c4d:1:2:3:4:5/64 actions=4 ipv6,ipv6_dst=2001:db8:3c4d:1:2:3:4:5/127 actions=5 @@ -145,6 +152,7 @@ AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], [[NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(06), NXM_OF_TCP_SRC(007b) actions=FLOOD NXT_FLOW_MOD: ADD NXM_OF_IN_PORT(fffe), NXM_OF_ETH_SRC(000ae4256bb0), NXM_OF_VLAN_TCI_W(1009/1fff) actions=drop NXT_FLOW_MOD: ADD NXM_OF_ETH_SRC(000ae4256bb0), NXM_OF_ETH_TYPE(0806), NXM_NX_ARP_SHA(000ae4256bb0) actions=drop +NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(86dd), NXM_NX_IPV6_LABEL(00012345) actions=output:2 NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(86dd), NXM_NX_IPV6_SRC(20010db83c4d00010002000300040005) actions=output:3 NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(86dd), NXM_NX_IPV6_SRC_W(20010db83c4d00010000000000000000/ffffffffffffffff0000000000000000) actions=output:4 NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(86dd), NXM_NX_IPV6_DST_W(20010db83c4d00010002000300040004/fffffffffffffffffffffffffffffffe) actions=output:5 @@ -203,13 +211,24 @@ 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) +NXM_OF_ETH_TYPE(0800) NXM_OF_IP_TOS(41) NXM_OF_IP_TOS(f0) +# IP ECN +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_ECN(03) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_ECN(06) +NXM_NX_IP_ECN(03) + # IP protocol NXM_OF_ETH_TYPE(0800) NXM_OF_IP_PROTO(01) NXM_OF_ETH_TYPE(0800) NXM_OF_IP_PROTO(05) NXM_OF_IP_PROTO(05) +# IP TTL +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_TTL(80) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_TTL(ff) +NXM_NX_IP_TTL(80) + # IP source NXM_OF_ETH_TYPE(0800) NXM_OF_IP_SRC(ac100014) NXM_OF_ETH_TYPE(0800) NXM_OF_IP_SRC_W(C0a80000/FFFF0000) @@ -301,6 +320,32 @@ NXM_OF_ETH_TYPE(86dd) NXM_OF_IP_PROTO(3a) NXM_NX_ICMPV6_TYPE(87) NXM_NX_ND_TARGE NXM_OF_ETH_TYPE(86dd) NXM_OF_IP_PROTO(3b) NXM_NX_ICMPV6_TYPE(87) NXM_NX_ND_TARGET(20010db83c4d00010002000300040005) NXM_NX_ND_TLL(0002e30f80a4) NXM_OF_ETH_TYPE(0800) NXM_OF_IP_PROTO(3a) NXM_NX_ICMPV6_TYPE(88) NXM_NX_ND_TARGET(20010db83c4d00010002000300040005) NXM_NX_ND_TLL(0002e30f80a4) +# IPv4 fragments. +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG(01) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG(02) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG(03) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(00/03) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(00/fd) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(00/02) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(01/01) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(02/02) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG_W(03/03) +NXM_OF_ETH_TYPE(0800) NXM_NX_IP_FRAG(f3) + +# IPv6 fragments. +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG(01) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG(02) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG(03) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(00/03) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(00/01) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(00/02) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(01/01) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(02/02) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG_W(03/03) +NXM_OF_ETH_TYPE(86dd) NXM_NX_IP_FRAG(f3) + # Tunnel ID. NXM_NX_TUN_ID(00000000abcdef01) NXM_NX_TUN_ID_W(84200000abcdef01/84200000FFFFFFFF) @@ -355,6 +400,12 @@ NXM_OF_VLAN_TCI_W(0000/e000) # IP TOS NXM_OF_ETH_TYPE(0800), NXM_OF_IP_TOS(f0) +nx_pull_match() returned error 44010102 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_VALUE) +nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) + +# IP ECN +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_ECN(03) +nx_pull_match() returned error 44010102 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_VALUE) nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) # IP protocol @@ -362,6 +413,11 @@ NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(01) NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(05) nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) +# IP TTL +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_TTL(80) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_TTL(ff) +nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) + # IP source NXM_OF_ETH_TYPE(0800), NXM_OF_IP_SRC(ac100014) NXM_OF_ETH_TYPE(0800), NXM_OF_IP_SRC_W(c0a80000/ffff0000) @@ -453,6 +509,32 @@ nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_ nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) nx_pull_match() returned error 44010104 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_PREREQ) +# IPv4 fragments. +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(01) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(02) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(03) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG_W(00/01) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG_W(00/02) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG_W(01/01) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG_W(02/02) +NXM_OF_ETH_TYPE(0800), NXM_NX_IP_FRAG(03) +nx_pull_match() returned error 44010102 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_VALUE) + +# IPv6 fragments. +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(01) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(02) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(03) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(00) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG_W(00/01) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG_W(00/02) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG_W(01/01) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG_W(02/02) +NXM_OF_ETH_TYPE(86dd), NXM_NX_IP_FRAG(03) +nx_pull_match() returned error 44010102 (type OFPET_BAD_REQUEST, code NXBRC_NXM_BAD_VALUE) + # Tunnel ID. NXM_NX_TUN_ID(00000000abcdef01) NXM_NX_TUN_ID_W(84200000abcdef01/84200000ffffffff) @@ -488,45 +570,45 @@ dnl (If it doesn't, then either the tun_id won't show up at all, or it will dnl additionally show up as the top 32 bits of the cookie.) This checks dnl for regression against bug #4566. AT_SETUP([ovs-ofctl -F option with flow_mods]) -OFPROTO_START +OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop]) AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION], [0], [dnl NXST_FLOW reply: cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, tun_id=0x12345678 actions=drop ]) -OFPROTO_STOP +OVS_VSWITCHD_STOP AT_CLEANUP dnl Check that "-F openflow10" is really honored on dump-flows. dnl (If it isn't, then dump-flows will show the register match.) AT_SETUP([ovs-ofctl dump-flows honors -F option]) -OFPROTO_START +OVS_VSWITCHD_START AT_CHECK([ovs-ofctl add-flow br0 reg0=0x12345,actions=drop]) AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS | STRIP_DURATION], [0], [dnl OFPST_FLOW reply: cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, actions=drop ]) -OFPROTO_STOP +OVS_VSWITCHD_STOP AT_CLEANUP dnl Check that "-F openflow10" fails on dump-flows if the requested match dnl can't be represented in OpenFlow 1.0. AT_SETUP([ovs-ofctl dump-flows rejects bad -F option]) -OFPROTO_START +OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef], [1], [], [ovs-ofctl: unix:br0.mgmt: cannot use requested flow format nxm for specified flow ]) -OFPROTO_STOP +OVS_VSWITCHD_STOP AT_CLEANUP dnl Check that add-flow reports non-normalized flows (feature #5029). AT_SETUP([ovs-ofctl add-flow reports non-normalized flows]) -OFPROTO_START +OVS_VSWITCHD_START AT_CHECK([ovs-ofctl TESTABLE_LOG add-flow br0 nw_src=1.2.3.4,actions=5], [0], [], [dnl ofp_util|INFO|normalization changed ofp_match, details: ofp_util|INFO| pre: nw_src=1.2.3.4 ofp_util|INFO|post: @&t@ ]) -OFPROTO_STOP +OVS_VSWITCHD_STOP AT_CLEANUP