On Wed, Jun 4, 2025 at 12:02 PM Dumitru Ceara <dce...@redhat.com> wrote:
> On 6/4/25 8:18 AM, Ales Musil wrote: > > There is difference between ping version in Fedora <=40 and >=41. > > Adjust the check so it works for both versions. > > > > Fedora 40: > > ping: local error: message too long, mtu=1500 > > > > Fedora 41: > > ping: sendmsg: Message too long > > > > Signed-off-by: Ales Musil <amu...@redhat.com> > > --- > > Hi Ales, > > Just a small nit, but I won't insist if you already have this ready to > be applied as is: on most of the likes where we grep for "message too > long" we might as well also fix the spacing, i.e., ".. |grep -q ...". > > In any case: > > Acked-by: Dumitru Ceara <dce...@redhat.com> > > Thanks, > Dumitru > > > tests/multinode.at | 24 +++++++++++------------- > > 1 file changed, 11 insertions(+), 13 deletions(-) > > > > diff --git a/tests/multinode.at b/tests/multinode.at > > index 49e128387..95e2f0c59 100644 > > --- a/tests/multinode.at > > +++ b/tests/multinode.at > > @@ -198,14 +198,14 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q > -c 3 -i 0.3 -w 2 20.0.0.3 | F > > > > # Change ptmu for the geneve tunnel > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1142"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1400 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q "message too long, mtu: 1342"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q -c 3 -i 0.3 -w 2 > 172.20.1.2 | FORMAT_PING], \ > > [0], [dnl > > @@ -341,7 +341,7 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q > -c 3 -i 0.3 -w 2 20.0.0.3 | F > > > > # Change ptmu for the vxlan tunnel > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1150"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -476,14 +476,14 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip > route add 10.0.0.0/24 dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1142"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1400 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q "message too long, mtu: 1342"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -618,7 +618,7 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route > add 10.0.0.0/24 dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1150"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -754,14 +754,14 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip > route add 10.0.0.0/24 dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1142"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1400 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q "message too long, mtu: 1342"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping6 -c 5 -s 1450 -M do > 2000::3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -907,7 +907,7 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route > add 10.0.0.0/24 dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add default via > 10.0.0.1 dev sw0p1]) > > > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q "message too long, mtu=1150"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 |grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -1018,8 +1018,7 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q > -c 3 -i 0.3 -w 2 10.0.0.4 | F > > > > # Change ptmu for the geneve tunnel > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1200 dev eth1 > > -mtu=$((1200 - overhead)) > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 10.0.0.4 2>&1 | grep -q "message too long, mtu=$mtu"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 10.0.0.4 2>&1 | grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > @@ -1032,8 +1031,7 @@ M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -q > -c 3 -i 0.3 -w 2 20.0.0.3 | F > > > > # Change ptmu for the geneve tunnel > > m_as ovn-chassis-1 ip route change 170.168.0.0/16 mtu 1100 dev eth1 > > -mtu=$((1100 - overhead)) > > -M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 | grep -q "message too long, mtu=$mtu"]) > > +M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ping -c 5 -s 1300 -M do > 20.0.0.3 2>&1 | grep -q -i "message too long"]) > > > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route flush dev sw0p1]) > > M_NS_CHECK_EXEC([ovn-chassis-1], [sw0p1], [ip route add 10.0.0.0/24 > dev sw0p1]) > > Thank you Dumitru, I took care of the nit and went ahead and merged this into main and backported it all the way down to 24.03. Regards, Ales _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
