X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovs-ofctl.at;h=996ea0699b537932ddff7ad38a0f08ce44b939e1;hb=20ba93a7c5f9e1b1c1e988a9910ca7d0534d4774;hp=f7290a69451e026fe6df20de28cfdfa61155a1f0;hpb=2e1ae2005ed347d2dfebd23fff40c54a1a2a6716;p=sliver-openvswitch.git diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index f7290a694..996ea0699 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -1,17 +1,120 @@ AT_BANNER([ovs-ofctl]) +AT_SETUP([ovs-ofctl parse-flows choice of protocol]) +# This doesn't cover some potential vlan_tci test cases. +for test_case in \ + 'tun_id=0 NXM,OXM' \ + 'tun_src=1.2.3.4 NXM,OXM' \ + 'tun_dst=1.2.3.4 NXM,OXM' \ + 'tun_flags=0 none' \ + 'tun_tos=0 none' \ + 'tun_ttl=0 none' \ + 'metadata=0 NXM,OXM' \ + 'in_port=1 any' \ + 'skb_priority=0 none' \ + 'pkt_mark=1 NXM,OXM' \ + 'reg0=0 NXM,OXM' \ + 'reg1=1 NXM,OXM' \ + 'reg2=2 NXM,OXM' \ + 'reg3=3 NXM,OXM' \ + 'reg4=4 NXM,OXM' \ + 'reg5=5 NXM,OXM' \ + 'reg6=6 NXM,OXM' \ + 'reg7=7 NXM,OXM' \ + 'dl_src=00:11:22:33:44:55 any' \ + 'dl_src=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM' \ + 'dl_dst=00:11:22:33:44:55 any' \ + 'dl_dst=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM' \ + 'dl_type=0x1234 any' \ + 'dl_type=0x0800 any' \ + 'dl_type=0x0806 any' \ + 'dl_type=0x86dd any' \ + 'vlan_tci=0 any' \ + 'vlan_tci=0x1009 any' \ + 'dl_vlan=9 any' \ + 'vlan_vid=11 any' \ + 'dl_vlan_pcp=6 any' \ + 'vlan_pcp=5 any' \ + 'mpls,mpls_label=5 NXM,OXM' \ + 'mpls,mpls_tc=1 NXM,OXM' \ + 'mpls,mpls_bos=0 NXM,OXM' \ + 'ip,ip_src=1.2.3.4 any' \ + 'ip,ip_src=192.168.0.0/24 any' \ + 'ip,ip_src=192.0.168.0/255.0.255.0 NXM,OXM' \ + 'ip,ip_dst=1.2.3.4 any' \ + 'ip,ip_dst=192.168.0.0/24 any' \ + 'ip,ip_dst=192.0.168.0/255.0.255.0 NXM,OXM' \ + 'ipv6,ipv6_src=::1 NXM,OXM' \ + 'ipv6,ipv6_dst=::1 NXM,OXM' \ + 'ipv6,ipv6_label=5 NXM,OXM' \ + 'ip,nw_proto=1 any' \ + 'ipv6,nw_proto=1 NXM,OXM' \ + 'ip,nw_tos=0xf0 any' \ + 'ipv6,nw_tos=0xf0 NXM,OXM' \ + 'ip,nw_tos_shifted=0x3c any' \ + 'ipv6,nw_tos_shifted=0x3c NXM,OXM' \ + 'ip,nw_ecn=1 NXM,OXM' \ + 'ipv6,nw_ecn=1 NXM,OXM' \ + 'ip,nw_ttl=5 NXM,OXM' \ + 'ipv6,nw_ttl=5 NXM,OXM' \ + 'ip,ip_frag=no NXM,OXM' \ + 'ipv6,ip_frag=no NXM,OXM' \ + 'arp,arp_op=0 any' \ + 'arp,arp_spa=1.2.3.4 any' \ + 'arp,arp_tpa=1.2.3.4 any' \ + 'arp,arp_sha=00:11:22:33:44:55 NXM,OXM' \ + 'arp,arp_tha=00:11:22:33:44:55 NXM,OXM' \ + 'tcp,tcp_src=80 any' \ + 'tcp,tcp_src=0x1000/0x1000 NXM,OXM' \ + 'tcp6,tcp_src=80 NXM,OXM' \ + 'tcp6,tcp_src=0x1000/0x1000 NXM,OXM' \ + 'tcp,tcp_dst=80 any' \ + 'tcp,tcp_dst=0x1000/0x1000 NXM,OXM' \ + 'tcp6,tcp_dst=80 NXM,OXM' \ + 'tcp6,tcp_dst=0x1000/0x1000 NXM,OXM' \ + 'udp,udp_src=80 any' \ + 'udp,udp_src=0x1000/0x1000 NXM,OXM' \ + 'udp6,udp_src=80 NXM,OXM' \ + 'udp6,udp_src=0x1000/0x1000 NXM,OXM' \ + 'udp,udp_dst=80 any' \ + 'udp,udp_dst=0x1000/0x1000 NXM,OXM' \ + 'udp6,udp_dst=80 NXM,OXM' \ + 'udp6,udp_dst=0x1000/0x1000 NXM,OXM' \ + 'icmp,icmp_type=1 any' \ + 'icmp,icmp_type=1 any' \ + 'icmp6,icmpv6_type=1 NXM,OXM' \ + 'icmp6,icmpv6_code=2 NXM,OXM' +do + set $test_case + echo + echo "### test case: '$1' should have usable protocols '$2'" + if test "$2" = none; then + AT_CHECK([ovs-ofctl parse-flow "$1,actions=drop"], [1], + [usable protocols: none +], + [ovs-ofctl: no usable protocol +]) + else + AT_CHECK_UNQUOTED([ovs-ofctl parse-flow "$1,actions=drop" | sed 1q], [0], + [usable protocols: $2 +]) + fi +done +AT_CLEANUP + AT_SETUP([ovs-ofctl parse-flows (OpenFlow 1.0)]) AT_DATA([flows.txt], [[ # comment -tcp,tp_src=123,actions=flood +tcp,tp_src=123,out_port=5,actions=flood in_port=LOCAL dl_vlan=9 dl_src=00:0A:E4:25:6B:B0 actions=drop 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=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa->ipv6_src +ip,actions=set_field:10.4.3.77->ip_src in_port=0 actions=resubmit:0 +actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) AT_CHECK([ovs-ofctl parse-flows flows.txt @@ -19,15 +122,49 @@ AT_CHECK([ovs-ofctl parse-flows flows.txt AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], [[usable protocols: any chosen protocol: OpenFlow10-table_id -OFPT_FLOW_MOD: ADD tcp,tp_src=123 actions=FLOOD -OFPT_FLOW_MOD: ADD in_port=65534,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop +OFPT_FLOW_MOD: ADD tcp,tp_src=123 out_port:5 actions=FLOOD +OFPT_FLOW_MOD: ADD in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop OFPT_FLOW_MOD: ADD udp,dl_vlan_pcp=7 idle:5 actions=strip_vlan,output:0 OFPT_FLOW_MOD: ADD tcp,nw_src=192.168.0.3,tp_dst=80 actions=set_queue:37,output:1 OFPT_FLOW_MOD: ADD udp,nw_src=192.168.0.3,tp_dst=53 actions=pop_queue,output:1 OFPT_FLOW_MOD: ADD priority=60000 cookie:0x123456789abcdef hard:10 actions=CONTROLLER:65535 OFPT_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 -OFPT_FLOW_MOD: ADD actions=load:0xa6badbfffefe59fa->NXM_NX_IPV6_SRC[0..63],load:0xfe8001234567890a->NXM_NX_IPV6_SRC[64..127] +OFPT_FLOW_MOD: ADD ip actions=load:0xa04034d->NXM_OF_IP_SRC[] OFPT_FLOW_MOD: ADD in_port=0 actions=resubmit:0 +OFPT_FLOW_MOD: ADD actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) +]]) +AT_CLEANUP + +AT_SETUP([ovs-ofctl parse-flows (OpenFlow 1.2)]) +AT_DATA([flows.txt], [[ +# comment +tcp,tp_src=123,actions=flood +in_port=LOCAL dl_vlan=9 dl_src=00:0A:E4:25:6B:B0 actions=drop +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 +ipv6,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa->ipv6_src +in_port=0 actions=resubmit:0 +actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) +]]) + +AT_CHECK([ovs-ofctl --protocols OpenFlow12 parse-flows flows.txt +], [0], [stdout]) +AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], +[[usable protocols: any +chosen protocol: OXM-OpenFlow12 +OFPT_FLOW_MOD (OF1.2): ADD table:255 tcp,tp_src=123 actions=FLOOD +OFPT_FLOW_MOD (OF1.2): ADD table:255 in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop +OFPT_FLOW_MOD (OF1.2): ADD table:255 udp,dl_vlan_pcp=7 idle:5 actions=strip_vlan,output:0 +OFPT_FLOW_MOD (OF1.2): ADD table:255 tcp,nw_src=192.168.0.3,tp_dst=80 actions=set_queue:37,output:1 +OFPT_FLOW_MOD (OF1.2): ADD table:255 udp,nw_src=192.168.0.3,tp_dst=53 actions=pop_queue,output:1 +OFPT_FLOW_MOD (OF1.2): ADD table:255 priority=60000 cookie:0x123456789abcdef hard:10 actions=CONTROLLER:65535 +OFPT_FLOW_MOD (OF1.2): ADD table:255 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 +OFPT_FLOW_MOD (OF1.2): ADD table:255 ipv6 actions=set_field:fe80:123:4567:890a:a6ba:dbff:fefe:59fa->ipv6_src +OFPT_FLOW_MOD (OF1.2): ADD table:255 in_port=0 actions=resubmit:0 +OFPT_FLOW_MOD (OF1.2): ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) AT_CLEANUP @@ -43,11 +180,24 @@ AT_CHECK([ovs-ofctl parse-flows flows.txt AT_CLEANUP +AT_SETUP([ovs-ofctl parse-flows (skb_priority)]) +AT_DATA([flows.txt], [[ +skb_priority=0x12341234,tcp,tp_src=123,actions=flood +]]) + +AT_CHECK([ovs-ofctl parse-flows flows.txt +], [1], [usable protocols: none +], [stderr]) + +AT_CLEANUP + + AT_SETUP([ovs-ofctl parse-flows (NXM)]) AT_DATA([flows.txt], [[ # comment tcp,tp_src=123,actions=flood in_port=LOCAL dl_vlan=9 dl_src=00:0A:E4:25:6B:B0 actions=drop +pkt_mark=0xbb,actions=set_field:0xaa->pkt_mark 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 @@ -73,15 +223,17 @@ send_flow_rem,actions=output:1,output:NXM_NX_REG0[],output:2,output:NXM_NX_REG1[ check_overlap,actions=output:1,exit,output:2 actions=fin_timeout(idle_timeout=5,hard_timeout=15) actions=controller(max_len=123,reason=invalid_ttl,id=555) +actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) AT_CHECK([ovs-ofctl parse-flows flows.txt ], [0], [stdout]) AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], -[[usable protocols: NXM+table_id,OXM,OpenFlow13 +[[usable protocols: OXM,NXM+table_id chosen protocol: NXM+table_id NXT_FLOW_MOD: ADD table:255 tcp,tp_src=123 actions=FLOOD -NXT_FLOW_MOD: ADD table:255 in_port=65534,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop +NXT_FLOW_MOD: ADD table:255 in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop +NXT_FLOW_MOD: ADD table:255 pkt_mark=0xbb actions=load:0xaa->NXM_NX_PKT_MARK[] NXT_FLOW_MOD: ADD table:255 udp,dl_vlan_pcp=7 idle:5 actions=strip_vlan,output:0 NXT_FLOW_MOD: ADD table:255 tcp,nw_src=192.168.0.3,tp_dst=80 actions=set_queue:37,output:1 NXT_FLOW_MOD: ADD table:255 udp,nw_src=192.168.0.3,tp_dst=53 actions=pop_queue,output:1 @@ -107,6 +259,7 @@ NXT_FLOW_MOD: ADD table:255 send_flow_rem actions=output:1,output:NXM_NX_REG0[], NXT_FLOW_MOD: ADD table:255 check_overlap actions=output:1,exit,output:2 NXT_FLOW_MOD: ADD table:255 actions=fin_timeout(idle_timeout=5,hard_timeout=15) NXT_FLOW_MOD: ADD table:255 actions=controller(reason=invalid_ttl,max_len=123,id=555) +NXT_FLOW_MOD: ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) AT_CLEANUP @@ -140,13 +293,14 @@ dl_dst=01:00:00:00:00:00/01:00:00:00:00:00,actions=drop dl_dst=00:00:00:00:00:00/01:00:00:00:00:00,actions=drop dl_dst=aa:bb:cc:dd:ee:ff/fe:ff:ff:ff:ff:ff,actions=drop dl_dst=aa:bb:cc:dd:ee:ff/00:00:00:00:00:00,actions=drop +actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]) AT_CHECK([ovs-ofctl -F nxm parse-flows flows.txt], [0], [stdout]) AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], [dnl -usable protocols: NXM,OXM,OpenFlow13 +usable protocols: NXM,OXM chosen protocol: NXM-table_id 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 in_port=LOCAL,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 @@ -172,6 +326,7 @@ NXT_FLOW_MOD: ADD dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=drop NXT_FLOW_MOD: ADD dl_dst=00:00:00:00:00:00/01:00:00:00:00:00 actions=drop NXT_FLOW_MOD: ADD dl_dst=aa:bb:cc:dd:ee:ff/fe:ff:ff:ff:ff:ff actions=drop NXT_FLOW_MOD: ADD actions=drop +NXT_FLOW_MOD: ADD actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]) AT_CLEANUP @@ -200,12 +355,13 @@ tun_id=0x1234,cookie=0x5678,actions=flood actions=drop reg0=123,actions=move:NXM_NX_REG0[0..5]->NXM_NX_REG1[26..31],load:55->NXM_NX_REG2[0..31],move:NXM_NX_REG0[0..31]->NXM_NX_TUN_ID[0..31],move:NXM_NX_REG0[0..15]->NXM_OF_VLAN_TCI[] actions=move:OXM_OF_ETH_DST[]->OXM_OF_ETH_SRC[] -actions=autopath(5,NXM_NX_REG0[]) +actions=push:NXM_NX_REG0[0..31],pop:NXM_NX_REG0[] vlan_tci=0x1123/0x1fff,actions=drop +actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) AT_CHECK([ovs-ofctl -F nxm -mmm parse-flows flows.txt], [0], [stdout], [stderr]) AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0], -[[usable protocols: NXM,OXM,OpenFlow13 +[[usable protocols: NXM,OXM chosen protocol: NXM-table_id 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 @@ -229,12 +385,10 @@ NXT_FLOW_MOD: ADD NXM_NX_TUN_ID(0000000000001234) cookie:0x5678 actions=FLOOD NXT_FLOW_MOD: ADD actions=drop NXT_FLOW_MOD: ADD NXM_NX_REG0(0000007b) actions=move:NXM_NX_REG0[0..5]->NXM_NX_REG1[26..31],load:0x37->NXM_NX_REG2[],move:NXM_NX_REG0[]->NXM_NX_TUN_ID[0..31],move:NXM_NX_REG0[0..15]->NXM_OF_VLAN_TCI[] NXT_FLOW_MOD: ADD actions=move:NXM_OF_ETH_DST[]->NXM_OF_ETH_SRC[] -NXT_FLOW_MOD: ADD actions=autopath(5,NXM_NX_REG0[]) +NXT_FLOW_MOD: ADD actions=push:NXM_NX_REG0[],pop:NXM_NX_REG0[] NXT_FLOW_MOD: ADD NXM_OF_VLAN_TCI_W(1123/1fff) actions=drop +NXT_FLOW_MOD: ADD actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678) ]]) -AT_CHECK([[sed 's/^[^|]*|[^|]*|//' stderr]], [0], [dnl -autopath|WARN|The autopath action is deprecated and may be removed in February 2013. Please email dev@openvswitch.org with concerns. -]) AT_CLEANUP AT_SETUP([ovs-ofctl parse-nx-match]) @@ -526,7 +680,7 @@ NXM_NX_REG0_W(a0e0d050/00000000) 00011e04(12345678) 00011f08(12345678/12345678) ]) -AT_CHECK([ovs-ofctl --strict parse-nx-match < nx-match.txt], [0], [dnl +AT_CHECK([ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt], [0], [dnl # in port @@ -812,13 +966,22 @@ NXM_NX_REG0(12345678) NXM_NX_REG0_W(12345678/12345678) nx_pull_match() returned error OFPBMC_BAD_FIELD nx_pull_match() returned error OFPBMC_BAD_FIELD +], [stderr]) + +# Check that at least the first warning made it. (It's rate-limited +# so a variable number could show up, especially under valgrind etc.) +AT_CHECK([grep 'has 1-bits in value' stderr | sed 1q], [0], [dnl +nx_match|WARN|NXM/OXM entry NXM_OF_ETH_DST_W(ffffffffffff/010000000000) has 1-bits in value for bits wildcarded by the mask. (Future versions of OVS may report this as an OpenFlow error.) ]) + +# Check that there wasn't any other stderr output. +AT_CHECK([grep -v 'has 1-bits in value' stderr], [1]) AT_CLEANUP AT_SETUP([ovs-ofctl parse-ofp10-match]) AT_KEYWORDS([OF1.0]) AT_DATA([test-data], [dnl -# in_port=65534 +# in_port=LOCAL 003820fe fffe xxxxxxxxxxxx xxxxxxxxxxxx xxxx xx xx xxxx xx xx xxxx dnl xxxxxxxx xxxxxxxx xxxx xxxx @@ -1025,7 +1188,7 @@ AT_CLEANUP AT_SETUP([ovs-ofctl parse-ofp11-match]) AT_KEYWORDS([OF1.1]) AT_DATA([test-data], [dnl -# in_port=65534 +# in_port=LOCAL 0000 0058 fffffffe 000003fe dnl 000000000000ffffffffffff 000000000000ffffffffffff dnl 0000 00 00 0000 00 00 00000000ffffffff 00000000ffffffff 0000 0000 dnl @@ -1417,6 +1580,12 @@ OXM_OF_VLAN_VID_W(1123/1f0f), OXM_OF_VLAN_PCP(01) # Packets with VID=123 (maske 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 TOS +OXM_OF_ETH_TYPE(0800) OXM_OF_IP_DSCP(f0) +OXM_OF_ETH_TYPE(0800) OXM_OF_IP_DSCP(41) +OXM_OF_ETH_TYPE(0800) OXM_OF_IP_DSCP(3f) +OXM_OF_IP_DSCP(f0) + # IP ECN OXM_OF_ETH_TYPE(0800) OXM_OF_IP_ECN(03) OXM_OF_ETH_TYPE(0800) OXM_OF_IP_ECN(06) @@ -1562,7 +1731,8 @@ OXM_OF_ETH_TYPE(0800) OXM_OF_IP_PROTO(3a) OXM_OF_ICMPV6_TYPE(88) OXM_OF_IPV6_ND_ # Invalid field number. 01020304(1111/2222) ]) -AT_CHECK([ovs-ofctl --strict parse-oxm < oxm.txt], [0], [dnl +AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm < oxm.txt], + [0], [dnl # in port @@ -1612,6 +1782,12 @@ 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 TOS +nx_pull_match() returned error OFPBMC_BAD_VALUE +nx_pull_match() returned error OFPBMC_BAD_VALUE +OXM_OF_ETH_TYPE(0800), OXM_OF_IP_DSCP(3f) +nx_pull_match() returned error OFPBMC_BAD_PREREQ + # IP ECN OXM_OF_ETH_TYPE(0800), OXM_OF_IP_ECN(03) nx_pull_match() returned error OFPBMC_BAD_VALUE @@ -1756,7 +1932,16 @@ nx_pull_match() returned error OFPBMC_BAD_PREREQ # Invalid field number. nx_pull_match() returned error OFPBMC_BAD_FIELD +], [stderr]) + +# Check that at least the first warning made it. (It's rate-limited +# so a variable number could show up, especially under valgrind etc.) +AT_CHECK([grep 'has 1-bits in value' stderr | sed 1q], [0], [dnl +nx_match|WARN|NXM/OXM entry OXM_OF_METADATA_W(1234567890abcdef/ffff0000ffff0000) has 1-bits in value for bits wildcarded by the mask. (Future versions of OVS may report this as an OpenFlow error.) ]) + +# Check that there wasn't any other stderr output. +AT_CHECK([grep -v 'has 1-bits in value' stderr], [1]) AT_CLEANUP AT_SETUP([ovs-ofctl parse-oxm loose]) @@ -1875,10 +2060,10 @@ 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]) AT_CHECK([ovs-ofctl -F openflow10 add-flow dummy tun_id=123,actions=drop], - [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM,OpenFlow13) is among the allowed flow formats (OpenFlow10) + [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM) is among the allowed flow formats (OpenFlow10) ]) AT_CHECK([ovs-ofctl -F openflow10 add-flow dummy metadata=123,actions=drop], - [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM,OpenFlow13) is among the allowed flow formats (OpenFlow10) + [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM) is among the allowed flow formats (OpenFlow10) ]) AT_CLEANUP @@ -1913,7 +2098,7 @@ dnl can't be represented in OpenFlow 1.0. AT_SETUP([ovs-ofctl dump-flows rejects bad -F option]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef], [1], [], - [ovs-ofctl: none of the usable flow formats (NXM,OXM,OpenFlow13) is among the allowed flow formats (OpenFlow10) + [ovs-ofctl: none of the usable flow formats (NXM,OXM) is among the allowed flow formats (OpenFlow10) ]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -2068,3 +2253,42 @@ AT_CHECK([ovs-ofctl diff-flows flows.txt br0], [2], [dnl ]) OVS_VSWITCHD_STOP AT_CLEANUP + +AT_SETUP([ovs-ofctl -F and -O interaction]) +AT_CHECK([ovs-ofctl -F oxm -O openflow10], [1], [], + [ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow10) supports any of the enabled flow formats (OXM). (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.) +]) +AT_CHECK([ovs-ofctl -F oxm -O openflow11], [1], [], + [ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow11) supports any of the enabled flow formats (OXM). (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.) +]) +AT_CHECK([ovs-ofctl -F oxm -O openflow10,openflow11], [1], [], + [ovs-ofctl: None of the enabled OpenFlow versions (OpenFlow10, OpenFlow11) supports any of the enabled flow formats (OXM). (Use -O to enable additional OpenFlow versions or -F to enable additional flow formats.) +]) +AT_CHECK([ovs-ofctl -F oxm -O openflow10,openflow12], [1], [], + [ovs-ofctl: missing command name; use --help for help +]) +AT_CHECK([ovs-ofctl -F oxm -O openflow12], [1], [], + [ovs-ofctl: missing command name; use --help for help +]) +AT_CHECK([ovs-ofctl -F oxm -O openflow13], [1], [], + [ovs-ofctl: missing command name; use --help for help +]) +AT_CLEANUP + +AT_SETUP([ovs-ofctl ofp-parse]) +# Test the echo request/reply messages (0 payload). +AT_CHECK([printf '\1\2\0\10\0\0\0\0\1\3\0\10\0\0\0\0' > binary_ofp_msg]) +AT_CHECK([ovs-ofctl ofp-parse binary_ofp_msg], [0], [dnl +OFPT_ECHO_REQUEST (xid=0x0): 0 bytes of payload +OFPT_ECHO_REPLY (xid=0x0): 0 bytes of payload +]) + +# Test the hello (xid:1 3-byte payload). +AT_CHECK([printf '\1\0\0\13\0\0\0\1\101\102\103' > binary_ofp_msg]) +AT_CHECK([ovs-ofctl ofp-parse - < binary_ofp_msg], [0], [dnl +OFPT_HELLO (xid=0x1): + version bitmap: 0x01 + unknown data in hello: +00000000 01 00 00 0b 00 00 00 01-41 42 43 |........ABC | +]) +AT_CLEANUP