X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fofp-print.at;h=986b9312ce448391afc9e7351a28879010fd9814;hb=56450a416cbf8f770d7511b18624e0d057e2b449;hp=caf0ecc07a3577c653f685c84239b2ed7ba659c5;hpb=65e0be100ed03de5ba291724615912ecf17a1d32;p=sliver-openvswitch.git diff --git a/tests/ofp-print.at b/tests/ofp-print.at index caf0ecc07..986b9312c 100644 --- a/tests/ofp-print.at +++ b/tests/ofp-print.at @@ -475,11 +475,11 @@ AT_CHECK([ovs-ofctl ofp-print "\ 03 0a 00 4c 00 00 00 00 ff ff ff 00 00 2a 00 00 \ 00 01 00 0c 80 00 00 04 ff ff ff fe 00 00 00 00 \ 00 00 ff ff ff ff ff ff 00 23 20 83 c1 5f 80 35 \ -00 01 08 00 06 04 00 03 00 23 20 83 c1 5f 00 00 \ +00 01 08 00 06 04 00 01 00 23 20 83 c1 5f 00 00 \ 00 00 00 23 20 83 c1 5f 00 00 00 00 \ "], [0], [dnl OFPT_PACKET_IN (OF1.2) (xid=0x0): total_len=42 in_port=LOCAL (via no_match) data_len=42 buffer=0xffffff00 -rarp,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=00:23:20:83:c1:5f,dl_dst=ff:ff:ff:ff:ff:ff,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_op=3,arp_sha=00:23:20:83:c1:5f,arp_tha=00:23:20:83:c1:5f +rarp,metadata=0,in_port=0,vlan_tci=0x0000,dl_src=00:23:20:83:c1:5f,dl_dst=ff:ff:ff:ff:ff:ff,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_op=1,arp_sha=00:23:20:83:c1:5f,arp_tha=00:23:20:83:c1:5f ]) AT_CLEANUP @@ -699,6 +699,26 @@ ofp_util|INFO|post: arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_ds ]) AT_CLEANUP +# The flow is formatted with cls_rule_format() for the low-verbosity case. +AT_SETUP([OFPT_FLOW_MOD - OF1.1 - low verbosity]) +AT_KEYWORDS([ofp-print]) +AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "\ +020e 0090 01020304 \ +da1aa3e035d87158 ffffffffffffffff \ +02 01 003c 0078 9c40 ffffffff ffffffff ffffffff 0003 \ +0000 \ +\ +0000 0058 00000000 000003f7 \ +000000000000ffffffffffff 000000000000ffffffffffff \ +0000 00 00 0806 00 00 c0a88000000000ff 00000000ffffffff 0000 0000 \ +00000000 00 000000 0000000000000000ffffffffffffffff \ +\ +0001 0008 03 000000 \ +" 2], [0], [dnl +OFPT_FLOW_MOD (OF1.1) (xid=0x1020304): MOD table:2 priority=40000,arp,arp_spa=192.168.128.0/24 cookie:0xda1aa3e035d87158/0xffffffffffffffff idle:60 hard:120 send_flow_rem check_overlap actions=goto_table:3 +]) +AT_CLEANUP + # The flow is formatted with cls_rule_format() for the low-verbosity case. AT_SETUP([OFPT_FLOW_MOD - OF1.2 - low verbosity]) AT_KEYWORDS([ofp-print]) @@ -1492,12 +1512,12 @@ AT_CHECK([ovs-ofctl ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 00 \ "], [0], [dnl OFPST_QUEUE reply (xid=0x1): 6 queues - port 3 queue 1: bytes=302, pkts=1, errors=0 - port 3 queue 2: bytes=0, pkts=0, errors=0 - port 2 queue 1: bytes=2100, pkts=20, errors=0 - port 2 queue 2: bytes=0, pkts=0, errors=0 - port 1 queue 1: bytes=0, pkts=0, errors=0 - port 1 queue 2: bytes=0, pkts=0, errors=0 + port 3 queue 1: bytes=302, pkts=1, errors=0, duration=? + port 3 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 2 queue 1: bytes=2100, pkts=20, errors=0, duration=? + port 2 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 1: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 2: bytes=0, pkts=0, errors=0, duration=? ]) AT_CLEANUP @@ -1526,12 +1546,12 @@ AT_CHECK([ovs-ofctl ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ "], [0], [dnl OFPST_QUEUE reply (OF1.1) (xid=0x1): 6 queues - port 3 queue 1: bytes=302, pkts=1, errors=0 - port 3 queue 2: bytes=0, pkts=0, errors=0 - port 2 queue 1: bytes=2100, pkts=20, errors=0 - port 2 queue 2: bytes=0, pkts=0, errors=0 - port 1 queue 1: bytes=0, pkts=0, errors=0 - port 1 queue 2: bytes=0, pkts=0, errors=0 + port 3 queue 1: bytes=302, pkts=1, errors=0, duration=? + port 3 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 2 queue 1: bytes=2100, pkts=20, errors=0, duration=? + port 2 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 1: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 2: bytes=0, pkts=0, errors=0, duration=? ]) AT_CLEANUP @@ -1553,12 +1573,45 @@ AT_CHECK([ovs-ofctl ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ "], [0], [dnl OFPST_QUEUE reply (OF1.2) (xid=0x1): 6 queues - port 3 queue 1: bytes=302, pkts=1, errors=0 - port 3 queue 2: bytes=0, pkts=0, errors=0 - port 2 queue 1: bytes=2100, pkts=20, errors=0 - port 2 queue 2: bytes=0, pkts=0, errors=0 - port 1 queue 1: bytes=0, pkts=0, errors=0 - port 1 queue 2: bytes=0, pkts=0, errors=0 + port 3 queue 1: bytes=302, pkts=1, errors=0, duration=? + port 3 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 2 queue 1: bytes=2100, pkts=20, errors=0, duration=? + port 2 queue 2: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 1: bytes=0, pkts=0, errors=0, duration=? + port 1 queue 2: bytes=0, pkts=0, errors=0, duration=? +]) +AT_CLEANUP + +AT_SETUP([OFPST_QUEUE reply - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +04 13 01 00 00 00 00 01 00 05 00 00 00 00 00 00 \ +00 00 00 03 00 00 00 01 00 00 00 00 00 00 01 2e \ +00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 \ +00 00 00 64 1d cd 65 00 \ +00 00 00 03 00 00 00 02 00 00 00 00 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ +00 00 00 64 1d cd 65 00 \ +00 00 00 02 00 00 00 01 00 00 00 00 00 00 08 34 \ +00 00 00 00 00 00 00 14 00 00 00 00 00 00 00 00 \ +00 00 00 64 1d cd 65 00 \ +00 00 00 02 00 00 00 02 00 00 00 00 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ +00 00 00 64 1d cd 65 00 \ +00 00 00 01 00 00 00 01 00 00 00 00 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ +00 00 00 64 1d cd 65 00 \ +00 00 00 01 00 00 00 02 00 00 00 00 00 00 00 00 \ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ +ff ff ff ff ff ff ff ff \ +"], [0], [dnl +OFPST_QUEUE reply (OF1.3) (xid=0x1): 6 queues + port 3 queue 1: bytes=302, pkts=1, errors=0, duration=100.5s + port 3 queue 2: bytes=0, pkts=0, errors=0, duration=100.5s + port 2 queue 1: bytes=2100, pkts=20, errors=0, duration=100.5s + port 2 queue 2: bytes=0, pkts=0, errors=0, duration=100.5s + port 1 queue 1: bytes=0, pkts=0, errors=0, duration=100.5s + port 1 queue 2: bytes=0, pkts=0, errors=0, duration=? ]) AT_CLEANUP @@ -1581,6 +1634,95 @@ OFPST_PORT_DESC reply (xid=0x0): ]) AT_CLEANUP +AT_SETUP([OFPT_METER_MOD request - OF1.3]) +AT_KEYWORDS([ofp-print]) +AT_CHECK([ovs-ofctl ofp-print "\ +04 1d 00 20 00 00 00 02 00 00 00 0d 00 00 00 05 \ +00 01 00 10 00 00 04 00 00 00 00 80 00 00 00 00 \ +"], [0], [dnl +OFPT_METER_MOD (OF1.3) (xid=0x2): ADD meter=5 kbps burst stats bands= +type=drop rate=1024 burst_size=128 +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER request - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REQUEST]) +AT_CHECK([ovs-ofctl ofp-print "041200180000000200090000000000000000000100000000"], [0], [dnl +OFPST_METER request (OF1.3) (xid=0x2): meter=1 +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER_CONFIG request - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REQUEST]) +AT_CHECK([ovs-ofctl ofp-print "0412001800000002000a0000000000000000000100000000"], [0], [dnl +OFPST_METER_CONFIG request (OF1.3) (xid=0x2): meter=1 +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER_FEATURES request - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REQUEST]) +AT_CHECK([ovs-ofctl ofp-print "0412001000000002000b000000000000"], [0], [dnl +OFPST_METER_FEATURES request (OF1.3) (xid=0x2): +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER_FEATURES reply - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +04 13 00 20 00 00 00 02 00 0b 00 00 00 00 00 00 \ +00 01 00 00 00 00 00 03 00 00 00 0F 10 02 00 00 \ +"], [0], [dnl +OFPST_METER_FEATURES reply (OF1.3) (xid=0x2): +max_meter:65536 max_bands:16 max_color:2 +band_types: drop dscp_remark +capabilities: kbps pktps burst stats +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER_CONFIG reply - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +04 13 00 50 00 00 00 02 00 0a 00 00 00 00 00 00 \ +00 28 00 05 00 00 00 01 \ +00 01 00 10 00 01 00 00 00 00 05 00 00 00 00 00 \ +00 02 00 10 00 10 00 00 00 00 f0 00 00 00 00 00 \ +00 18 00 09 00 00 00 02 \ +00 01 00 10 00 02 00 00 00 00 00 00 00 00 00 00 \ +"], [0], [dnl +OFPST_METER_CONFIG reply (OF1.3) (xid=0x2): +meter=1 kbps burst bands= +type=drop rate=65536 burst_size=1280 +type=dscp_remark rate=1048576 burst_size=61440 prec_level=0 + +meter=2 kbps stats bands= +type=drop rate=131072 +]) +AT_CLEANUP + +AT_SETUP([OFPST_METER reply - OF1.3]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +04 13 00 90 00 00 00 02 00 09 00 00 00 00 00 00 \ +00 00 00 01 00 48 00 00 00 00 00 00 00 00 00 05 \ +00 00 00 00 00 00 10 00 00 00 00 00 00 02 30 00 \ +00 00 01 8a 0a 6e 23 44 \ +00 00 00 00 00 00 00 7e 00 00 00 00 00 00 34 33 \ +00 00 00 00 00 00 00 e7 00 00 00 00 00 00 94 2e \ +00 00 00 02 00 38 00 00 00 00 00 00 00 00 00 02 \ +00 00 00 00 00 00 02 00 00 00 00 00 00 00 30 00 \ +00 00 01 87 0a 23 6e 44 \ +00 00 00 00 00 00 00 2a 00 00 00 00 00 00 04 33 \ +"], [0], [dnl +OFPST_METER reply (OF1.3) (xid=0x2): +meter:1 flow_count:5 packet_in_count:4096 byte_in_count:143360 duration:394.174990148s bands: +0: packet_count:126 byte_count:13363 +1: packet_count:231 byte_count:37934 + +meter:2 flow_count:2 packet_in_count:512 byte_in_count:12288 duration:391.170094148s bands: +0: packet_count:42 byte_count:1075 +]) +AT_CLEANUP + AT_SETUP([OFPT_BARRIER_REQUEST - OF1.0]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print '01 12 00 08 00 00 00 01'], [0], [dnl @@ -2090,7 +2232,7 @@ AT_SETUP([NXST_FLOW_MONITOR reply]) AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) AT_CHECK([ovs-ofctl ofp-print "\ 01 11 00 40 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 02 00 00 00 00 \ -00 20 00 01 00 04 80 00 00 05 00 10 00 06 01 00 12 34 56 78 9a bc de f0 \ +00 20 00 01 00 05 80 00 00 05 00 10 00 06 01 00 12 34 56 78 9a bc de f0 \ 00 00 00 02 00 01 00 00 \ 00 08 00 03 00 01 86 a0 \ "], [0], [dnl