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_id=0/0x1 NXM,OXM' \
- 'tun_src=1.2.3.4 NXM,OXM' \
- 'tun_src=1.2.3.4/0.0.0.1 NXM,OXM' \
- 'tun_dst=1.2.3.4 NXM,OXM' \
- 'tun_dst=1.2.3.4/0.0.0.1 NXM,OXM' \
+ 'tun_id=0 NXM,OXM,OXM-OpenFlow14' \
+ 'tun_id=0/0x1 NXM,OXM,OXM-OpenFlow14' \
+ 'tun_src=1.2.3.4 NXM,OXM,OXM-OpenFlow14' \
+ 'tun_src=1.2.3.4/0.0.0.1 NXM,OXM,OXM-OpenFlow14' \
+ 'tun_dst=1.2.3.4 NXM,OXM,OXM-OpenFlow14' \
+ 'tun_dst=1.2.3.4/0.0.0.1 NXM,OXM,OXM-OpenFlow14' \
'tun_flags=0 none' \
'tun_flags=1/1 none' \
'tun_tos=0 none' \
'tun_ttl=0 none' \
- 'metadata=0 NXM,OXM,OpenFlow11' \
- 'metadata=1/1 NXM,OXM,OpenFlow11' \
- 'in_port=1 any' \
+ 'metadata=0 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'metadata=1/1 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'in_port=1 any,OXM-OpenFlow14' \
'skb_priority=0 none' \
- 'pkt_mark=1 NXM,OXM' \
- 'pkt_mark=1/1 NXM,OXM' \
- 'reg0=0 NXM,OXM' \
- 'reg0=0/1 NXM,OXM' \
- 'reg1=1 NXM,OXM' \
- 'reg1=1/1 NXM,OXM' \
- 'reg2=2 NXM,OXM' \
- 'reg2=2/1 NXM,OXM' \
- 'reg3=3 NXM,OXM' \
- 'reg3=3/1 NXM,OXM' \
- 'reg4=4 NXM,OXM' \
- 'reg4=4/1 NXM,OXM' \
- 'reg5=5 NXM,OXM' \
- 'reg5=5/1 NXM,OXM' \
- 'reg6=6 NXM,OXM' \
- 'reg6=6/1 NXM,OXM' \
- 'reg7=7 NXM,OXM' \
- 'reg7=7/1 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,OpenFlow11' \
- '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,OpenFlow11' \
- 'dl_type=0x1234 any' \
- 'dl_type=0x0800 any' \
- 'dl_type=0x0806 any' \
- 'dl_type=0x86dd any' \
- 'vlan_tci=0 any' \
- 'vlan_tci=0x1009 any' \
- 'vlan_tci=0x1009/0x1 NXM,OXM' \
- 'dl_vlan=9 any' \
- 'vlan_vid=11 any' \
- 'vlan_vid=11/0x1 NXM,OXM' \
- 'dl_vlan_pcp=6 any' \
- 'vlan_pcp=5 any' \
- 'mpls,mpls_label=5 NXM,OXM,OpenFlow11' \
- 'mpls,mpls_tc=1 NXM,OXM,OpenFlow11' \
- '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,OpenFlow11' \
- '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,OpenFlow11' \
- 'ipv6,ipv6_src=::1 NXM,OXM' \
- 'ipv6,ipv6_src=::1/::1 NXM,OXM' \
- 'ipv6,ipv6_dst=::1 NXM,OXM' \
- 'ipv6,ipv6_dst=::1/::1 NXM,OXM' \
- 'ipv6,ipv6_label=5 NXM,OXM' \
- 'ipv6,ipv6_label=5/1 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,ip_dscp=0x3c any' \
- 'ipv6,ip_dscp=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_spa=1.2.3.4/0.0.0.1 NXM,OXM,OpenFlow11' \
- 'arp,arp_tpa=1.2.3.4 any' \
- 'arp,arp_tpa=1.2.3.4/0.0.0.1 NXM,OXM,OpenFlow11' \
- 'arp,arp_sha=00:11:22:33:44:55 NXM,OXM' \
- 'arp,arp_sha=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM' \
- 'arp,arp_tha=00:11:22:33:44:55 NXM,OXM' \
- 'arp,arp_tha=00:11:22:33:44:55/00:ff:ff:ff:ff:ff 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_code=2 any' \
- 'icmp6,icmpv6_type=1 NXM,OXM' \
- 'icmp6,icmpv6_code=2 NXM,OXM'
+ 'pkt_mark=1 NXM,OXM,OXM-OpenFlow14' \
+ 'pkt_mark=1/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg0=0 NXM,OXM,OXM-OpenFlow14' \
+ 'reg0=0/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg1=1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg1=1/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg2=2 NXM,OXM,OXM-OpenFlow14' \
+ 'reg2=2/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg3=3 NXM,OXM,OXM-OpenFlow14' \
+ 'reg3=3/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg4=4 NXM,OXM,OXM-OpenFlow14' \
+ 'reg4=4/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg5=5 NXM,OXM,OXM-OpenFlow14' \
+ 'reg5=5/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg6=6 NXM,OXM,OXM-OpenFlow14' \
+ 'reg6=6/1 NXM,OXM,OXM-OpenFlow14' \
+ 'reg7=7 NXM,OXM,OXM-OpenFlow14' \
+ 'reg7=7/1 NXM,OXM,OXM-OpenFlow14' \
+ 'dl_src=00:11:22:33:44:55 any,OXM-OpenFlow14' \
+ 'dl_src=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'dl_dst=00:11:22:33:44:55 any,OXM-OpenFlow14' \
+ 'dl_dst=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'dl_type=0x1234 any,OXM-OpenFlow14' \
+ 'dl_type=0x0800 any,OXM-OpenFlow14' \
+ 'dl_type=0x0806 any,OXM-OpenFlow14' \
+ 'dl_type=0x86dd any,OXM-OpenFlow14' \
+ 'vlan_tci=0 any,OXM-OpenFlow14' \
+ 'vlan_tci=0x1009 any,OXM-OpenFlow14' \
+ 'vlan_tci=0x1009/0x1 NXM,OXM,OXM-OpenFlow14' \
+ 'dl_vlan=9 any,OXM-OpenFlow14' \
+ 'vlan_vid=11 any,OXM-OpenFlow14' \
+ 'vlan_vid=11/0x1 NXM,OXM,OXM-OpenFlow14' \
+ 'dl_vlan_pcp=6 any,OXM-OpenFlow14' \
+ 'vlan_pcp=5 any,OXM-OpenFlow14' \
+ 'mpls,mpls_label=5 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'mpls,mpls_tc=1 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'mpls,mpls_bos=0 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,ip_src=1.2.3.4 any,OXM-OpenFlow14' \
+ 'ip,ip_src=192.168.0.0/24 any,OXM-OpenFlow14' \
+ 'ip,ip_src=192.0.168.0/255.0.255.0 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'ip,ip_dst=1.2.3.4 any,OXM-OpenFlow14' \
+ 'ip,ip_dst=192.168.0.0/24 any,OXM-OpenFlow14' \
+ 'ip,ip_dst=192.0.168.0/255.0.255.0 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'ipv6,ipv6_src=::1 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ipv6_src=::1/::1 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ipv6_dst=::1 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ipv6_dst=::1/::1 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ipv6_label=5 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ipv6_label=5/1 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,nw_proto=1 any,OXM-OpenFlow14' \
+ 'ipv6,nw_proto=1 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,nw_tos=0xf0 any,OXM-OpenFlow14' \
+ 'ipv6,nw_tos=0xf0 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,ip_dscp=0x3c any,OXM-OpenFlow14' \
+ 'ipv6,ip_dscp=0x3c NXM,OXM,OXM-OpenFlow14' \
+ 'ip,nw_ecn=1 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,nw_ecn=1 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,nw_ttl=5 NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,nw_ttl=5 NXM,OXM,OXM-OpenFlow14' \
+ 'ip,ip_frag=no NXM,OXM,OXM-OpenFlow14' \
+ 'ipv6,ip_frag=no NXM,OXM,OXM-OpenFlow14' \
+ 'arp,arp_op=0 any,OXM-OpenFlow14' \
+ 'arp,arp_spa=1.2.3.4 any,OXM-OpenFlow14' \
+ 'arp,arp_spa=1.2.3.4/0.0.0.1 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'arp,arp_tpa=1.2.3.4 any,OXM-OpenFlow14' \
+ 'arp,arp_tpa=1.2.3.4/0.0.0.1 NXM,OXM,OpenFlow11,OXM-OpenFlow14' \
+ 'arp,arp_sha=00:11:22:33:44:55 NXM,OXM,OXM-OpenFlow14' \
+ 'arp,arp_sha=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM,OXM-OpenFlow14' \
+ 'arp,arp_tha=00:11:22:33:44:55 NXM,OXM,OXM-OpenFlow14' \
+ 'arp,arp_tha=00:11:22:33:44:55/00:ff:ff:ff:ff:ff NXM,OXM,OXM-OpenFlow14' \
+ 'tcp,tcp_src=80 any,OXM-OpenFlow14' \
+ 'tcp,tcp_src=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'tcp6,tcp_src=80 NXM,OXM,OXM-OpenFlow14' \
+ 'tcp6,tcp_src=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'tcp,tcp_dst=80 any,OXM-OpenFlow14' \
+ 'tcp,tcp_dst=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'tcp6,tcp_dst=80 NXM,OXM,OXM-OpenFlow14' \
+ 'tcp6,tcp_dst=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'udp,udp_src=80 any,OXM-OpenFlow14' \
+ 'udp,udp_src=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'udp6,udp_src=80 NXM,OXM,OXM-OpenFlow14' \
+ 'udp6,udp_src=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'udp,udp_dst=80 any,OXM-OpenFlow14' \
+ 'udp,udp_dst=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'udp6,udp_dst=80 NXM,OXM,OXM-OpenFlow14' \
+ 'udp6,udp_dst=0x1000/0x1000 NXM,OXM,OXM-OpenFlow14' \
+ 'icmp,icmp_type=1 any,OXM-OpenFlow14' \
+ 'icmp,icmp_code=2 any,OXM-OpenFlow14' \
+ 'icmp6,icmpv6_type=1 NXM,OXM,OXM-OpenFlow14' \
+ 'icmp6,icmpv6_code=2 NXM,OXM,OXM-OpenFlow14'
do
set $test_case
echo
AT_CHECK([ovs-ofctl parse-flows flows.txt
], [0], [stdout])
AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0],
-[[usable protocols: any
+[[usable protocols: any,OXM-OpenFlow14
chosen protocol: OpenFlow10-table_id
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
AT_CHECK([ovs-ofctl --protocols OpenFlow11 parse-flows flows.txt
], [0], [stdout])
AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0],
-[[usable protocols: any
+[[usable protocols: any,OXM-OpenFlow14
chosen protocol: OpenFlow11
OFPT_FLOW_MOD (OF1.1): ADD tcp,tp_src=123 out_port:5 actions=FLOOD
OFPT_FLOW_MOD (OF1.1): ADD in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop
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: NXM,OXM
+[[usable protocols: NXM,OXM,OXM-OpenFlow14
chosen protocol: OXM-OpenFlow12
OFPT_FLOW_MOD (OF1.2): ADD tcp,tp_src=123 actions=FLOOD
OFPT_FLOW_MOD (OF1.2): ADD in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=set_field:4103->vlan_vid,set_field:2->vlan_pcp
AT_CHECK([ovs-ofctl parse-flows flows.txt
], [0], [stdout])
AT_CHECK([[sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout]], [0],
-[[usable protocols: OXM,NXM+table_id
+[[usable protocols: OXM,NXM+table_id,OXM-OpenFlow14
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=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop
])
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
+usable protocols: NXM,OXM,OXM-OpenFlow14
chosen protocol: NXM-table_id
NXT_FLOW_MOD: ADD tcp,tp_src=123 actions=FLOOD
NXT_FLOW_MOD: ADD in_port=LOCAL,dl_vlan=9,dl_src=00:0a:e4:25:6b:b0 actions=drop
]])
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
+[[usable protocols: NXM,OXM,OXM-OpenFlow14
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
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) is among the allowed flow formats (OpenFlow10)
+ [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM,OXM-OpenFlow14) 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,OpenFlow11) is among the allowed flow formats (OpenFlow10)
+ [1], [], [ovs-ofctl: none of the usable flow formats (NXM,OXM,OpenFlow11,OXM-OpenFlow14) is among the allowed flow formats (OpenFlow10)
])
AT_CLEANUP
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) is among the allowed flow formats (OpenFlow10)
+ [ovs-ofctl: none of the usable flow formats (NXM,OXM,OXM-OpenFlow14) is among the allowed flow formats (OpenFlow10)
])
OVS_VSWITCHD_STOP
AT_CLEANUP
git://git.onelab.eu / sliver-openvswitch.git / blobdiff