X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Fofproto.at;h=b2b32b564c54460437769a10cdbc2138ba336dfb;hb=6c6eedc5d6730835a0d9724e2e8cfe9cdf03b07d;hp=c22d79fbf9b46015211150e30eb1c561a42c3029;hpb=7dad8e9a50cd11dbb2c69dc64855f8133346a1ab;p=cascardo%2Fovs.git diff --git a/tests/ofproto.at b/tests/ofproto.at index c22d79fbf..b2b32b564 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], [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 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 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): ]) @@ -349,27 +405,27 @@ group_id=1235,type=all,bucket=actions=output:12,bucket=bucket_id:0,actions=outpu ]) 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,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 @@ -386,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]) @@ -426,7 +482,7 @@ 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 ]) @@ -434,7 +490,7 @@ OFPST_GROUP_DESC reply (OF1.5): # 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 +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 ]) @@ -444,7 +500,7 @@ 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 +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 ]) @@ -452,7 +508,7 @@ OFPST_GROUP_DESC reply (OF1.5): # 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 ]) @@ -460,14 +516,14 @@ OFPST_GROUP_DESC reply (OF1.5): # 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 +AT_CHECK([strip_xids < stderr | sed '/truncated/,$d'], [0], [dnl OFPT_ERROR (OF1.5): OFPGMFC_BUCKET_EXISTS OFPT_GROUP_MOD (OF1.5): ]) @@ -476,7 +532,7 @@ 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 ]) @@ -488,7 +544,7 @@ group_id=1234,command_bucket_id=11,bucket=bucket_id:12,actions=output:12,bucket= ]) 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 ]) @@ -496,7 +552,7 @@ OFPST_GROUP_DESC reply (OF1.5): # 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 ]) @@ -521,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 ]) @@ -548,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 ]) @@ -556,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 @@ -589,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): ]) @@ -602,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 ]) @@ -615,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 ]) @@ -627,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 @@ -659,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): @@ -683,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): @@ -707,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): @@ -752,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 @@ -784,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 @@ -815,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 @@ -843,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]) @@ -865,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]) @@ -922,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]) @@ -1002,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 @@ -1943,7 +1999,7 @@ AT_CHECK([ovs-ofctl -O OpenFlow14 dump-table-desc br0 | sed '/^$/d AT_CHECK([ovs-ofctl -O Openflow14 mod-table br0 0 vacancy:20,80]) # Check that the configuration was updated. mv expout orig-expout -sed -e '3s/vacancy=off/vacancy=on vacancy_down=20% vacancy_up=80% vacancy=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 @@ -2467,7 +2523,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 @@ -2570,7 +2626,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 @@ -2673,7 +2729,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 @@ -2782,7 +2838,7 @@ AT_CLEANUP AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.4)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow14 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 @@ -2851,7 +2907,7 @@ OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x echo >>expout "OFPT_FLOW_REMOVED (OF1.4): reason=delete table_id=0" fi - # OFPT_FLOW_REMOVED, OFPRR_GROUP_DELETE + # 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 @@ -2859,6 +2915,84 @@ OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x 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 @@ -2884,8 +3018,8 @@ ovs-appctl -t ovs-ofctl ofctl/send 051800180000000200000003000000000000000000000 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 051c0038000000020000000800000005000100080000000200020008000000020003000800000005000400080000001c0005000800000005 -check_async 4 OFPR_INVALID_TTL OFPPR_DELETE OFPRR_DELETE OFPRR_GROUP_DELETE +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 @@ -2904,7 +3038,7 @@ AT_CLEANUP AT_SETUP([ofproto - asynchronous message control (OpenFlow 1.5)]) OVS_VSWITCHD_START -AT_CHECK([ovs-ofctl -O OpenFlow15 monitor br0 --detach --no-chdir --pidfile]) +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 @@ -3031,9 +3165,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 @@ -3097,9 +3231,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 @@ -3135,25 +3269,25 @@ check_async () { shift # OFPGC_ADD - ovs-appctl -t `pwd`/c2 ofctl/send 050f0010000000020000000000000001 + 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" + ADD group_id=1,type=all,bucket=actions=drop" echo >>expout1 "OFPT_REQUESTFORWARD (OF1.5): reason=group_mod - ADD group_id=1,type=all" + 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" + ADD group_id=1,type=all,bucket=actions=drop" fi # OFPGC_MODIFY - ovs-appctl -t `pwd`/c2 ofctl/send 050f0010000000020001010000000001 + 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" + 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" + 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" + MOD group_id=1,type=select,bucket=weight:0,actions=drop" fi ovs-appctl -t `pwd`/c1 ofctl/barrier @@ -3201,10 +3335,10 @@ 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 @@ -3239,7 +3373,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 @@ -3272,7 +3406,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 @@ -3297,13 +3431,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 @@ -3331,7 +3493,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 @@ -3359,7 +3521,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 @@ -3386,7 +3548,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 @@ -3789,11 +3951,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): ]) @@ -3802,7 +3970,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" -- \ @@ -4148,7 +4316,7 @@ NXST_FLOW reply: dnl Check logs for OpenFlow trace # Prevent race. -OVS_WAIT_UNTIL([cat ovs-vswitchd.log | vconn_sub | test `grep -- "|vconn|DBG|unix: sent (Success): NXST_FLOW reply" | wc -l` -ge 3]) +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