X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fofp-print.at;h=1fe54f1702a7a07d94786567b74c900806983abd;hb=6c4ea27c48b30eaec8e37e642d5072f53c5b2670;hp=feaea85f86c3b1e4e1f0b05078ed330b1279aa53;hpb=b9718b7ba7828c702a67d5411f935b263bb9c795;p=openvswitch diff --git a/tests/ofp-print.at b/tests/ofp-print.at index feaea85f..1fe54f17 100644 --- a/tests/ofp-print.at +++ b/tests/ofp-print.at @@ -278,7 +278,7 @@ c0 a8 00 02 27 2f 00 00 78 50 cc 5b 57 af 42 1e \ 50 00 02 00 26 e8 00 00 00 00 00 00 00 00 \ "], [0], [dnl OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=3 (via no_match) data_len=60 buffer=0x00000111 -priority:0,tunnel:0,in_port:0000,tci(0) mac(50:54:00:00:00:05->50:54:00:00:00:06) type:0800 proto:6 tos:0 ttl:64 ip(192.168.0.1->192.168.0.2) port(10031->0) tcp_csum:26e8 +priority:0,tunnel:0,metadata:0,in_port:0000,tci(0) mac(50:54:00:00:00:05->50:54:00:00:00:06) type:0800 proto:6 tos:0 ttl:64 ip(192.168.0.1->192.168.0.2) port(10031->0) tcp_csum:26e8 ]) AT_CLEANUP @@ -357,7 +357,7 @@ AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \ 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \ " 2], [0], [dnl -OFPT_FLOW_MOD (xid=0x0): ADD priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2 idle:5 buf:0x10e actions=output:3 +OFPT_FLOW_MOD (xid=0x0): ADD priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2 idle:5 buf:0x10e out_port:0 actions=output:3 ], [dnl ofp_util|INFO|normalization changed ofp_match, details: ofp_util|INFO| pre: priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0 @@ -365,7 +365,8 @@ ofp_util|INFO|post: priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00 ]) AT_CLEANUP -# The flow is formatted with ofp_match_to_string() for the high-verbosity case. +# The flow is formatted with ofp10_match_to_string() for the +# high-verbosity case. AT_SETUP([OFPT_FLOW_MOD - high verbosity]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "\ @@ -375,7 +376,7 @@ AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 00 \ 00 00 01 0e 00 00 00 00 00 00 00 08 00 03 00 00 \ " 3], [0], [dnl -OFPT_FLOW_MOD (xid=0x0): ADD arp,in_port=1,dl_vlan=65535,dl_vlan_pcp=0,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0 idle:5 pri:65535 buf:0x10e actions=output:3 +OFPT_FLOW_MOD (xid=0x0): ADD arp,in_port=1,dl_vlan=65535,dl_vlan_pcp=0,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0 idle:5 pri:65535 buf:0x10e out_port:0 actions=output:3 ], [dnl ofp_util|INFO|normalization changed ofp_match, details: ofp_util|INFO| pre: priority=65535,arp,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:06,dl_dst=50:54:00:00:00:05,nw_src=192.168.0.2,nw_dst=192.168.0.1,arp_op=2,nw_tos=0,tp_src=0,tp_dst=0 @@ -421,8 +422,8 @@ AT_SETUP([OFPST_DESC reply]) AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) AT_CHECK([ovs-ofctl ofp-print "\ 01 11 04 2c 00 00 00 01 00 00 00 00 4e 69 63 69 \ -72 61 20 4e 65 74 77 6f 72 6b 73 2c 20 49 6e 63 \ -2e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ +72 61 2c 20 49 6e 63 2e 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 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 00 00 \ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \ @@ -489,7 +490,7 @@ AT_CHECK([ovs-ofctl ofp-print "\ 00 00 00 00 00 00 00 00 00 00 00 00 \ "], [0], [dnl OFPST_DESC reply (xid=0x1): -Manufacturer: Nicira Networks, Inc. +Manufacturer: Nicira, Inc. Hardware: Open vSwitch Software: 1.1.0pre2 Serial Num: None @@ -688,6 +689,32 @@ OFPST_QUEUE reply (xid=0x1): 6 queues ]) AT_CLEANUP +AT_SETUP([OFPST_PORT_DESC request - OF1.0]) +AT_KEYWORDS([ofp-print OFPT_STATS_REQUEST]) +AT_CHECK([ovs-ofctl ofp-print "0110000c00000001000d0000"], [0], [dnl +OFPST_PORT_DESC request (xid=0x1): +]) +AT_CLEANUP + +AT_SETUP([OFPST_PORT_DESC reply - OF1.0]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +01 11 00 3c 00 00 00 00 00 0d 00 00 00 03 50 54 \ +00 00 00 01 65 74 68 30 00 00 00 00 00 00 00 00 \ +00 00 00 00 00 00 00 01 00 00 00 01 00 00 02 08 \ +00 00 02 8f 00 00 02 8f 00 00 00 00 \ +"], [0], [dnl +OFPST_PORT_DESC reply (xid=0x0): + 3(eth0): addr:50:54:00:00:00:01 + config: PORT_DOWN + state: LINK_DOWN + current: 100MB-FD AUTO_NEG + advertised: 10MB-HD 10MB-FD 100MB-HD 100MB-FD COPPER AUTO_NEG + supported: 10MB-HD 10MB-FD 100MB-HD 100MB-FD COPPER AUTO_NEG + speed: 100 Mbps now, 100 Mbps max +]) +AT_CLEANUP + AT_SETUP([OFPT_BARRIER_REQUEST]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print '01 12 00 08 00 00 00 01'], [0], [dnl @@ -735,20 +762,21 @@ AT_CLEANUP AT_SETUP([NXT_PACKET_IN]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print "\ -01 04 00 aa 00 00 00 00 00 00 23 20 00 00 00 11 \ +01 04 00 ba 00 00 00 00 00 00 23 20 00 00 00 11 \ ff ff ff ff 00 40 01 07 00 00 00 00 00 00 00 09 \ -00 3a 00 00 00 00 00 00 00 00 00 02 00 01 00 01 \ +00 4e 00 00 00 00 00 00 00 00 00 02 00 01 00 01 \ 20 08 00 00 00 00 00 00 00 06 00 01 00 04 00 00 \ 00 01 00 01 02 04 00 00 00 02 00 01 04 04 00 00 \ 00 03 00 01 06 04 00 00 00 04 00 01 08 04 00 00 \ -00 05 00 00 00 00 00 00 00 00 82 82 82 82 82 82 \ +00 05 80 00 05 10 5a 5a 5a 5a 5a 5a 5a 5a ff ff \ +00 00 ff ff 00 00 00 00 00 00 82 82 82 82 82 82 \ 80 81 81 81 81 81 81 00 00 50 08 00 45 00 00 28 \ 00 00 00 00 00 06 32 05 53 53 53 53 54 54 54 54 \ 00 55 00 56 00 00 00 00 00 00 00 00 50 00 00 00 \ 31 6d 00 00 00 00 00 00 00 00 \ "], [0], [dnl -NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 total_len=64 in_port=1 tun_id=0x6 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action) data_len=64 (unbuffered) -priority:0,tunnel:0,in_port:0000,tci(vlan:80,pcp:0) mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0 ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d +NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 total_len=64 in_port=1 tun_id=0x6 metadata=0x5a5a00005a5a0000/0xffff0000ffff0000 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action) data_len=64 (unbuffered) +priority:0,tunnel:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0) mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0 ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d ]) AT_CLEANUP @@ -782,6 +810,34 @@ NXT_SET_CONTROLLER_ID (xid=0x3): id=123 ]) AT_CLEANUP +AT_SETUP([NXT_FLOW_MONITOR_CANCEL]) +AT_KEYWORDS([ofp-print]) +AT_CHECK([ovs-ofctl ofp-print "\ +01 04 00 14 00 00 00 03 00 00 23 20 00 00 00 15 \ +01 02 30 40 \ +"], [0], [dnl +NXT_FLOW_MONITOR_CANCEL (xid=0x3): id=16920640 +]) +AT_CLEANUP + +AT_SETUP([NXT_FLOW_MONITOR_PAUSED]) +AT_KEYWORDS([ofp-print]) +AT_CHECK([ovs-ofctl ofp-print "\ +01 04 00 10 00 00 00 03 00 00 23 20 00 00 00 16 \ +"], [0], [dnl +NXT_FLOW_MONITOR_PAUSED (xid=0x3): +]) +AT_CLEANUP + +AT_SETUP([NXT_FLOW_MONITOR_RESUMED]) +AT_KEYWORDS([ofp-print]) +AT_CHECK([ovs-ofctl ofp-print "\ +01 04 00 10 00 00 00 03 00 00 23 20 00 00 00 17 \ +"], [0], [dnl +NXT_FLOW_MONITOR_RESUMED (xid=0x3): +]) +AT_CLEANUP + AT_SETUP([NXT_SET_FLOW_FORMAT]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print "\ @@ -798,27 +854,28 @@ AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print "\ 01 04 00 60 00 00 00 02 00 00 23 20 00 00 00 0d \ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 00 \ -ff ff ff ff ff ff 00 00 00 14 00 00 00 00 00 00 \ +ff ff ff ff 00 10 00 00 00 14 00 00 00 00 00 00 \ 00 01 20 08 00 00 00 00 00 00 01 c8 00 01 00 04 \ 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \ 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \ " 2], [0], [dnl -NXT_FLOW_MOD (xid=0x2): ADD reg0=0x7b,tun_id=0x1c8 actions=load:0x5->NXM_NX_REG0[[]] +NXT_FLOW_MOD (xid=0x2): ADD reg0=0x7b,tun_id=0x1c8 out_port:16 actions=load:0x5->NXM_NX_REG0[[]] ]) AT_CLEANUP -# The flow is formatted with ofp_match_to_string() for the low-verbosity case. +# The flow is formatted with ofp10_match_to_string() for the +# low-verbosity case. AT_SETUP([NXT_FLOW_MOD, high verbosity]) AT_KEYWORDS([ofp-print]) AT_CHECK([ovs-ofctl ofp-print "\ 01 04 00 60 00 00 00 02 00 00 23 20 00 00 00 0d \ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80 00 \ -ff ff ff ff ff ff 00 00 00 14 00 00 00 00 00 00 \ +ff ff ff ff 01 00 00 00 00 14 00 00 00 00 00 00 \ 00 01 20 08 00 00 00 00 00 00 01 c8 00 01 00 04 \ 00 00 00 7b 00 00 00 00 ff ff 00 18 00 00 23 20 \ 00 07 00 1f 00 01 00 04 00 00 00 00 00 00 00 05 \ " 3], [0], [dnl -NXT_FLOW_MOD (xid=0x2): ADD NXM_NX_TUN_ID(00000000000001c8), NXM_NX_REG0(0000007b) actions=load:0x5->NXM_NX_REG0[[]] +NXT_FLOW_MOD (xid=0x2): ADD NXM_NX_TUN_ID(00000000000001c8), NXM_NX_REG0(0000007b) out_port:256 actions=load:0x5->NXM_NX_REG0[[]] ]) AT_CLEANUP @@ -1032,3 +1089,30 @@ AT_CHECK([ovs-ofctl ofp-print "\ NXST_AGGREGATE reply (xid=0x4): packet_count=7 byte_count=420 flow_count=7 ]) AT_CLEANUP + +AT_SETUP([NXST_FLOW_MONITOR request]) +AT_KEYWORDS([ofp-print OFPT_STATS_REPLY]) +AT_CHECK([ovs-ofctl ofp-print "\ +01 10 00 40 00 00 00 04 ff ff 00 00 00 00 23 20 00 00 00 02 00 00 00 00 \ +00 00 40 00 00 3f ff fe 00 00 01 00 00 00 00 00 \ +00 00 20 00 00 04 ff ff 00 06 02 00 00 00 00 00 00 00 00 02 00 01 00 00 \ +"], [0], [dnl +NXST_FLOW_MONITOR request (xid=0x4): + id=16384 flags=initial,add,delete,modify,actions,own out_port=LOCAL table=1 + id=8192 flags=delete table=2 in_port=1 +]) +AT_CLEANUP + +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 00 00 02 00 01 00 00 \ +00 08 00 03 00 01 86 a0 \ +"], [0], [dnl +NXST_FLOW_MONITOR reply (xid=0x4): + event=DELETED reason=eviction table=1 idle_timeout=5 hard_timeout=16 cookie=0x123456789abcdef0 in_port=1 + event=ABBREV xid=0x186a0 +]) +AT_CLEANUP