Looks good, Ethan
On Wed, Feb 1, 2012 at 16:35, Ben Pfaff <b...@nicira.com> wrote: > The ofctl_strip shell function was introduced a little while ago. It makes > test results easier to read, in my opinion, by removing uninteresting > bits. This commit adopts ofctl_strip throughout the tests. > > This is useful in an upcoming commit that adds additional fields that > should also be stripped to ovs-ofctl output. > > Signed-off-by: Ben Pfaff <b...@nicira.com> > --- > tests/learn.at | 22 +++++++------- > tests/ofproto-dpif.at | 24 ++++++++-------- > tests/ofproto.at | 76 ++++++++++++++++++++++++------------------------ > tests/ovs-ofctl.at | 8 ++-- > 4 files changed, 65 insertions(+), 65 deletions(-) > > diff --git a/tests/learn.at b/tests/learn.at > index 93192ab..943a7c8 100644 > --- a/tests/learn.at > +++ b/tests/learn.at > @@ -72,9 +72,9 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: 2,0,1 > ]) > > # Check for the MAC learning entry. > -AT_CHECK([ovs-ofctl dump-flows br0 table=1 | STRIP_XIDS | STRIP_DURATION | > sort], [0], [dnl > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, > hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:3 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, priority=0 > actions=FLOOD > +AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort], [0], [dnl > + table=1, hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:3 > + table=1, priority=0 actions=FLOOD > NXST_FLOW reply: > ]) > > @@ -85,10 +85,10 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: 3 > ]) > > # Check for both MAC learning entries. > -AT_CHECK([ovs-ofctl dump-flows br0 table=1 | STRIP_XIDS | STRIP_DURATION | > sort], [0], [dnl > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, > hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:3 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, > hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 > actions=output:1 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, priority=0 > actions=FLOOD > +AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip |sort], [0], [dnl > + table=1, hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:3 > + table=1, hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 > actions=output:1 > + table=1, priority=0 actions=FLOOD > NXST_FLOW reply: > ]) > > @@ -98,10 +98,10 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: 3,0,1 > ]) > > # Check that the MAC learning entry was updated. > -AT_CHECK([ovs-ofctl dump-flows br0 table=1 | STRIP_XIDS | STRIP_DURATION | > sort], [0], [dnl > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, > hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:2 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, > hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 > actions=output:1 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, priority=0 > actions=FLOOD > +AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort], [0], [dnl > + table=1, hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 > actions=output:2 > + table=1, hard_timeout=60,vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 > actions=output:1 > + table=1, priority=0 actions=FLOOD > NXST_FLOW reply: > ]) > OVS_VSWITCHD_STOP > diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at > index bb00714..6b4c216 100644 > --- a/tests/ofproto-dpif.at > +++ b/tests/ofproto-dpif.at > @@ -363,18 +363,18 @@ NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 > total_len=64 in_port=1 tun_id=0x6 > 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:17 tos:0 ttl:0 > ip(83.83.83.83->84.84.84.84) port(85->86) udp_csum:43a1 > ]) > > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_DURATION | sort], [0], [dnl > - cookie=0x0, duration=?s, table=0, n_packets=3, n_bytes=180, > dl_src=10:11:11:11:11:11 actions=CONTROLLER:65535 > - cookie=0x1, duration=?s, table=0, n_packets=2, n_bytes=120, > dl_src=20:22:22:22:22:22 actions=CONTROLLER:65535,resubmit(80,1) > - cookie=0x2, duration=?s, table=0, n_packets=3, n_bytes=180, > dl_src=30:33:33:33:33:33 actions=mod_vlan_vid:15,CONTROLLER:65535 > - cookie=0x3, duration=?s, table=1, n_packets=2, n_bytes=120, in_port=80 > actions=load:0x1->NXM_NX_REG0[[]],mod_vlan_vid:80,CONTROLLER:65535,resubmit(81,2) > - cookie=0x4, duration=?s, table=2, n_packets=2, n_bytes=120, in_port=81 > actions=load:0x2->NXM_NX_REG1[[]],mod_dl_src:80:81:81:81:81:81,CONTROLLER:65535,resubmit(82,3) > - cookie=0x5, duration=?s, table=3, n_packets=2, n_bytes=120, in_port=82 > actions=load:0x3->NXM_NX_REG2[[]],mod_dl_dst:82:82:82:82:82:82,CONTROLLER:65535,resubmit(83,4) > - cookie=0x6, duration=?s, table=4, n_packets=2, n_bytes=120, in_port=83 > actions=load:0x4->NXM_NX_REG3[[]],mod_nw_src:83.83.83.83,CONTROLLER:65535,resubmit(84,5) > - cookie=0x7, duration=?s, table=5, n_packets=2, n_bytes=120, in_port=84 > actions=load:0x5->NXM_NX_REG4[[]],load:0x6->NXM_NX_TUN_ID[[]],mod_nw_dst:84.84.84.84,CONTROLLER:65535,resubmit(85,6) > - cookie=0x8, duration=?s, table=6, n_packets=2, n_bytes=120, in_port=85 > actions=mod_tp_src:85,CONTROLLER:65535,resubmit(86,7) > - cookie=0x9, duration=?s, table=7, n_packets=2, n_bytes=120, in_port=86 > actions=mod_tp_dst:86,CONTROLLER:65535,CONTROLLER:65535 > -NXST_FLOW reply (xid=0x4): > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, n_packets=2, n_bytes=120, dl_src=20:22:22:22:22:22 > actions=CONTROLLER:65535,resubmit(80,1) > + cookie=0x2, n_packets=3, n_bytes=180, dl_src=30:33:33:33:33:33 > actions=mod_vlan_vid:15,CONTROLLER:65535 > + cookie=0x3, table=1, n_packets=2, n_bytes=120, in_port=80 > actions=load:0x1->NXM_NX_REG0[[]],mod_vlan_vid:80,CONTROLLER:65535,resubmit(81,2) > + cookie=0x4, table=2, n_packets=2, n_bytes=120, in_port=81 > actions=load:0x2->NXM_NX_REG1[[]],mod_dl_src:80:81:81:81:81:81,CONTROLLER:65535,resubmit(82,3) > + cookie=0x5, table=3, n_packets=2, n_bytes=120, in_port=82 > actions=load:0x3->NXM_NX_REG2[[]],mod_dl_dst:82:82:82:82:82:82,CONTROLLER:65535,resubmit(83,4) > + cookie=0x6, table=4, n_packets=2, n_bytes=120, in_port=83 > actions=load:0x4->NXM_NX_REG3[[]],mod_nw_src:83.83.83.83,CONTROLLER:65535,resubmit(84,5) > + cookie=0x7, table=5, n_packets=2, n_bytes=120, in_port=84 > actions=load:0x5->NXM_NX_REG4[[]],load:0x6->NXM_NX_TUN_ID[[]],mod_nw_dst:84.84.84.84,CONTROLLER:65535,resubmit(85,6) > + cookie=0x8, table=6, n_packets=2, n_bytes=120, in_port=85 > actions=mod_tp_src:85,CONTROLLER:65535,resubmit(86,7) > + cookie=0x9, table=7, n_packets=2, n_bytes=120, in_port=86 > actions=mod_tp_dst:86,CONTROLLER:65535,CONTROLLER:65535 > + n_packets=3, n_bytes=180, dl_src=10:11:11:11:11:11 actions=CONTROLLER:65535 > +NXST_FLOW reply: > ]) > > OVS_VSWITCHD_STOP > diff --git a/tests/ofproto.at b/tests/ofproto.at > index 7c34e14..d7fef5d 100644 > --- a/tests/ofproto.at > +++ b/tests/ofproto.at > @@ -72,44 +72,44 @@ AT_CLEANUP > > AT_SETUP([ofproto - basic flow_mod commands (NXM)]) > OVS_VSWITCHD_START > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS], [0], [NXST_FLOW reply: > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [NXST_FLOW reply: > ]) > AT_CHECK([echo 'in_port=1,actions=0' | ovs-ofctl add-flows br0 -]) > AT_CHECK([ovs-ofctl add-flow br0 in_port=0,actions=1]) > AT_CHECK([ovs-ofctl -F nxm add-flow br0 table=1,in_port=3,actions=2]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=0 > actions=output:1 > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, in_port=3 > actions=output:2 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + in_port=0 actions=output:1 > + in_port=1 actions=output:0 > + table=1, in_port=3 actions=output:2 > NXST_FLOW reply: > ]) > 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]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS], [0], [NXST_FLOW reply: > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [NXST_FLOW reply: > ]) > OVS_VSWITCHD_STOP > AT_CLEANUP > > AT_SETUP([ofproto - basic flow_mod commands (OpenFlow 1.0)]) > OVS_VSWITCHD_START > -AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS], [0], > [OFPST_FLOW reply: > +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], > [OFPST_FLOW reply: > ]) > AT_CHECK([echo 'in_port=1,actions=0' | ovs-ofctl -F openflow10 add-flows br0 > -]) > AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 in_port=0,actions=1]) > AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=3,actions=2]) > -AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS | > STRIP_DURATION | sort], [0], [dnl > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=0 > actions=output:1 > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x0, duration=?s, table=1, n_packets=0, n_bytes=0, in_port=3 > actions=output:2 > +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], > [dnl > + in_port=0 actions=output:1 > + in_port=1 actions=output:0 > + table=1, in_port=3 actions=output:2 > OFPST_FLOW reply: > ]) > 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]) > -AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS], [0], > [OFPST_FLOW reply: > +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], > [OFPST_FLOW reply: > ]) > OVS_VSWITCHD_STOP > AT_CLEANUP > @@ -119,17 +119,17 @@ OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=0]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x2, in_port=2 actions=output:0 > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > 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 | STRIP_XIDS | STRIP_DURATION > | sort], [0], [dnl > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 cookie=0x3 | ofctl_strip | sort], [0], > [dnl > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3 | STRIP_XIDS], [0], [dnl > @@ -143,18 +143,18 @@ OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=0]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x2, in_port=2 actions=output:0 > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > 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/0x1 | STRIP_XIDS | > STRIP_DURATION | sort], [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 cookie=0x3/0x1 | ofctl_strip | sort], > [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3/0x1 | STRIP_XIDS], [0], > [dnl > @@ -168,16 +168,16 @@ OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=0]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x2, in_port=2 actions=output:0 > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > AT_CHECK([ovs-ofctl del-flows br0 cookie=0x3]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x2, in_port=2 actions=output:0 > NXST_FLOW reply: > ]) > OVS_VSWITCHD_STOP > @@ -188,15 +188,15 @@ OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=0]) > AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=0]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x1, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=1 > actions=output:0 > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > - cookie=0x3, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=3 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x1, in_port=1 actions=output:0 > + cookie=0x2, in_port=2 actions=output:0 > + cookie=0x3, in_port=3 actions=output:0 > NXST_FLOW reply: > ]) > AT_CHECK([ovs-ofctl del-flows br0 cookie=0x3/0x1]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION | sort], > [0], [dnl > - cookie=0x2, duration=?s, table=0, n_packets=0, n_bytes=0, in_port=2 > actions=output:0 > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl > + cookie=0x2, in_port=2 actions=output:0 > NXST_FLOW reply: > ]) > OVS_VSWITCHD_STOP > diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at > index 0b58b3d..695b7da 100644 > --- a/tests/ovs-ofctl.at > +++ b/tests/ovs-ofctl.at > @@ -595,9 +595,9 @@ dnl for regression against bug #4566. > AT_SETUP([ovs-ofctl -F option with flow_mods]) > OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop]) > -AT_CHECK([ovs-ofctl dump-flows br0 | STRIP_XIDS | STRIP_DURATION], [0], [dnl > +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [dnl > NXST_FLOW reply: > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, tun_id=0x12345678 > actions=drop > + tun_id=0x12345678 actions=drop > ]) > OVS_VSWITCHD_STOP > AT_CLEANUP > @@ -607,9 +607,9 @@ dnl (If it isn't, then dump-flows will show the register > match.) > AT_SETUP([ovs-ofctl dump-flows honors -F option]) > OVS_VSWITCHD_START > AT_CHECK([ovs-ofctl add-flow br0 reg0=0x12345,actions=drop]) > -AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | STRIP_XIDS | > STRIP_DURATION], [0], [dnl > +AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [dnl > OFPST_FLOW reply: > - cookie=0x0, duration=?s, table=0, n_packets=0, n_bytes=0, actions=drop > + actions=drop > ]) > OVS_VSWITCHD_STOP > AT_CLEANUP > -- > 1.7.2.5 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
