X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Fofproto.at;h=5d82ff9116e3a6c9cc168798f4a9af996f9d0ca4;hb=HEAD;hp=54c077d692bc15ca1bfa07f3ea307cdc978c6149;hpb=82c22d34b5f459bc968fd268112d1e33bd103943;p=cascardo%2Fovs.git diff --git a/tests/ofproto.at b/tests/ofproto.at index 54c077d69..5d82ff911 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -11,7 +11,7 @@ OVS_VSWITCHD_START # Start a monitor running OpenFlow 1.0, then send the switch an OF1.1 features # request -AT_CHECK([ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log AT_CAPTURE_FILE([monitor.log]) ovs-appctl -t ovs-ofctl ofctl/send 0205000801234567 @@ -32,7 +32,7 @@ AT_CLEANUP AT_SETUP([ofproto - feature request, config request]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -vwarn show br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPT_FEATURES_REPLY: dpid:fedcba9876543210 n_tables:254, n_buffers:256 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP @@ -82,7 +82,7 @@ dnl It at least checks request and reply serialization and deserialization. AT_SETUP([ofproto - port stats - (OpenFlow 1.0)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -vwarn dump-ports br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_PORT reply: 1 ports port LOCAL: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 tx pkts=0, bytes=0, drop=0, errs=0, coll=0 @@ -93,7 +93,7 @@ AT_CLEANUP AT_SETUP([ofproto - port stats - (OpenFlow 1.2)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn dump-ports br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_PORT reply (OF1.2): 1 ports port LOCAL: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 tx pkts=0, bytes=0, drop=0, errs=0, coll=0 @@ -104,7 +104,7 @@ AT_CLEANUP AT_SETUP([ofproto - port stats - (OpenFlow 1.4)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn dump-ports br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/duration=[[0-9.]]*s/duration=?s/'], +AT_CHECK([strip_xids < stdout | sed 's/duration=[[0-9.]]*s/duration=?s/'], [0], [dnl OFPST_PORT reply (OF1.4): 1 ports port LOCAL: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0 @@ -119,7 +119,7 @@ dnl It at least checks request and reply serialization and deserialization. AT_SETUP([ofproto - port-desc stats (OpenFlow 1.0)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -vwarn dump-ports-desc br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_PORT_DESC reply: LOCAL(br0): addr:aa:55:aa:55:00:00 config: PORT_DOWN @@ -134,7 +134,7 @@ dnl It at least checks request and reply serialization and deserialization. AT_SETUP([ofproto - port-desc stats (OpenFlow 1.2)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn dump-ports-desc br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_PORT_DESC reply (OF1.2): LOCAL(br0): addr:aa:55:aa:55:00:00 config: PORT_DOWN @@ -146,9 +146,9 @@ AT_CLEANUP AT_SETUP([ofproto - port-desc stats (OpenFlow 1.5)]) OVS_VSWITCHD_START -ADD_OF_PORTS([br0], 1, 2, 3) +add_of_ports br0 1 2 3 AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/00:0./00:0x/'], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/00:0./00:0x/'], [0], [dnl OFPST_PORT_DESC reply (OF1.5): 1(p1): addr:aa:55:aa:55:00:0x config: PORT_DOWN @@ -168,7 +168,7 @@ OFPST_PORT_DESC reply (OF1.5): speed: 0 Mbps now, 0 Mbps max ]) AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-ports-desc br0 2], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/00:0./00:0x/'], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/00:0./00:0x/'], [0], [dnl OFPST_PORT_DESC reply (OF1.5): 2(p2): addr:aa:55:aa:55:00:0x config: PORT_DOWN @@ -178,67 +178,70 @@ OFPST_PORT_DESC reply (OF1.5): OVS_VSWITCHD_STOP AT_CLEANUP -dnl This is really bare-bones. -dnl It at least checks request and reply serialization and deserialization. -AT_SETUP([ofproto - queue stats - (OpenFlow 1.0)]) +dnl CHECK_QUEUE_STATS(label, option, format) +m4_define([CHECK_QUEUE_STATS], [ +AT_SETUP([ofproto - queue stats - (OpenFlow $1)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -vwarn queue-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl -OFPST_QUEUE reply: 0 queues -]) -AT_CHECK([ovs-ofctl -vwarn queue-stats br0 ANY 5], [0], - [OFPT_ERROR (xid=0x2): OFPQOFC_BAD_QUEUE -OFPST_QUEUE request (xid=0x2):port=ANY queue=5 -]) -AT_CHECK([ovs-ofctl -vwarn queue-stats br0 10], [0], - [OFPT_ERROR (xid=0x2): OFPQOFC_BAD_PORT -OFPST_QUEUE request (xid=0x2):port=10 queue=ALL + +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 | strip_xids], [0], + [OFPST_QUEUE reply$3: 1 queues + port LOCAL queue 0: bytes=?, pkts=?, errors=?, duration=? ]) -OVS_VSWITCHD_STOP -AT_CLEANUP -AT_SETUP([ofproto - queue stats - (OpenFlow 1.2)]) -OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl -OFPST_QUEUE reply (OF1.2): 0 queues +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 LOCAL | strip_xids], [0], + [OFPST_QUEUE reply$3: 1 queues + port LOCAL queue 0: bytes=?, pkts=?, errors=?, duration=? ]) -AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 ALL 5], [0], - [OFPT_ERROR (OF1.2) (xid=0x2): OFPQOFC_BAD_QUEUE -OFPST_QUEUE request (OF1.2) (xid=0x2):port=ANY queue=5 + +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 LOCAL 0 | strip_xids], [0], + [OFPST_QUEUE reply$3: 1 queues + port LOCAL queue 0: bytes=?, pkts=?, errors=?, duration=? ]) -AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn queue-stats br0 10], [0], - [OFPT_ERROR (OF1.2) (xid=0x2): OFPQOFC_BAD_PORT -OFPST_QUEUE request (OF1.2) (xid=0x2):port=10 queue=ALL + +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 ANY 0 | strip_xids], [0], + [OFPST_QUEUE reply$3: 1 queues + port LOCAL queue 0: bytes=?, pkts=?, errors=?, duration=? ]) -OVS_VSWITCHD_STOP -AT_CLEANUP -AT_SETUP([ofproto - queue stats - (OpenFlow 1.4)]) -OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl -OFPST_QUEUE reply (OF1.4): 0 queues +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 LOCAL 5 | strip_xids], [0], + [OFPT_ERROR$3: OFPQOFC_BAD_QUEUE +OFPST_QUEUE request$3: port=LOCAL queue=5 ]) -AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 ALL 5], [0], - [OFPT_ERROR (OF1.4) (xid=0x2): OFPQOFC_BAD_QUEUE -OFPST_QUEUE request (OF1.4) (xid=0x2):port=ANY queue=5 + +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 ANY 5 | strip_xids], [0], + [OFPT_ERROR$3: OFPQOFC_BAD_QUEUE +OFPST_QUEUE request$3: port=ANY queue=5 ]) -AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn queue-stats br0 10], [0], - [OFPT_ERROR (OF1.4) (xid=0x2): OFPQOFC_BAD_PORT -OFPST_QUEUE request (OF1.4) (xid=0x2):port=10 queue=ALL + +AT_CHECK([ovs-ofctl -O $2 queue-stats br0 10 | strip_xids], [0], + [OFPT_ERROR$3: OFPQOFC_BAD_PORT +OFPST_QUEUE request$3: port=10 queue=ALL ]) OVS_VSWITCHD_STOP AT_CLEANUP +]) +CHECK_QUEUE_STATS([1.0], [OpenFlow10], []) +CHECK_QUEUE_STATS([1.1], [OpenFlow11], [ (OF1.1)]) +CHECK_QUEUE_STATS([1.2], [OpenFlow12], [ (OF1.2)]) +CHECK_QUEUE_STATS([1.3], [OpenFlow13], [ (OF1.3)]) +CHECK_QUEUE_STATS([1.4], [OpenFlow14], [ (OF1.4)]) dnl This is really bare-bones. dnl It at least checks request and reply serialization and deserialization. AT_SETUP([ofproto - queue configuration - (OpenFlow 1.0)]) OVS_VSWITCHD_START -ADD_OF_PORTS([br0], [1], [2]) +add_of_ports br0 1 2 AT_CHECK([ovs-ofctl queue-get-config br0 1], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl +OFPT_QUEUE_GET_CONFIG_REPLY: port=1 +queue 0: +]) +AT_CHECK([ovs-ofctl queue-get-config br0], [0], [stdout]) +AT_CHECK([strip_xids < stdout | sort], [0], [dnl OFPT_QUEUE_GET_CONFIG_REPLY: port=1 +OFPT_QUEUE_GET_CONFIG_REPLY: port=2 +queue 0: +queue 0: ]) AT_CHECK([ovs-ofctl queue-get-config br0 10], [0], [OFPT_ERROR (xid=0x2): OFPQOFC_BAD_PORT @@ -247,16 +250,69 @@ OFPT_QUEUE_GET_CONFIG_REQUEST (xid=0x2): port=10 OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([ofproto - queue configuration - (OpenFlow 1.1)]) +OVS_VSWITCHD_START +add_of_ports br0 1 2 +AT_CHECK([ovs-ofctl -O OpenFlow11 queue-get-config br0 1], [0], [stdout]) +AT_CHECK([strip_xids < stdout], [0], [dnl +OFPT_QUEUE_GET_CONFIG_REPLY (OF1.1): port=1 +queue 0: +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 queue-get-config br0 10 | strip_xids], [0], + [OFPT_ERROR (OF1.1): OFPQOFC_BAD_PORT +OFPT_QUEUE_GET_CONFIG_REQUEST (OF1.1): port=10 +]) +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([ofproto - queue configuration - (OpenFlow 1.2)]) OVS_VSWITCHD_START -ADD_OF_PORTS([br0], [1], [2]) +add_of_ports br0 1 2 AT_CHECK([ovs-ofctl -O OpenFlow12 queue-get-config br0 1], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPT_QUEUE_GET_CONFIG_REPLY (OF1.2): port=1 +queue 0: +]) +AT_CHECK([ovs-ofctl -O OpenFlow12 queue-get-config br0 ANY], [0], [stdout]) +AT_CHECK([strip_xids < stdout], [0], [dnl +OFPT_QUEUE_GET_CONFIG_REPLY (OF1.2): port=ANY +queue 0: +queue 0: +queue 0: +]) +AT_CHECK([ovs-ofctl -O OpenFlow12 queue-get-config br0 10 | strip_xids], [0], + [OFPT_ERROR (OF1.2): OFPQOFC_BAD_PORT +OFPT_QUEUE_GET_CONFIG_REQUEST (OF1.2): port=10 +]) +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - queue configuration - (OpenFlow 1.4)]) +OVS_VSWITCHD_START +add_of_ports br0 1 2 + +AT_CHECK([ovs-ofctl -O OpenFlow14 queue-get-config br0 any | strip_xids], [0], + [OFPST_QUEUE_DESC reply (OF1.4): port=1 +queue 0: +port=LOCAL +queue 0: +port=2 +queue 0: +]) + +AT_CHECK([ovs-ofctl -O OpenFlow14 queue-get-config br0 1 | strip_xids], [0], + [OFPST_QUEUE_DESC reply (OF1.4): port=1 +queue 0: +]) + +AT_CHECK([ovs-ofctl -O OpenFlow14 queue-get-config br0 10 | strip_xids], [0], + [OFPT_ERROR (OF1.4): OFPQOFC_BAD_PORT +OFPST_QUEUE_DESC request (OF1.4): port=10 ]) -AT_CHECK([ovs-ofctl -O OpenFlow12 queue-get-config br0 10], [0], - [OFPT_ERROR (OF1.2) (xid=0x2): OFPQOFC_BAD_PORT -OFPT_QUEUE_GET_CONFIG_REQUEST (OF1.2) (xid=0x2): port=10 + +AT_CHECK([ovs-ofctl -O OpenFlow14 queue-get-config br0 1 2 | strip_xids], [0], + [OFPT_ERROR (OF1.4): OFPQOFC_BAD_QUEUE +OFPST_QUEUE_DESC request (OF1.4): port=1 queue=2 ]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -291,26 +347,26 @@ group_id=1235,type=all,bucket=actions=output:10 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0 ], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): group_id=1234,type=all,bucket=actions=output:10 group_id=1235,type=all,bucket=actions=output:10 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): group_id=1235,type=all,bucket=actions=output:10 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): group_id=1235,type=all,bucket=actions=output:10 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0], [0]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): ]) @@ -343,30 +399,33 @@ dnl Actions definition listed in both supported formats (w/ actions=) AT_SETUP([ofproto - del group (OpenFlow 1.5)]) OVS_VSWITCHD_START AT_DATA([groups.txt], [dnl -group_id=1234,type=select,selection_method=hash,bucket=output:10,bucket=output:11 +group_id=1233,type=select,selection_method=hash,bucket=output:10,bucket=output:11 +group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=output:10,bucket=output:11 group_id=1235,type=all,bucket=actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): - group_id=1234,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 + group_id=1234,type=select,selection_method=hash,fields(eth_dst,ip_dst,tcp_dst),bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 + group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1235,type=all,bucket=bucket_id:2,actions=output:12,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 + group_id=1233,type=select,selection_method=hash,bucket=bucket_id:0,actions=output:10,bucket=bucket_id:1,actions=output:11 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn del-groups br0], [0]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): ]) OVS_VSWITCHD_STOP @@ -383,25 +442,25 @@ group_id=1235,type=all,bucket=output:10 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt]) AT_DATA([flows.txt], [dnl tcp actions=group:1234 -udp actions=group:1235 +table=2 udp actions=group:1235 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flows br0 flows.txt]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort], [0], [dnl + table=2, udp actions=group:1235 tcp actions=group:1234 - udp actions=group:1235 OFPST_FLOW reply (OF1.1): ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort], [0], [dnl - udp actions=group:1235 + table=2, udp actions=group:1235 OFPST_FLOW reply (OF1.1): ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0 group_id=1234]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-flows br0 | ofctl_strip | sort], [0], [dnl - udp actions=group:1235 + table=2, udp actions=group:1235 OFPST_FLOW reply (OF1.1): ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn del-groups br0]) @@ -417,45 +476,83 @@ dnl It at least checks request and reply serialization and deserialization. dnl Actions definition listed in both supported formats (w/ actions=) AT_SETUP([ofproto - insert buckets]) OVS_VSWITCHD_START +# Add group with no buckets. AT_DATA([groups.txt], [dnl -group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11 +group_id=1234,type=all ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl +OFPST_GROUP_DESC reply (OF1.5): + group_id=1234,type=all +]) + +# Add two buckets, using "last". +AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11]) +AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout]) +AT_CHECK([strip_xids < stdout], [0], [dnl +OFPST_GROUP_DESC reply (OF1.5): + group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11 +]) + +# Start over again, then add two buckets using "first". +AT_CHECK([ovs-ofctl -O OpenFlow15 --strict del-groups br0 group_id=1234]) +AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-group br0 group_id=1234,type=all]) +AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11]) +AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout]) +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11 ]) + +# Add two more buckets before the existing ones. AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=first,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11 ]) + +# Add another bucket at the end. AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15 ]) + +# Verify that duplicate bucket IDs are rejected. +AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=last,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15], [1], [], [stderr]) +AT_CHECK([strip_xids < stderr | sed '/truncated/,$d'], [0], [dnl +OFPT_ERROR (OF1.5): OFPGMFC_BUCKET_EXISTS +OFPT_GROUP_MOD (OF1.5): +]) + + +# Add another bucket just before bucket 15. AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15 ]) + +# Add two more buckets just before bucket 11, +# getting the command from a file. AT_DATA([buckets.txt], [dnl group_id=1234,command_bucket_id=11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 - < buckets.txt]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15 ]) + +# Add yet two more buckets. AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn insert-buckets br0 group_id=1234,command_bucket_id=15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:0,actions=output:0,bucket=bucket_id:1,actions=output:1,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:20,actions=output:20,bucket=bucket_id:21,actions=output:21 ]) @@ -480,25 +577,25 @@ group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -F OXM-OpenFlow15 -O OpenFlow15 -vwarn dump-groups br0 1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:10,actions=output:10,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:16,actions=output:16 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=first]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15,bucket=bucket_id:16,actions=output:16 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:13,actions=output:13,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=13]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all,bucket=bucket_id:11,actions=output:11,bucket=bucket_id:12,actions=output:12,bucket=bucket_id:14,actions=output:14,bucket=bucket_id:15,actions=output:15 ]) @@ -507,7 +604,7 @@ group_id=1234 ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 - < buckets.txt]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.5): group_id=1234,type=all ]) @@ -515,7 +612,7 @@ AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,comman AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=last]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=all]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn remove-buckets br0 group_id=1234,command_bucket_id=1], [1], [], [stderr]) -AT_CHECK([cat stderr | ofctl_strip], [0], [dnl +AT_CHECK([ofctl_strip < stderr], [0], [dnl OFPT_ERROR (OF1.5): OFPGMFC_UNKNOWN_BUCKET OFPT_GROUP_MOD (OF1.5): REMOVE_BUCKET command_bucket_id:1,group_id=1234 @@ -548,7 +645,7 @@ AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1235'], # # This 'sed' command captures the error message but drops details. AT_CHECK([sed '/truncated/d -/^000000.0/d' stderr | STRIP_XIDS], [0], +/^000000.0/d' stderr | strip_xids], [0], [OFPT_ERROR (OF1.1): OFPBAC_BAD_OUT_GROUP OFPT_FLOW_MOD (OF1.1): ]) @@ -561,7 +658,7 @@ AT_SETUP([ofproto - group description]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10], [0], [stdout]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): group_id=1234,type=all,bucket=actions=output:10 ]) @@ -574,7 +671,7 @@ AT_SETUP([ofproto - group description]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-group br0 group_id=1234,type=all,bucket=output:10]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-groups br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_DESC reply (OF1.1): group_id=1234,type=all,bucket=actions=output:10 ]) @@ -586,7 +683,7 @@ dnl It at least checks request and reply serialization and deserialization. AT_SETUP([ofproto - group features]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn dump-group-features br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout], [0], [dnl +AT_CHECK([strip_xids < stdout], [0], [dnl OFPST_GROUP_FEATURES reply (OF1.2): Group table: Types: 0xf @@ -618,12 +715,12 @@ group_id=1235,type=all,bucket=output:10 AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=group:1234']) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0 group_id=1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sort], [0], [dnl group_id=1234,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.1): ]) AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn dump-group-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sort], [0], [dnl group_id=1234,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 group_id=1235,ref_count=0,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.1): @@ -642,12 +739,12 @@ group_id=1235,type=all,bucket=output:10 AT_CHECK([ovs-ofctl -O OpenFlow13 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -O OpenFlow13 -vwarn add-flow br0 'tcp actions=group:1234']) AT_CHECK([ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0 group_id=1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl group_id=1234,duration=?s,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.3): ]) AT_CHECK([ovs-ofctl -O OpenFlow13 -vwarn dump-group-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl group_id=1234,duration=?s,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 group_id=1235,duration=?s,ref_count=0,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.3): @@ -666,12 +763,12 @@ group_id=1235,type=all,bucket=output:10 AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-groups br0 groups.txt]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn add-flow br0 'tcp actions=group:1234']) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0 group_id=1234], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl group_id=1234,duration=?s,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.5): ]) AT_CHECK([ovs-ofctl -O OpenFlow15 -vwarn dump-group-stats br0], [0], [stdout]) -AT_CHECK([STRIP_XIDS stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl +AT_CHECK([strip_xids < stdout | sed 's/duration=[[0-9.]]*s/duration=?s/' | sort], [0], [dnl group_id=1234,duration=?s,ref_count=1,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 group_id=1235,duration=?s,ref_count=0,packet_count=0,byte_count=0,bucket0:packet_count=0,byte_count=0 OFPST_GROUP reply (OF1.5): @@ -711,7 +808,7 @@ do command=$[1] config=`echo $[2] | sed 's/,/ /g'` state=$[3] AT_CHECK([ovs-ofctl -vwarn mod-port br0 br0 $command]) AT_CHECK([ovs-ofctl -vwarn show br0], [0], [stdout]) - AT_CHECK_UNQUOTED([STRIP_XIDS stdout], [0], [dnl + AT_CHECK_UNQUOTED([strip_xids < stdout], [0], [dnl OFPT_FEATURES_REPLY: dpid:fedcba9876543210 n_tables:254, n_buffers:256 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP @@ -743,7 +840,7 @@ do command=$[1] config=`echo $[2] | sed 's/,/ /g'` state=$[3] AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn mod-port br0 br0 $command]) AT_CHECK([ovs-ofctl -O OpenFlow12 -vwarn show br0], [0], [stdout]) - AT_CHECK_UNQUOTED([STRIP_XIDS stdout], [0], [dnl + AT_CHECK_UNQUOTED([strip_xids < stdout], [0], [dnl OFPT_FEATURES_REPLY (OF1.2): dpid:fedcba9876543210 n_tables:254, n_buffers:256 capabilities: FLOW_STATS TABLE_STATS PORT_STATS GROUP_STATS QUEUE_STATS @@ -774,7 +871,7 @@ do command=$[1] config=`echo $[2] | sed 's/,/ /g'` state=$[3] AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 br0 $command]) AT_CHECK([ovs-ofctl -O OpenFlow14 -vwarn show br0], [0], [stdout]) - AT_CHECK_UNQUOTED([STRIP_XIDS stdout], [0], [dnl + AT_CHECK_UNQUOTED([strip_xids < stdout], [0], [dnl OFPT_FEATURES_REPLY (OF1.4): dpid:fedcba9876543210 n_tables:254, n_buffers:256 capabilities: FLOW_STATS TABLE_STATS PORT_STATS GROUP_STATS QUEUE_STATS @@ -802,7 +899,7 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl table=1, in_port=4 actions=output:3 NXST_FLOW reply: ]) -AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl +AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | strip_xids], [0], [dnl NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2 ]) AT_CHECK([ovs-ofctl del-flows br0]) @@ -824,7 +921,7 @@ AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], [dn table=1, in_port=4 actions=output:3 OFPST_FLOW reply: ]) -AT_CHECK([ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl +AT_CHECK([ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | strip_xids], [0], [dnl OFPST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2 ]) AT_CHECK([ovs-ofctl -F openflow10 del-flows br0]) @@ -833,6 +930,41 @@ AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [OFPST_FLO OVS_VSWITCHD_STOP AT_CLEANUP +# It's really dumb that check_overlap and reset_counts are considered +# part of flow state, but OpenFlow implies that it is, and OFTest and +# some users insist on it. +AT_SETUP([ofproto - add-flow and flags]) +OVS_VSWITCHD_START +AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 check_overlap,in_port=1,actions=drop]) +# Prior to OF1.3, flow dumps didn't include a "flags" field. +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply: + in_port=1 actions=drop +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply (OF1.1): + in_port=1 actions=drop +]) +AT_CHECK([ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply (OF1.2): + in_port=1 actions=drop +]) +# OF1.3 makes the flags visible. +AT_CHECK([ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply (OF1.3): + check_overlap reset_counts in_port=1 actions=drop +]) +AT_CHECK([ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply (OF1.4): + check_overlap reset_counts in_port=1 actions=drop +]) +AT_CHECK([ovs-ofctl -O OpenFlow15 dump-flows br0 | ofctl_strip], [0], [dnl +OFPST_FLOW reply (OF1.5): + check_overlap reset_counts in_port=1 actions=drop +]) +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([ofproto - basic flow_mod commands (OpenFlow 1.1)]) OVS_VSWITCHD_START AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [OFPST_FLOW reply (OF1.1): @@ -846,7 +978,7 @@ AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], [dn table=1, in_port=4 actions=output:3 OFPST_FLOW reply (OF1.1): ]) -AT_CHECK([ovs-ofctl -O OpenFlow11 dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-aggregate br0 table=0 | strip_xids], [0], [dnl OFPST_AGGREGATE reply (OF1.1): packet_count=0 byte_count=0 flow_count=2 ]) AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0]) @@ -926,14 +1058,14 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl cookie=0x3, in_port=3 actions=output:1 NXST_FLOW reply: ]) -AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl +AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | strip_xids], [0], [dnl NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=3 ]) AT_CHECK([ovs-ofctl dump-flows br0 cookie=0x3/-1 | ofctl_strip | sort], [0], [dnl cookie=0x3, in_port=3 actions=output:1 NXST_FLOW reply: ]) -AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | STRIP_XIDS], [0], [dnl +AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | strip_xids], [0], [dnl NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=1 ]) OVS_VSWITCHD_STOP @@ -1304,15 +1436,126 @@ OFPST_FLOW reply (OF1.2): OVS_VSWITCHD_STOP AT_CLEANUP +AT_SETUP([ofproto - flow_mod with out_port matching (OpenFlow 1.0)]) +OVS_VSWITCHD_START +AT_DATA([flows.txt], [dnl + in_port=1 actions=output:2 + in_port=2 actions=output:1,output:2,output:3 + in_port=3 actions=output:3,output:1,output:2 + in_port=4 actions=drop + in_port=5 actions=output:3 + in_port=6 actions=output:1 +]) +AT_CHECK([ovs-ofctl -F openflow10 add-flows br0 flows.txt]) +(cat flows.txt; echo 'OFPST_FLOW reply:') > expout +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +(grep 'output:2' flows.txt; echo 'OFPST_FLOW reply:') > expout +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 out_port=2 | ofctl_strip | sort], [0], [expout]) + +AT_CHECK([ovs-ofctl -F openflow10 del-flows br0 out_port=2]) +(grep -v 'output:2' flows.txt; echo 'OFPST_FLOW reply:') > expout +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -F openflow10 del-flows br0 out_port=3]) +(grep -v 'output:[[23]]' flows.txt; echo 'OFPST_FLOW reply:') > expout +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -F openflow10 del-flows br0 out_port=1]) +(grep -v 'output:[[123]]' flows.txt; echo 'OFPST_FLOW reply:') > expout +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - flow_mod with out_port matching (OpenFlow 1.1)]) +OVS_VSWITCHD_START +AT_DATA([flows.txt], [dnl + in_port=1 actions=output:2 + in_port=2 actions=output:1,write_actions(output:2,output:3) + in_port=3 actions=output:3,output:1,write_actions(output:2) + in_port=4 actions=drop + in_port=5 actions=write_actions(output:3) + in_port=6 actions=output:1 +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 add-flows br0 flows.txt]) +(cat flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +(grep 'output:2' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 out_port=2 | ofctl_strip | sort], [0], [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_port=2]) +(grep -v 'output:2' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_port=3]) +(grep -v 'output:[[23]]' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_port=1]) +(grep -v 'output:[[123]]' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - flow_mod with out_group matching (OpenFlow 1.1)]) +OVS_VSWITCHD_START +AT_DATA([groups.txt], [dnl +group_id=1,type=all,bucket=output:10 +group_id=2,type=all,bucket=output:10 +group_id=3,type=all,bucket=output:10 +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 add-groups br0 groups.txt]) +AT_DATA([flows.txt], [dnl + in_port=1 actions=group:2,output:5 + in_port=2 actions=group:1,write_actions(group:2,group:3,output:6) + in_port=3 actions=group:3,group:1,write_actions(group:2,output:3) + in_port=4 actions=output:4 + in_port=5 actions=write_actions(output:4,group:3) + in_port=6 actions=group:1 +]) +AT_CHECK([ovs-ofctl -O OpenFlow11 add-flows br0 flows.txt]) +(cat flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +(grep 'output:3' flows.txt | grep 'group:2'; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 out_port=3,out_group=2 | ofctl_strip | sort], [0], [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_group=2]) +(grep -v 'group:2' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_group=3]) +(grep -v 'group:[[23]]' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +AT_CHECK([ovs-ofctl -O OpenFlow11 del-flows br0 out_group=1]) +(grep -v 'group:[[123]]' flows.txt; echo 'OFPST_FLOW reply (OF1.1):') > expout +AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip | sort], [0], + [expout]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + AT_SETUP([ofproto - flow table configuration (OpenFlow 1.0)]) OVS_VSWITCHD_START # Check the default configuration. -(printf "OFPST_TABLE reply (xid=0x2):" - x=0 - name=classifier - while test $x -lt 254; do - printf " - table %d (\"%s\"): +head_table() { + printf 'OFPST_TABLE reply (xid=0x2): + table 0 ("%s"): active=0, lookup=0, matched=0 max_entries=1000000 matching: @@ -1328,10 +1571,15 @@ OVS_VSWITCHD_START nw_tos: exact match or wildcard tcp_src: exact match or wildcard tcp_dst: exact match or wildcard -" $x $name - x=`expr $x + 1` - name=table$x - done) > expout + +' $1 +} +ditto() { + for i in `seq $1 $2`; do + printf ' table %d ("table%d"): ditto\n' $i $i + done +} +(head_table classifier; ditto 1 253) > expout AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout]) # Change the configuration. AT_CHECK( @@ -1344,9 +1592,16 @@ AT_CHECK( <1> ]) # Check that the configuration was updated. -mv expout orig-expout -sed -e 's/classifier/main/ -21s/1000000/1024/' orig-expout > expout +(head_table main; echo ' table 1 ("table1"): + active=0, lookup=0, matched=0 + max_entries=1024 + (same matching) + + table 2 ("table2"): + active=0, lookup=0, matched=0 + max_entries=1000000 + (same matching) +'; ditto 3 253) > expout AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -1374,12 +1629,9 @@ AT_CHECK([ovs-appctl bridge/dump-flows br0], [0], [stdout]) AT_CHECK([test `grep '240\.0\.0\.1' stdout | grep -v table_id= | wc -l` -gt 0]) # Check that dump-tables doesn't count the hidden flows. -(printf "OFPST_TABLE reply (xid=0x2):" - x=0 - name=classifier - while test $x -lt 254; do - printf " - table %d (\"%s\"): +head_table() { + printf 'OFPST_TABLE reply (xid=0x2): + table 0 ("%s"): active=0, lookup=0, matched=0 max_entries=1000000 matching: @@ -1395,37 +1647,34 @@ AT_CHECK([test `grep '240\.0\.0\.1' stdout | grep -v table_id= | wc -l` -gt 0]) nw_tos: exact match or wildcard tcp_src: exact match or wildcard tcp_dst: exact match or wildcard -" $x $name - x=`expr $x + 1` - name=table$x - done) > expout + +' $1 +} +ditto() { + for i in `seq $1 $2`; do + printf ' table %d ("table%d"): ditto\n' $i $i + done +} +(head_table classifier; ditto 1 253) > expout AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout]) -OVS_VSWITCHD_STOP(["/cannot find route for controller/d"]) +OVS_VSWITCHD_STOP(["/240\.0\.0\.1/d"]) AT_CLEANUP AT_SETUP([ofproto - flow table configuration (OpenFlow 1.2)]) OVS_VSWITCHD_START # Check the default configuration. -(printf "OFPST_TABLE reply (OF1.2) (xid=0x2):" - x=0 - name=classifier - while test $x -lt 254; do - if test $x = 253; then - goto= - else - goto=,goto_table - fi - echo " - table $x (\"$name\"): +head_table() { + printf 'OFPST_TABLE reply (OF1.2) (xid=0x2): + table 0 ("%s"): active=0, lookup=0, matched=0 metadata: match=0xffffffffffffffff write=0xffffffffffffffff config=controller max_entries=1000000 instructions (table miss and others): - instructions: apply_actions,clear_actions,write_actions,write_metadata$goto + instructions: apply_actions,clear_actions,write_actions,write_metadata,goto_table Write-Actions and Apply-Actions features: actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue - supported on Set-Field: metadata in_port_oxm eth_src eth_dst vlan_vid vlan_pcp mpls_label mpls_tc ip_src ip_dst ipv6_src ipv6_dst ipv6_label ip_dscp nw_ecn arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst nd_target nd_sll nd_tll + supported on Set-Field: metadata in_port_oxm eth_src eth_dst vlan_vid vlan_pcp mpls_label mpls_tc ip_src ip_dst ipv6_src ipv6_dst ipv6_label ip_dscp nw_ecn arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst icmp_type icmp_code icmpv6_type icmpv6_code nd_target nd_sll nd_tll matching: metadata: exact match or wildcard in_port_oxm: exact match or wildcard @@ -1461,10 +1710,28 @@ OVS_VSWITCHD_START icmpv6_code: exact match or wildcard nd_target: exact match or wildcard nd_sll: exact match or wildcard - nd_tll: exact match or wildcard" - x=`expr $x + 1` - name=table$x - done) > expout + nd_tll: exact match or wildcard + +' $1 +} +ditto() { + for i in `seq $1 $2`; do + printf ' table %d ("table%d"): ditto\n' $i $i + done +} +tail_table() { + printf ' table 253 ("table253"): + active=0, lookup=0, matched=0 + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + config=controller + max_entries=1000000 + instructions (table miss and others): + instructions: apply_actions,clear_actions,write_actions,write_metadata + (same actions) + (same matching) +' +} +(head_table classifier; ditto 1 252; tail_table) > expout AT_CHECK([ovs-ofctl -O OpenFlow12 dump-tables br0], [0], [expout]) # Change the configuration. AT_CHECK( @@ -1477,40 +1744,40 @@ AT_CHECK( <1> ]) # Check that the configuration was updated. -mv expout orig-expout -sed 's/classifier/main/ -53s/1000000/1024/' < orig-expout > expout +(head_table main; echo ' table 1 ("table1"): + active=0, lookup=0, matched=0 + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + config=controller + max_entries=1024 + (same instructions) + (same matching) + + table 2 ("table2"): + active=0, lookup=0, matched=0 + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + config=controller + max_entries=1000000 + (same instructions) + (same matching) +'; ditto 3 252; tail_table) > expout AT_CHECK([ovs-ofctl -O OpenFlow12 dump-tables br0], [0], [expout]) OVS_VSWITCHD_STOP AT_CLEANUP AT_SETUP([ofproto - table features (OpenFlow 1.3)]) OVS_VSWITCHD_START -(x=0 - name=classifier - while test $x -lt 254; do - y=`expr $x + 1` - if test $x = 253; then - next= - goto= - else - goto=,goto_table - if test $x = 252; then - next=' - next tables: 253' - else - next=" - next tables: $y-253" - fi - fi - echo " table $x (\"$name\"): +head_table () { + printf ' table 0 ("%s"): metadata: match=0xffffffffffffffff write=0xffffffffffffffff max_entries=1000000 - instructions (table miss and others):$next - instructions: meter,apply_actions,clear_actions,write_actions,write_metadata$goto + instructions (table miss and others): + next tables: 1-253 + instructions: meter,apply_actions,clear_actions,write_actions,write_metadata,goto_table Write-Actions and Apply-Actions features: actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue - supported on Set-Field: tun_id tun_src tun_dst tun_gbp_id tun_gbp_flags tun_metadata0 tun_metadata1 tun_metadata2 tun_metadata3 tun_metadata4 tun_metadata5 tun_metadata6 tun_metadata7 tun_metadata8 tun_metadata9 tun_metadata10 tun_metadata11 tun_metadata12 tun_metadata13 tun_metadata14 tun_metadata15 tun_metadata16 tun_metadata17 tun_metadata18 tun_metadata19 tun_metadata20 tun_metadata21 tun_metadata22 tun_metadata23 tun_metadata24 tun_metadata25 tun_metadata26 tun_metadata27 tun_metadata28 tun_metadata29 tun_metadata30 tun_metadata31 tun_metadata32 tun_metadata33 tun_metadata34 tun_metadata35 tun_metadata36 tun_metadata37 tun_metadata38 tun_metadata39 tun_metadata40 tun_metadata41 tun_metadata42 tun_metadata43 tun_metadata44 tun_metadata45 tun_metadata46 tun_metadata47 tun_metadata48 tun_metadata49 tun_metadata50 tun_metadata51 tun_metadata52 tun_metadata53 tun_metadata54 tun_metadata55 tun_metadata56 tun_metadata57 tun_metadata58 tun_metadata59 tun_metadata60 tun_metadata61 tun_metadata62 tun_metadata63 metadata in_port in_port_oxm pkt_mark reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 xreg0 xreg1 xreg2 xreg3 eth_src eth_dst vlan_tci vlan_vid vlan_pcp mpls_label mpls_tc ip_src ip_dst ipv6_src ipv6_dst ipv6_label nw_tos ip_dscp nw_ecn nw_ttl arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst nd_target nd_sll nd_tll + supported on Set-Field: tun_id tun_src tun_dst tun_ipv6_src tun_ipv6_dst tun_flags tun_gbp_id tun_gbp_flags tun_metadata0 dnl +tun_metadata1 tun_metadata2 tun_metadata3 tun_metadata4 tun_metadata5 tun_metadata6 tun_metadata7 tun_metadata8 tun_metadata9 tun_metadata10 tun_metadata11 tun_metadata12 tun_metadata13 tun_metadata14 tun_metadata15 tun_metadata16 tun_metadata17 tun_metadata18 tun_metadata19 tun_metadata20 tun_metadata21 tun_metadata22 tun_metadata23 tun_metadata24 tun_metadata25 tun_metadata26 tun_metadata27 tun_metadata28 tun_metadata29 tun_metadata30 tun_metadata31 tun_metadata32 tun_metadata33 tun_metadata34 tun_metadata35 tun_metadata36 tun_metadata37 tun_metadata38 tun_metadata39 tun_metadata40 tun_metadata41 tun_metadata42 tun_metadata43 tun_metadata44 tun_metadata45 tun_metadata46 tun_metadata47 tun_metadata48 tun_metadata49 tun_metadata50 tun_metadata51 tun_metadata52 tun_metadata53 tun_metadata54 tun_metadata55 tun_metadata56 tun_metadata57 tun_metadata58 tun_metadata59 tun_metadata60 tun_metadata61 tun_metadata62 tun_metadata63 dnl +metadata in_port in_port_oxm pkt_mark ct_mark ct_label reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 xreg0 xreg1 xreg2 xreg3 eth_src eth_dst vlan_tci vlan_vid vlan_pcp mpls_label mpls_tc mpls_ttl ip_src ip_dst ipv6_src ipv6_dst ipv6_label nw_tos ip_dscp nw_ecn nw_ttl arp_op arp_spa arp_tpa arp_sha arp_tha tcp_src tcp_dst udp_src udp_dst sctp_src sctp_dst icmp_type icmp_code icmpv6_type icmpv6_code nd_target nd_sll nd_tll matching: dp_hash: arbitrary mask recirc_id: exact match or wildcard @@ -1518,6 +1785,9 @@ OVS_VSWITCHD_START tun_id: arbitrary mask tun_src: arbitrary mask tun_dst: arbitrary mask + tun_ipv6_src: arbitrary mask + tun_ipv6_dst: arbitrary mask + tun_flags: arbitrary mask tun_gbp_id: arbitrary mask tun_gbp_flags: arbitrary mask tun_metadata0: arbitrary mask @@ -1589,6 +1859,10 @@ OVS_VSWITCHD_START in_port_oxm: exact match or wildcard actset_output: exact match or wildcard pkt_mark: arbitrary mask + ct_state: arbitrary mask + ct_zone: exact match or wildcard + ct_mark: arbitrary mask + ct_label: arbitrary mask reg0: arbitrary mask reg1: arbitrary mask reg2: arbitrary mask @@ -1610,6 +1884,7 @@ OVS_VSWITCHD_START mpls_label: exact match or wildcard mpls_tc: exact match or wildcard mpls_bos: exact match or wildcard + mpls_ttl: exact match or wildcard ip_src: arbitrary mask ip_dst: arbitrary mask ipv6_src: arbitrary mask @@ -1639,12 +1914,47 @@ OVS_VSWITCHD_START icmpv6_code: exact match or wildcard nd_target: arbitrary mask nd_sll: arbitrary mask - nd_tll: arbitrary mask" - x=$y - name=table$x - done) > expout -AT_CHECK([ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^$/d -/^OFPST_TABLE_FEATURES/d'], [0], [expout]) + nd_tll: arbitrary mask + +' $1 +} +ditto() { + printf ' table %d ("%s"): + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + max_entries=%d + instructions (table miss and others): + next tables: %d-253 + (same instructions) + (same actions) + (same matching) + +' $1 $2 $3 `expr $1 + 1` +} +tail_tables() { +echo ' table 252 ("table252"): + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + max_entries=1000000 + instructions (table miss and others): + next tables: 253 + (same instructions) + (same actions) + (same matching) + + table 253 ("table253"): + metadata: match=0xffffffffffffffff write=0xffffffffffffffff + max_entries=1000000 + instructions (table miss and others): + instructions: meter,apply_actions,clear_actions,write_actions,write_metadata + (same actions) + (same matching) +' +} +(head_table classifier + for i in `seq 1 251`; do + ditto $i table$i 1000000 + done + tail_tables) > expout +AT_CHECK([ovs-ofctl -O OpenFlow13 dump-table-features br0], [0], [expout]) # Change the configuration. AT_CHECK( [ovs-vsctl \ @@ -1656,11 +1966,43 @@ AT_CHECK( <1> ]) # Check that the configuration was updated. +(head_table main + ditto 1 table1 1024 + for i in `seq 2 251`; do + ditto $i table$i 1000000 + done + tail_tables) > expout +AT_CHECK([ovs-ofctl -O OpenFlow13 dump-table-features br0], [0], [expout]) +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - table description (OpenFlow 1.4)]) +OVS_VSWITCHD_START +(x=0 + while test $x -lt 254; do + y=`expr $x + 1` + echo " table $x: + eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME + vacancy=off" + x=$y + done) > expout +AT_CHECK([ovs-ofctl -O OpenFlow14 dump-table-desc br0 | sed '/^$/d +/^OFPST_TABLE_DESC/d'], [0], [expout]) + +# Change the configuration. +AT_CHECK([ovs-ofctl -O Openflow14 mod-table br0 0 evict]) +# Check that the configuration was updated. +mv expout orig-expout +sed -e '2s/eviction=off/eviction=on/' expout +AT_CHECK([ovs-ofctl -O OpenFlow14 dump-table-desc br0 | sed '/^$/d +/^OFPST_TABLE_DESC/d'], [0], [expout]) + +AT_CHECK([ovs-ofctl -O Openflow14 mod-table br0 0 vacancy:20,80]) +# Check that the configuration was updated. mv expout orig-expout -sed 's/classifier/main/ -141s/1000000/1024/' < orig-expout > expout -AT_CHECK([ovs-ofctl -O OpenFlow13 dump-table-features br0 | sed '/^$/d -/^OFPST_TABLE_FEATURES/d'], [0], [expout]) +sed -e '3s/vacancy=off/vacancy=on vacancy_down=20% vacancy_up=80% vacancy=100%/' expout +AT_CHECK([ovs-ofctl -O OpenFlow14 dump-table-desc br0 | sed '/^$/d +/^OFPST_TABLE_DESC/d'], [0], [expout]) OVS_VSWITCHD_STOP AT_CLEANUP @@ -2182,7 +2524,7 @@ AT_CLEANUP AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.0)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -P standard monitor br0 --detach --no-chdir --pidfile]) check_async () { printf '\n\n--- check_async %d ---\n\n\n' $1 shift @@ -2285,7 +2627,7 @@ AT_CLEANUP AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.2)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow12 -P standard monitor br0 --detach --no-chdir --pidfile]) check_async () { printf '\n\n--- check_async %d ---\n\n\n' $1 INDEX=$1 @@ -2342,8 +2684,7 @@ udp,vlan_tci=0x0000,dl_src=00:26:b9:8c:b0:f9,dl_dst=00:25:83:df:b4:00,nw_src=172 fi AT_FAIL_IF([test X"$1" != X]) - ovs-appctl -t ovs-ofctl ofctl/barrier - echo >>expout "OFPT_BARRIER_REPLY (OF1.2):" + sleep 1 AT_CHECK( [[sed ' @@ -2389,7 +2730,7 @@ AT_CLEANUP AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.3)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow13 -P standard monitor br0 --detach --no-chdir --pidfile]) check_async () { printf '\n\n--- check_async %d ---\n\n\n' $1 INDEX=$1 @@ -2496,9 +2837,9 @@ ovs-appctl -t ovs-ofctl exit OVS_VSWITCHD_STOP AT_CLEANUP -AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.5)]) +AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.4)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow14 -P standard monitor br0 --detach --no-chdir --pidfile]) check_async () { printf '\n\n--- check_async %d ---\n\n\n' $1 INDEX=$1 @@ -2508,26 +2849,44 @@ check_async () { ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log : > expout - # Other tests are not working with OF 1.5, and message - # format may change, so leave them out. + # OFPT_PACKET_IN, OFPR_ACTION (controller_id=0) + ovs-ofctl -O OpenFlow14 -v packet-out br0 none controller '0001020304050010203040501234' + if test X"$1" = X"OFPR_ACTION"; then shift; + echo >>expout "OFPT_PACKET_IN (OF1.4): total_len=14 in_port=ANY (via action) data_len=14 (unbuffered) +vlan_tci=0x0000,dl_src=00:10:20:30:40:50,dl_dst=00:01:02:03:04:05,dl_type=0x1234" + fi - # OFPT_PORT_STATUS, OFPPR_ADD + # OFPT_PACKET_IN, OFPR_NO_MATCH (controller_id=123) + ovs-ofctl -O OpenFlow14 -v packet-out br0 none 'controller(reason=no_match,id=123)' '0001020304050010203040501234' + if test X"$1" = X"OFPR_NO_MATCH"; then shift; + echo >>expout "OFPT_PACKET_IN (OF1.4): total_len=14 in_port=ANY (via no_match) data_len=14 (unbuffered) +vlan_tci=0x0000,dl_src=00:10:20:30:40:50,dl_dst=00:01:02:03:04:05,dl_type=0x1234" + fi + + # OFPT_PACKET_IN, OFPR_INVALID_TTL (controller_id=0) + ovs-ofctl -O OpenFlow14 packet-out br0 none dec_ttl '002583dfb4000026b98cb0f908004500003eb7e200000011339bac11370dac100002d7730035002b8f6d86fb0100000100000000000006626c702d7873066e696369726103636f6d00000f00' + if test X"$1" = X"OFPR_INVALID_TTL"; then shift; + echo >>expout "OFPT_PACKET_IN (OF1.4): total_len=76 in_port=ANY (via invalid_ttl) data_len=76 (unbuffered) +udp,vlan_tci=0x0000,dl_src=00:26:b9:8c:b0:f9,dl_dst=00:25:83:df:b4:00,nw_src=172.17.55.13,nw_dst=172.16.0.2,nw_tos=0,nw_ecn=0,nw_ttl=0,tp_src=55155,tp_dst=53 udp_csum:8f6d" + fi + +# OFPT_PORT_STATUS, OFPPR_ADD ovs-vsctl add-port br0 test -- set Interface test type=dummy if test X"$1" = X"OFPPR_ADD"; then shift; - echo >>expout "OFPT_PORT_STATUS (OF1.5): ADD: ${INDEX}(test): addr:aa:55:aa:55:00:0x + echo >>expout "OFPT_PORT_STATUS (OF1.4): ADD: ${INDEX}(test): addr:aa:55:aa:55:00:0x config: PORT_DOWN state: LINK_DOWN speed: 0 Mbps now, 0 Mbps max" fi # OFPT_PORT_STATUS, OFPPR_MODIFY - ovs-ofctl -O OpenFlow15 -vwarn mod-port br0 test up + ovs-ofctl -O OpenFlow14 -vwarn mod-port br0 test up if test X"$1" = X"OFPPR_MODIFY"; then shift; - echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x + echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x config: 0 state: LINK_DOWN speed: 0 Mbps now, 0 Mbps max -OFPT_PORT_STATUS (OF1.5): MOD: 2(test): addr:aa:55:aa:55:00:0x +OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x config: 0 state: 0 speed: 0 Mbps now, 0 Mbps max" @@ -2536,16 +2895,109 @@ OFPT_PORT_STATUS (OF1.5): MOD: 2(test): addr:aa:55:aa:55:00:0x # OFPT_PORT_STATUS, OFPPR_DELETE ovs-vsctl del-port br0 test if test X"$1" = X"OFPPR_DELETE"; then shift; - echo >>expout "OFPT_PORT_STATUS (OF1.5): DEL: ${INDEX}(test): addr:aa:55:aa:55:00:0x + echo >>expout "OFPT_PORT_STATUS (OF1.4): DEL: ${INDEX}(test): addr:aa:55:aa:55:00:0x config: 0 state: 0 speed: 0 Mbps now, 0 Mbps max" fi + # OFPT_FLOW_REMOVED, OFPRR_DELETE + ovs-ofctl -O OpenFlow14 add-flow br0 send_flow_rem,actions=drop + ovs-ofctl -O OpenFlow14 --strict del-flows br0 '' + if test X"$1" = X"OFPRR_DELETE"; then shift; + echo >>expout "OFPT_FLOW_REMOVED (OF1.4): reason=delete table_id=0" + fi + + # OFPT_FLOW_REMOVED, OFPRR_GROUP_DELETE + ovs-ofctl -O OpenFlow14 add-group br0 group_id=1234,type=all,bucket=output:10 + ovs-ofctl -O OpenFlow14 add-flow br0 send_flow_rem,actions=group:1234 + ovs-ofctl -O OpenFlow14 --strict del-groups br0 group_id=1234 + if test X"$1" = X"OFPRR_GROUP_DELETE"; then shift; + echo >>expout "OFPT_FLOW_REMOVED (OF1.4): reason=group_delete table_id=0" + fi + + # OFPT_TABLE_STATUS, OFPTR_VACANCY_UP + if test X"$1" = X"OFPTR_VACANCY_UP"; then shift; + ovs-vsctl -- --id=@t1 create Flow_Table flow-limit=10 -- set bridge br0 flow_tables:1=@t1 + + # Turn on vacancy events, then add flows until we're full. + # With initial vacancy of 100% and vacancy_up of 80%, so that + # vacancy >= vacancy_up, this enables VACANY_DOWN events, so + # we get a single such message when vacancy dips below 20%. + ovs-ofctl -O OpenFlow14 mod-table br0 1 vacancy:20,80 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=1,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=2,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=3,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=4,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=5,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=6,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=7,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=8,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=9,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=10,actions=2 + echo >>expout "OFPT_TABLE_STATUS (OF1.4): reason=VACANCY_DOWN +table_desc:- + table 1: + eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME + vacancy=on vacancy_down=20% vacancy_up=80% vacancy=10%" + # Then delete flows until we're empty. Sending the + # VACANCY_DOWN message enabled VACANCY_UP events, so we get a + # single such message when vacancy rises above 80%. + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=1 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=2 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=3 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=4 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=5 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=6 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=7 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=8 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=9 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=10 + echo >>expout "OFPT_TABLE_STATUS (OF1.4): reason=VACANCY_UP +table_desc:- + table 1: + eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME + vacancy=on vacancy_down=20% vacancy_up=80% vacancy=90%" + + # Now approach vacancy from the other direction. First + # disable vacancy events. With initial vacancy of 70%, so + # that vacancy < vacancy_up, this enables VACANCY_UP events. + # That means that filling up the table generates no message, + # but deleting all the flows generates VACANCY_UP at the point + # vacancy rises above 80%. + ovs-ofctl -O OpenFlow14 mod-table br0 1 novacancy + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=1,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=2,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=3,actions=2 + ovs-ofctl -O OpenFlow14 mod-table br0 1 vacancy:20,80 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=4,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=5,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=6,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=7,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=8,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=9,actions=2 + ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=10,actions=2 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=1 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=2 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=3 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=4 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=5 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=6 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=7 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=8 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=9 + ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=10 + echo >>expout "OFPT_TABLE_STATUS (OF1.4): reason=VACANCY_UP +table_desc:- + table 1: + eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME + vacancy=on vacancy_down=20% vacancy_up=80% vacancy=90%" + fi + AT_FAIL_IF([test X"$1" != X]) ovs-appctl -t ovs-ofctl ofctl/barrier - echo >>expout "OFPT_BARRIER_REPLY (OF1.5):" + echo >>expout "OFPT_BARRIER_REPLY (OF1.4):" AT_CHECK( [[sed ' @@ -2558,40 +3010,129 @@ s/00:0.$/00:0x/' < monitor.log]], # It's a service connection so initially there should be no async messages. check_async 1 -# If we don't set this, async messages are not received. # Set miss_send_len to 128, turning on packet-ins for our service connection. -ovs-appctl -t ovs-ofctl ofctl/send 0609000c0123456700000080 -check_async 2 OFPPR_ADD OFPPR_MODIFY OFPPR_DELETE +ovs-appctl -t ovs-ofctl ofctl/send 0509000c0123456700000080 +check_async 2 OFPR_ACTION OFPPR_ADD OFPPR_MODIFY OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE -# Set-async has changed in OF 1.4 and is not yet implemented. +# Become slave (OF 1.4), which should disable everything except port status. +ovs-appctl -t ovs-ofctl ofctl/send 051800180000000200000003000000000000000000000001 +check_async 3 OFPPR_ADD OFPPR_MODIFY OFPPR_DELETE + +# Use OF 1.4 OFPT_SET_ASYNC to enable a patchwork of asynchronous messages. +ovs-appctl -t ovs-ofctl ofctl/send 051c0040000000020000000800000005000100080000000200020008000000020003000800000005000400080000001c00050008000000050008000800000018 +check_async 4 OFPR_INVALID_TTL OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE OFPTR_VACANCY_UP + +# Set controller ID 123. +ovs-appctl -t ovs-ofctl ofctl/send 05040018000000030000232000000014000000000000007b +check_async 5 OFPR_NO_MATCH OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE + +# Restore controller ID 0. +ovs-appctl -t ovs-ofctl ofctl/send 050400180000000300002320000000140000000000000000 + +# Become master (OF 1.4). +ovs-appctl -t ovs-ofctl ofctl/send 051800180000000400000002000000000000000000000002 +check_async 6 OFPR_ACTION OFPPR_ADD OFPPR_MODIFY OFPRR_DELETE ovs-appctl -t ovs-ofctl exit OVS_VSWITCHD_STOP AT_CLEANUP -dnl This test checks that the role request/response messaging works -dnl and that generation_id is handled properly. -AT_SETUP([ofproto - controller role (OpenFlow 1.2)]) +AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.5)]) OVS_VSWITCHD_START -ON_EXIT([kill `cat c1.pid c2.pid`]) +AT_CHECK([ovs-ofctl -O OpenFlow15 -P standard monitor br0 --detach --no-chdir --pidfile]) +check_async () { + printf '\n\n--- check_async %d ---\n\n\n' $1 + INDEX=$1 + shift -# Start two ovs-ofctl controller processes. -AT_CAPTURE_FILE([monitor1.log]) -AT_CAPTURE_FILE([expout1]) -AT_CAPTURE_FILE([experr1]) -AT_CAPTURE_FILE([monitor2.log]) -AT_CAPTURE_FILE([expout2]) -AT_CAPTURE_FILE([experr2]) -for i in 1 2; do - AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile=`pwd`/c$i.pid --unixctl=`pwd`/c$i]) - ovs-appctl -t `pwd`/c$i ofctl/barrier - ovs-appctl -t `pwd`/c$i ofctl/set-output-file monitor$i.log - : > expout$i - : > experr$i + ovs-appctl -t ovs-ofctl ofctl/barrier + ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log + : > expout - # find out current role - ovs-appctl -t `pwd`/c$i ofctl/send 031800180000000200000000000000000000000000000000 - echo >>experr$i "send: OFPT_ROLE_REQUEST (OF1.2): role=nochange" + # Other tests are not working with OF 1.5, and message + # format may change, so leave them out. + + # OFPT_PORT_STATUS, OFPPR_ADD + ovs-vsctl add-port br0 test -- set Interface test type=dummy + if test X"$1" = X"OFPPR_ADD"; then shift; + echo >>expout "OFPT_PORT_STATUS (OF1.5): ADD: ${INDEX}(test): addr:aa:55:aa:55:00:0x + config: PORT_DOWN + state: LINK_DOWN + speed: 0 Mbps now, 0 Mbps max" + fi + + # OFPT_PORT_STATUS, OFPPR_MODIFY + ovs-ofctl -O OpenFlow15 -vwarn mod-port br0 test up + if test X"$1" = X"OFPPR_MODIFY"; then shift; + echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x + config: 0 + state: LINK_DOWN + speed: 0 Mbps now, 0 Mbps max +OFPT_PORT_STATUS (OF1.5): MOD: 2(test): addr:aa:55:aa:55:00:0x + config: 0 + state: 0 + speed: 0 Mbps now, 0 Mbps max" + fi + + # OFPT_PORT_STATUS, OFPPR_DELETE + ovs-vsctl del-port br0 test + if test X"$1" = X"OFPPR_DELETE"; then shift; + echo >>expout "OFPT_PORT_STATUS (OF1.5): DEL: ${INDEX}(test): addr:aa:55:aa:55:00:0x + config: 0 + state: 0 + speed: 0 Mbps now, 0 Mbps max" + fi + + AT_FAIL_IF([test X"$1" != X]) + + ovs-appctl -t ovs-ofctl ofctl/barrier + echo >>expout "OFPT_BARRIER_REPLY (OF1.5):" + + AT_CHECK( + [[sed ' +s/ (xid=0x[0-9a-fA-F]*)// +s/ *duration.*// +s/00:0.$/00:0x/' < monitor.log]], + [0], [expout]) +} + +# It's a service connection so initially there should be no async messages. +check_async 1 + +# If we don't set this, async messages are not received. +# Set miss_send_len to 128, turning on packet-ins for our service connection. +ovs-appctl -t ovs-ofctl ofctl/send 0609000c0123456700000080 +check_async 2 OFPPR_ADD OFPPR_MODIFY OFPPR_DELETE + +# Set-async has changed in OF 1.4 and is not yet implemented. + +ovs-appctl -t ovs-ofctl exit +OVS_VSWITCHD_STOP +AT_CLEANUP + +dnl This test checks that the role request/response messaging works +dnl and that generation_id is handled properly. +AT_SETUP([ofproto - controller role (OpenFlow 1.2)]) +OVS_VSWITCHD_START +on_exit 'kill `cat c1.pid c2.pid`' + +# Start two ovs-ofctl controller processes. +AT_CAPTURE_FILE([monitor1.log]) +AT_CAPTURE_FILE([expout1]) +AT_CAPTURE_FILE([experr1]) +AT_CAPTURE_FILE([monitor2.log]) +AT_CAPTURE_FILE([expout2]) +AT_CAPTURE_FILE([experr2]) +for i in 1 2; do + AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile=`pwd`/c$i.pid --unixctl=`pwd`/c$i]) + ovs-appctl -t `pwd`/c$i ofctl/barrier + ovs-appctl -t `pwd`/c$i ofctl/set-output-file monitor$i.log + : > expout$i + : > experr$i + + # find out current role + ovs-appctl -t `pwd`/c$i ofctl/send 031800180000000200000000000000000000000000000000 + echo >>experr$i "send: OFPT_ROLE_REQUEST (OF1.2): role=nochange" echo >>expout$i "OFPT_ROLE_REPLY (OF1.2): role=equal" done @@ -2625,9 +3166,9 @@ done # Check output. for i in 1 2; do cp expout$i expout - AT_CHECK([grep -v '^send:' monitor$i.log | STRIP_XIDS], [0], [expout]) + AT_CHECK([grep -v '^send:' monitor$i.log | strip_xids], [0], [expout]) cp experr$i expout - AT_CHECK([grep '^send:' monitor$i.log | STRIP_XIDS], [0], [expout]) + AT_CHECK([grep '^send:' monitor$i.log | strip_xids], [0], [expout]) done OVS_VSWITCHD_STOP AT_CLEANUP @@ -2638,7 +3179,7 @@ dnl messages are sent when a controller's role gets changed from master dnl to slave. AT_SETUP([ofproto - controller role (OpenFlow 1.4)]) OVS_VSWITCHD_START -ON_EXIT([kill `cat c1.pid c2.pid`]) +on_exit 'kill `cat c1.pid c2.pid`' # Start two ovs-ofctl controller processes. AT_CAPTURE_FILE([monitor1.log]) @@ -2691,23 +3232,114 @@ done # Check output. for i in 1 2; do cp expout$i expout - AT_CHECK([grep -v '^send:' monitor$i.log | STRIP_XIDS], [0], [expout]) + AT_CHECK([grep -v '^send:' monitor$i.log | strip_xids], [0], [expout]) cp experr$i expout - AT_CHECK([grep '^send:' monitor$i.log | STRIP_XIDS], [0], [expout]) + AT_CHECK([grep '^send:' monitor$i.log | strip_xids], [0], [expout]) done OVS_VSWITCHD_STOP AT_CLEANUP +dnl This test checks the Group and meter notifications when a group mod +dnl command is sent from one controller and the reply is received by +dnl other controllers. +AT_SETUP([ofproto - requestforward (OpenFlow 1.4)]) +OVS_VSWITCHD_START +on_exit 'kill `cat c1.pid c2.pid c3.pid`' + +# Start two ovs-ofctl controller processes. +AT_CAPTURE_FILE([monitor1.log]) +AT_CAPTURE_FILE([expout1]) +AT_CAPTURE_FILE([monitor2.log]) +AT_CAPTURE_FILE([expout2]) +AT_CAPTURE_FILE([monitor3.log]) +AT_CAPTURE_FILE([expout3]) + +ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile=`pwd`/c1.pid --unixctl=`pwd`/c1 +ovs-ofctl -O OpenFlow14 monitor br0 --detach --no-chdir --pidfile=`pwd`/c2.pid --unixctl=`pwd`/c2 +ovs-ofctl -O OpenFlow14 monitor br0 --detach --no-chdir --pidfile=`pwd`/c3.pid --unixctl=`pwd`/c3 + +check_async () { + for i in 1 3; do + ovs-appctl -t `pwd`/c$i ofctl/barrier + ovs-appctl -t `pwd`/c$i ofctl/set-output-file monitor$i.log + : > expout$i + done + + printf '\n\n--- check_async %d ---\n\n\n' $1 + INDEX=$1 + shift + + # OFPGC_ADD + ovs-appctl -t `pwd`/c2 ofctl/send "050f0020000000020000000000000001 00100000 ffffffffffffffff 00000000" + if test X"$1" = X"OFPGC_ADD"; then shift; + echo >>expout2 "send: OFPT_GROUP_MOD (OF1.4): + ADD group_id=1,type=all,bucket=actions=drop" + echo >>expout1 "OFPT_REQUESTFORWARD (OF1.5): reason=group_mod + ADD group_id=1,type=all,bucket=bucket_id:0,actions=drop" + echo >>expout3 "OFPT_REQUESTFORWARD (OF1.4): reason=group_mod + ADD group_id=1,type=all,bucket=actions=drop" + fi + + # OFPGC_MODIFY + ovs-appctl -t `pwd`/c2 ofctl/send "050f0020000000020001010000000001 00100000 ffffffffffffffff 00000000" + if test X"$1" = X"OFPGC_MODIFY"; then shift; + echo >>expout2 "send: OFPT_GROUP_MOD (OF1.4): + MOD group_id=1,type=select,bucket=weight:0,actions=drop" + echo >>expout1 "OFPT_REQUESTFORWARD (OF1.5): reason=group_mod + MOD group_id=1,type=select,bucket=bucket_id:0,weight:0,actions=drop" + echo >>expout3 "OFPT_REQUESTFORWARD (OF1.4): reason=group_mod + MOD group_id=1,type=select,bucket=weight:0,actions=drop" + fi + + ovs-appctl -t `pwd`/c1 ofctl/barrier + echo >>expout1 "OFPT_BARRIER_REPLY (OF1.5):" + ovs-appctl -t `pwd`/c2 ofctl/barrier + echo >>expout2 "OFPT_BARRIER_REPLY (OF1.4):" + ovs-appctl -t `pwd`/c3 ofctl/barrier + echo >>expout3 "OFPT_BARRIER_REPLY (OF1.4):" + + # Check output. + for i in 1 3; do + cp expout$i expout + AT_CHECK( + [[sed ' +s/ (xid=0x[0-9a-fA-F]*)//'< monitor$i.log]], + [0], [expout]) + done +} + +# controller 1: Become slave +ovs-appctl -t `pwd`/c1 ofctl/send 061800180000000300000003000000008000000000000002 + +# controller 2: Become master +ovs-appctl -t `pwd`/c2 ofctl/send 051800180000000300000002000000008000000000000003 + +# controller 1: Become slave +ovs-appctl -t `pwd`/c3 ofctl/send 051800180000000300000003000000008000000000000004 + +# controller 1: Enabled requestforward using set Asynchronous message +ovs-appctl -t `pwd`/c1 ofctl/send 061c00280000000200000008000000050002000800000002000400080000001a000a000800000003 + +# controller 2: Enabled requestforward using set Asynchronous message +ovs-appctl -t `pwd`/c2 ofctl/send 051c002800000002000100080000000200030008000000050005000800000005000b000800000003 + +# controller 1: Enabled requestforward using set Asynchronous message +ovs-appctl -t `pwd`/c3 ofctl/send 051c00280000000200000008000000050002000800000002000400080000001a000a000800000003 +check_async 1 OFPGC_ADD OFPGC_MODIFY + +OVS_VSWITCHD_STOP +AT_CLEANUP + dnl This test checks that OFPT_PACKET_OUT accepts both OFPP_NONE (as dnl specified by OpenFlow 1.0) and OFPP_CONTROLLER (used by some dnl controllers despite the spec) as meaning a packet that was generated dnl by the controller. AT_SETUP([ofproto - packet-out from controller (OpenFlow 1.0)]) OVS_VSWITCHD_START -ADD_OF_PORTS([br0], [1]) +add_of_ports br0 1 # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0109000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2742,7 +3374,7 @@ AT_SETUP([ofproto - packet-out from controller (OpenFlow 1.2)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow12 -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0309000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2775,7 +3407,7 @@ AT_SETUP([ofproto - packet-out from controller (OpenFlow 1.1)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -O OpenFlow11 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow11 -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0209000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2800,13 +3432,41 @@ OFPT_BARRIER_REPLY (OF1.1): OVS_VSWITCHD_STOP AT_CLEANUP +dnl This test checks that metadata and userdata are encoded in NXT_PACKET_IN2. +AT_SETUP([ofproto - packet-out with metadata and userdata (NXT_PACKET_IN2)]) +OVS_VSWITCHD_START + +# Start a monitor listening for packet-ins. +AT_CHECK([ovs-ofctl -P nxt_packet_in2 monitor br0 --detach --no-chdir --pidfile]) +ovs-appctl -t ovs-ofctl ofctl/send 0109000c0123456700000080 +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log +AT_CAPTURE_FILE([monitor.log]) + +# Send a packet-out with a load action to set some metadata, and forward to controller +AT_CHECK([ovs-ofctl packet-out br0 controller 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[[0..63]]), load(0xaa->NXM_NX_PKT_MARK[[]]), controller(userdata=01.02.03.04.05)' '0001020304050010203040501234']) + +# Stop the monitor and check its output. +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([sed 's/ (xid=0x[[0-9a-fA-F]]*)//' monitor.log], [0], [dnl +NXT_PACKET_IN2: total_len=14 pkt_mark=0xaa,metadata=0xfafafafa5a5a5a5a,in_port=CONTROLLER (via action) data_len=14 (unbuffered) + userdata=01.02.03.04.05 +vlan_tci=0x0000,dl_src=00:10:20:30:40:50,dl_dst=00:01:02:03:04:05,dl_type=0x1234 +OFPT_BARRIER_REPLY: +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + dnl This test checks that metadata is encoded in packet_in structures, dnl supported by NXAST. AT_SETUP([ofproto - packet-out with metadata (NXM)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -P nxm monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -P nxt_packet_in monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0109000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2834,7 +3494,7 @@ AT_SETUP([ofproto - packet-out with metadata (OpenFlow 1.2)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow12 -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0309000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2862,7 +3522,7 @@ AT_SETUP([ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow13 -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0409000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -2889,7 +3549,7 @@ AT_SETUP([ofproto - packet-out with tunnel metadata (OpenFlow 1.2)]) OVS_VSWITCHD_START # Start a monitor listening for packet-ins. -AT_CHECK([ovs-ofctl -O OpenFlow12 monitor br0 --detach --no-chdir --pidfile]) +AT_CHECK([ovs-ofctl -O OpenFlow12 -P standard monitor br0 --detach --no-chdir --pidfile]) ovs-appctl -t ovs-ofctl ofctl/send 0309000c0123456700000080 ovs-appctl -t ovs-ofctl ofctl/barrier ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log @@ -3193,7 +3853,7 @@ echo n_msgs=$n_msgs OVS_VSWITCHD_START # Start a monitor watching the flow table, then make it block. -ON_EXIT([kill `cat ovs-ofctl.pid`]) +on_exit 'kill `cat ovs-ofctl.pid`' ovs-ofctl monitor br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1 AT_CAPTURE_FILE([monitor.log]) ovs-appctl -t ovs-ofctl ofctl/block @@ -3292,11 +3952,17 @@ OFPT_GET_ASYNC_REPLY (OF1.3): PACKET_IN: no_match action PORT_STATUS: add delete modify FLOW_REMOVED: idle hard delete + ROLE_STATUS: (off) + TABLE_STATUS: (off) + REQUESTFORWARD: (off) slave: PACKET_IN: (off) PORT_STATUS: add delete modify FLOW_REMOVED: (off) + ROLE_STATUS: (off) + TABLE_STATUS: (off) + REQUESTFORWARD: (off) OFPT_BARRIER_REPLY (OF1.3): ]) @@ -3305,7 +3971,7 @@ AT_CLEANUP AT_SETUP([ofproto - ofport_request]) OVS_VSWITCHD_START -ADD_OF_PORTS([br0], [1], [2], [3]) +add_of_ports br0 1 2 3 set_and_check_specific_ofports () { ovs-vsctl set Interface p1 ofport_request="$1" -- \ @@ -3341,8 +4007,8 @@ set_and_check_poorly_specified_ofports () { AT_CHECK([test "$p1" = "$1" || test "$p2" = "$1"]) # The other port number must be different (already tested above). else - AT_CHECK([test "$1" = '[[]]' || test "$p1" == "$1"]) - AT_CHECK([test "$2" = '[[]]' || test "$p2" == "$2"]) + AT_CHECK([test "$1" = '[[]]' || test "$p1" = "$1"]) + AT_CHECK([test "$2" = '[[]]' || test "$p2" = "$2"]) fi } for pre in '1 2' '[[]] 2' '1 [[]]' '[[]] [[]]' '2 1' '[[]] 1' '2 [[]]' \ @@ -3359,7 +4025,7 @@ OVS_VSWITCHD_STOP AT_CLEANUP -AT_SETUP([ofproto - bundles, open (OpenFlow 1.4)]) +AT_SETUP([ofproto - bundle open (OpenFlow 1.4)]) AT_KEYWORDS([monitor]) OVS_VSWITCHD_START @@ -3383,7 +4049,7 @@ OFPT_BARRIER_REPLY (OF1.4): OVS_VSWITCHD_STOP AT_CLEANUP -AT_SETUP([ofproto - bundles, double open (OpenFlow 1.4)]) +AT_SETUP([ofproto - bundle double open (OpenFlow 1.4)]) AT_KEYWORDS([monitor]) OVS_VSWITCHD_START @@ -3651,8 +4317,8 @@ NXST_FLOW reply: dnl Check logs for OpenFlow trace # Prevent race. -OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_windows_sub | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) -AT_CHECK([print_vconn_debug | vconn_windows_sub | ofctl_strip], [0], [dnl +OVS_WAIT_UNTIL([vconn_sub < ovs-vswitchd.log | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) +AT_CHECK([print_vconn_debug | vconn_sub | ofctl_strip], [0], [dnl vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO: @@ -3664,8 +4330,8 @@ vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): - version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) + version bitmap: 0x05 +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports version 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3716,8 +4382,8 @@ vconn|DBG|unix: sent (Success): NXST_FLOW reply: vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): - version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) + version bitmap: 0x05 +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports version 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3747,8 +4413,8 @@ vconn|DBG|unix: sent (Success): NXST_FLOW reply: vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 vconn|DBG|unix: received: OFPT_HELLO (OF1.4): - version bitmap: 0x01, 0x05 -vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports versions 0x01, 0x05) + version bitmap: 0x05 +vconn|DBG|unix: negotiated OpenFlow version 0x05 (we support version 0x06 and earlier, peer supports version 0x05) vconn|DBG|unix: received: OFPT_BUNDLE_CONTROL (OF1.4): bundle_id=0 type=OPEN_REQUEST flags=atomic ordered vconn|DBG|unix: sent (Success): OFPT_BUNDLE_CONTROL (OF1.4): @@ -3836,3 +4502,488 @@ NXST_FLOW reply: OVS_VSWITCHD_STOP AT_CLEANUP + + +AT_SETUP([ofproto - bundle open (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Send an OpenFlow13 message (04), OFPT_EXPERIMENTER (04), length (0018), +# xid (0000000a), ONF_EXPERIMENTER_ID (4F4E4600), +# ONFT_BUNDLE_CONTROL (2300 = 0x08FC), bundle id (00000001), +# message type (0000), and flags (0002) +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle double open (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Send twice an OpenFlow13 message (04), OFPT_EXPERIMENTER (04), length (0018), +# xid (0000000a), ONF_EXPERIMENTER_ID (4F4E4600), +# ONFT_BUNDLE_CONTROL (2300 = 0x08FC), bundle id (00000001), +# message type (0000), and flags (0002) +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +OFPT_ERROR (OF1.3): OFPBFC_BAD_ID +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle close without open (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 02 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=ordered +OFPT_ERROR (OF1.3): OFPBFC_BAD_ID +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=ordered +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle double close (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Open, Close, Close +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 02 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 02 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=ordered +OFPT_ERROR (OF1.3): OFPBFC_BUNDLE_CLOSED +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=ordered +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle close, different flags (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Open, Close +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 02 00 01" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=atomic +OFPT_ERROR (OF1.3): OFPBFC_BAD_FLAGS +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=CLOSE_REQUEST flags=atomic +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle commit without open (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Commit +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 04 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=COMMIT_REQUEST flags=ordered +OFPT_ERROR (OF1.3): OFPBFC_BAD_ID +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=COMMIT_REQUEST flags=ordered +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle commit, different flags (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Open, Commit +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 00 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 04 00 01" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REQUEST flags=ordered +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=OPEN_REPLY flags=0 +OFPT_BARRIER_REPLY (OF1.3): +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=COMMIT_REQUEST flags=atomic +OFPT_ERROR (OF1.3): OFPBFC_BAD_FLAGS +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=COMMIT_REQUEST flags=atomic +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + +AT_SETUP([ofproto - bundle discard without open (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +# Start a monitor, use the required protocol version +ovs-ofctl -O OpenFlow13 monitor br0 --detach --no-chdir --pidfile >monitor.log 2>&1 +AT_CAPTURE_FILE([monitor.log]) + +# Discard +ovs-appctl -t ovs-ofctl ofctl/send "04 04 00 18 00 00 00 0a 4F 4E 46 00 00 00 08 FC 00 00 00 01 00 06 00 02" +ovs-appctl -t ovs-ofctl ofctl/barrier +ovs-appctl -t ovs-ofctl exit + +AT_CHECK([ofctl_strip < monitor.log], [0], [dnl +send: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=DISCARD_REQUEST flags=ordered +OFPT_ERROR (OF1.3): OFPBFC_BAD_ID +ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0x1 type=DISCARD_REQUEST flags=ordered +OFPT_BARRIER_REPLY (OF1.3): +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + + +AT_SETUP([ofproto - bundle with multiple flow mods (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +AT_CHECK([ovs-appctl vlog/set vconn:dbg]) + +AT_CHECK([ovs-ofctl del-flows br0]) + +AT_DATA([flows.txt], [dnl +add idle_timeout=50 in_port=2 dl_src=00:66:77:88:99:aa actions=1 +add idle_timeout=60 in_port=2 dl_src=00:77:88:99:aa:bb actions=2 +add idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=3 +add idle_timeout=50 in_port=2 dl_src=00:66:77:88:99:aa actions=4 +delete +add idle_timeout=50 in_port=2 dl_src=00:66:77:88:99:aa actions=5 +add idle_timeout=60 in_port=2 dl_src=00:77:88:99:aa:bb actions=6 +add idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=7 +delete in_port=2 dl_src=00:88:99:aa:bb:cc +]) + +AT_CHECK([ovs-ofctl -O OpenFlow13 --bundle add-flows br0 flows.txt]) + +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl + idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=output:5 + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:6 +NXST_FLOW reply: +]) + +AT_DATA([flows.txt], [dnl +modify actions=drop +modify_strict in_port=2 dl_src=00:77:88:99:aa:bb actions=7 +]) + +AT_CHECK([ovs-ofctl -O OpenFlow13 --bundle add-flows br0 flows.txt]) + +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl + idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=drop + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:7 +NXST_FLOW reply: +]) + +# Adding an existing flow acts as a modify, and delete_strict also works. +AT_DATA([flows.txt], [dnl +add idle_timeout=60 in_port=2 dl_src=00:77:88:99:aa:bb actions=8 +delete_strict in_port=2 dl_src=00:66:77:88:99:aa +add in_port=2 dl_src=00:66:77:88:99:aa actions=drop +]) + +AT_CHECK([ovs-ofctl -O OpenFlow13 --bundle add-flows br0 flows.txt]) + +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:8 + in_port=2,dl_src=00:66:77:88:99:aa actions=drop +NXST_FLOW reply: +]) + +dnl Check logs for OpenFlow trace +# Prevent race. +OVS_WAIT_UNTIL([vconn_sub < ovs-vswitchd.log | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) +AT_CHECK([print_vconn_debug | vconn_sub | ofctl_strip], [0], [dnl +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO: + version bitmap: 0x01 +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: received: OFPT_FLOW_MOD: DEL actions=drop +vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: +vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO (OF1.3): + version bitmap: 0x04 +vconn|DBG|unix: negotiated OpenFlow version 0x04 (we support version 0x06 and earlier, peer supports version 0x04) +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REPLY flags=0 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:66:77:88:99:aa idle:50 actions=output:1 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:77:88:99:aa:bb idle:60 actions=output:2 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:88:99:aa:bb:cc idle:70 actions=output:3 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:66:77:88:99:aa idle:50 actions=output:4 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): DEL table:255 actions=drop +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:66:77:88:99:aa idle:50 actions=output:5 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:77:88:99:aa:bb idle:60 actions=output:6 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:88:99:aa:bb:cc idle:70 actions=output:7 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): DEL table:255 in_port=2,dl_src=00:88:99:aa:bb:cc actions=drop +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REPLY flags=0 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO: + version bitmap: 0x01 +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm +vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: +vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: +vconn|DBG|unix: received: NXST_FLOW request: +vconn|DBG|unix: sent (Success): NXST_FLOW reply: + idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=output:5 + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:6 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO (OF1.3): + version bitmap: 0x04 +vconn|DBG|unix: negotiated OpenFlow version 0x04 (we support version 0x06 and earlier, peer supports version 0x04) +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REPLY flags=0 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): MOD actions=drop +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): MOD_STRICT in_port=2,dl_src=00:77:88:99:aa:bb actions=output:7 +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REPLY flags=0 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO: + version bitmap: 0x01 +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm +vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: +vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: +vconn|DBG|unix: received: NXST_FLOW request: +vconn|DBG|unix: sent (Success): NXST_FLOW reply: + idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=drop + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:7 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO (OF1.3): + version bitmap: 0x04 +vconn|DBG|unix: negotiated OpenFlow version 0x04 (we support version 0x06 and earlier, peer supports version 0x04) +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=OPEN_REPLY flags=0 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:77:88:99:aa:bb idle:60 actions=output:8 +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): DEL_STRICT table:255 in_port=2,dl_src=00:66:77:88:99:aa actions=drop +vconn|DBG|unix: received: ONFT_BUNDLE_ADD_MESSAGE (OF1.3): + bundle_id=0 flags=atomic ordered +OFPT_FLOW_MOD (OF1.3): ADD in_port=2,dl_src=00:66:77:88:99:aa actions=drop +vconn|DBG|unix: received: ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered +vconn|DBG|unix: sent (Success): ONFT_BUNDLE_CONTROL (OF1.3): + bundle_id=0 type=COMMIT_REPLY flags=0 +vconn|DBG|unix: sent (Success): OFPT_HELLO (OF1.5): + version bitmap: 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 +vconn|DBG|unix: received: OFPT_HELLO: + version bitmap: 0x01 +vconn|DBG|unix: negotiated OpenFlow version 0x01 (we support version 0x06 and earlier, peer supports version 0x01) +vconn|DBG|unix: received: NXT_SET_FLOW_FORMAT: format=nxm +vconn|DBG|unix: received: OFPT_BARRIER_REQUEST: +vconn|DBG|unix: sent (Success): OFPT_BARRIER_REPLY: +vconn|DBG|unix: received: NXST_FLOW request: +vconn|DBG|unix: sent (Success): NXST_FLOW reply: + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:8 + in_port=2,dl_src=00:66:77:88:99:aa actions=drop +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP + + +AT_SETUP([ofproto - failing bundle commit (OpenFlow 1.3)]) +AT_KEYWORDS([monitor]) +OVS_VSWITCHD_START + +AT_CHECK([ovs-ofctl del-flows br0]) + +ovs-ofctl add-flows br0 - <&1 | sed '/|WARN|/d +s/unix:.*br0\.mgmt/unix:br0.mgmt/' | sed 's/(.* error)/(error)/'], +[0], [dnl +OFPT_ERROR (OF1.3) (xid=0xb): OFPBRC_EPERM +OFPT_FLOW_MOD (OF1.3) (xid=0xb): ADD table:254 actions=drop +OFPT_ERROR (OF1.3) (xid=0xd): OFPBFC_MSG_FAILED +ONFT_BUNDLE_CONTROL (OF1.3) (xid=0xd): + bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered +ovs-ofctl: talking to unix:br0.mgmt (error) +]) + +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl + idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=output:11 + idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=output:22 + idle_timeout=70, in_port=2,dl_src=00:88:99:aa:bb:cc actions=output:33 +NXST_FLOW reply: +]) + +OVS_VSWITCHD_STOP +AT_CLEANUP