OK
> -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Ben Pfaff > Sent: Tuesday, 13 June, 2017 00:29 > To: [email protected] > Cc: Ben Pfaff <[email protected]> > Subject: [ovs-dev] [PATCH 30/31] fixup: Update test expected results. > > The code now suppresses the default packet_type. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > tests/ofp-print.at | 12 ++++++------ > tests/ofproto.at | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/ofp-print.at b/tests/ofp-print.at > index fc444f62bf4c..a00e3f3fe74b 100644 > --- a/tests/ofp-print.at > +++ b/tests/ofp-print.at > @@ -731,7 +731,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ > 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ > 00 00 00 00 \ > "], [0], [dnl > -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 > buffer=0x00000114 > +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 buffer=0x00000114 > ]) > AT_CLEANUP > > @@ -745,7 +745,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ > 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ > 00 00 00 00 \ > "], [0], [dnl > -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 > data_len=60 > +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 data_len=60 > > tcp,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,nw_tos=0,nw_ecn=0,nw_ > ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 > ]) > AT_CLEANUP > @@ -760,7 +760,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ > 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ > 00 00 00 00 \ > " 3], [0], [dnl > -OFPT_PACKET_OUT (xid=0x0): packet_type=(0,0),in_port=1 actions=output:3 > data_len=60 > +OFPT_PACKET_OUT (xid=0x0): in_port=1 actions=output:3 data_len=60 > > tcp,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,nw_tos=0,nw_ecn=0,nw_ > ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 > 00000000 50 54 00 00 00 05 50 54-00 00 00 06 08 00 45 00 > 00000010 00 28 00 00 40 00 40 06-b9 7c c0 a8 00 02 c0 a8 > @@ -776,7 +776,7 @@ AT_CHECK([ovs-ofctl ofp-print "\ > 00 10 00 00 00 00 00 00 00 00 00 10 ff ff ff fb \ > 05 dc 00 00 00 00 00 00 \ > "], [0], [dnl > -OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): packet_type=(0,0),in_port=LOCAL > actions=FLOOD buffer=0xffffff00 > +OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): in_port=LOCAL actions=FLOOD > buffer=0xffffff00 > ]) > AT_CLEANUP > > @@ -791,7 +791,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ > 00 00 6a 4f 2b 58 50 14 00 00 6d 75 00 00 00 00 \ > 00 00 00 00 \ > "], [0], [dnl > -OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): packet_type=(0,0),in_port=LOCAL > actions=FLOOD data_len=60 > +OFPT_PACKET_OUT (OF1.2) (xid=0x8858dfc5): in_port=LOCAL actions=FLOOD > data_len=60 > > tcp,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,nw_tos=0,nw_ecn=0,nw_ > ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 > ]) > AT_CLEANUP > @@ -3670,7 +3670,7 @@ b9 7c c0 a8 00 02 c0 a8 00 01 00 00 2b 60 00 00 \ > "], [0], [dnl > OFPT_BUNDLE_ADD_MESSAGE (OF1.4) (xid=0x3): > bundle_id=0x1 flags=atomic > -OFPT_PACKET_OUT (OF1.4) (xid=0x3): packet_type=(0,0),in_port=LOCAL > actions=FLOOD data_len=60 > +OFPT_PACKET_OUT (OF1.4) (xid=0x3): in_port=LOCAL actions=FLOOD data_len=60 > > tcp,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,nw_tos=0,nw_ecn=0,nw_ > ttl=64,tp_src=0,tp_dst=11104,tcp_flags=rst|ack tcp_csum:6d75 > ]) > AT_CLEANUP > diff --git a/tests/ofproto.at b/tests/ofproto.at > index 67eeced58ebd..3dd5cbea0063 100644 > --- a/tests/ofproto.at > +++ b/tests/ofproto.at > @@ -2141,7 +2141,7 @@ packet-out in_port=6, > packet=0001020304050010203040501234 actions=table > packet-out in_port=6, packet=0001020304050010203040501234 actions=group:2 > ]) > AT_CHECK([ovs-ofctl bundle br0 bundle.txt 2>&1 | sed '/talking to/,$d' | > strip_xids], [], [dnl > -Error OFPBAC_BAD_OUT_GROUP for: OFPT_PACKET_OUT (OF1.4): > packet_type=(0,0),in_port=6 actions=group:2 data_len=14 > +Error OFPBAC_BAD_OUT_GROUP for: OFPT_PACKET_OUT (OF1.4): in_port=6 > actions=group:2 data_len=14 > > vlan_tci=0x0000,dl_src=00:10:20:30:40:50,dl_dst=00:01:02:03:04:05,dl_type=0x1234 > Error OFPBFC_MSG_FAILED for: OFPT_BUNDLE_CONTROL (OF1.4): > bundle_id=0 type=COMMIT_REQUEST flags=atomic ordered > -- > 2.10.2 > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
