| Message ID | 20170612222856.14108-29-blp@ovn.org |
|---|---|
| State | Superseded |
| Headers | show |
See discussion for patch 15/31. > -----Original Message----- > From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev-bounces@openvswitch.org] On Behalf Of Ben Pfaff > Sent: Tuesday, 13 June, 2017 00:29 > To: dev@openvswitch.org > Cc: Ben Pfaff <blp@ovn.org> > Subject: [ovs-dev] [PATCH 28/31] fixup: Make tests set legacy-l3-pipeline instead of packet-type-aware. > > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > tests/ofproto.at | 4 ++-- > tests/system-userspace-packet-type-aware.at | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/ofproto.at b/tests/ofproto.at > index dc0a90c873ed..67eeced58ebd 100644 > --- a/tests/ofproto.at > +++ b/tests/ofproto.at > @@ -4195,7 +4195,7 @@ AT_SETUP([ofproto - packet-out with set_field metadata with packet_type PT_IPV4 > OVS_VSWITCHD_START > > AT_CHECK([ > - ovs-vsctl set bridge br0 other-config:packet-type-aware=true > + ovs-vsctl set bridge br0 other-config:legacy-l3-pipeline=false > ], [0]) > > # Start a monitor listening for packet-ins. > @@ -4214,7 +4214,7 @@ ovs-appctl -t ovs-ofctl exit > > AT_CHECK([sed 's/ (xid=0x[[0-9a-fA-F]]*)//' monitor.log], [0], [dnl > OFPT_PACKET_IN (OF1.3): total_len=32 packet_type=(1,0x800),metadata=0xfafafafa5a5a5a5a,in_port=CONTROLLER (via action) > data_len=32 (unbuffered) > -nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 udp_csum:ea78 > +packet_type=(1,0x800),nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 > udp_csum:ea78 > OFPT_BARRIER_REPLY (OF1.3): > ]) > > diff --git a/tests/system-userspace-packet-type-aware.at b/tests/system-userspace-packet-type-aware.at > index ec2514cbbde9..8ecde6648b30 100644 > --- a/tests/system-userspace-packet-type-aware.at > +++ b/tests/system-userspace-packet-type-aware.at > @@ -72,7 +72,7 @@ AT_CHECK([ > ovs-vsctl add-br br-in1 -- \ > set bridge br-in1 datapath_type=netdev fail-mode=standalone > ovs-vsctl add-br br-in2 -- \ > - set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:packet-type-aware=true > + set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:legacy-l3-pipeline=true > ovs-vsctl add-br br-in3 -- \ > set bridge br-in3 datapath_type=netdev fail-mode=standalone > ovs-vsctl add-br br-p1 -- \ > -- > 2.10.2 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/tests/ofproto.at b/tests/ofproto.at index dc0a90c873ed..67eeced58ebd 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -4195,7 +4195,7 @@ AT_SETUP([ofproto - packet-out with set_field metadata with packet_type PT_IPV4 OVS_VSWITCHD_START AT_CHECK([ - ovs-vsctl set bridge br0 other-config:packet-type-aware=true + ovs-vsctl set bridge br0 other-config:legacy-l3-pipeline=false ], [0]) # Start a monitor listening for packet-ins. @@ -4214,7 +4214,7 @@ ovs-appctl -t ovs-ofctl exit AT_CHECK([sed 's/ (xid=0x[[0-9a-fA-F]]*)//' monitor.log], [0], [dnl OFPT_PACKET_IN (OF1.3): total_len=32 packet_type=(1,0x800),metadata=0xfafafafa5a5a5a5a,in_port=CONTROLLER (via action) data_len=32 (unbuffered) -nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 udp_csum:ea78 +packet_type=(1,0x800),nw_src=10.0.0.20,nw_dst=10.0.0.30,nw_proto=17,nw_tos=0,nw_ecn=0,nw_ttl=255,tp_src=100,tp_dst=200 udp_csum:ea78 OFPT_BARRIER_REPLY (OF1.3): ]) diff --git a/tests/system-userspace-packet-type-aware.at b/tests/system-userspace-packet-type-aware.at index ec2514cbbde9..8ecde6648b30 100644 --- a/tests/system-userspace-packet-type-aware.at +++ b/tests/system-userspace-packet-type-aware.at @@ -72,7 +72,7 @@ AT_CHECK([ ovs-vsctl add-br br-in1 -- \ set bridge br-in1 datapath_type=netdev fail-mode=standalone ovs-vsctl add-br br-in2 -- \ - set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:packet-type-aware=true + set bridge br-in2 datapath_type=netdev fail-mode=standalone other-config:legacy-l3-pipeline=true ovs-vsctl add-br br-in3 -- \ set bridge br-in3 datapath_type=netdev fail-mode=standalone ovs-vsctl add-br br-p1 -- \
Signed-off-by: Ben Pfaff <blp@ovn.org> --- tests/ofproto.at | 4 ++-- tests/system-userspace-packet-type-aware.at | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)