| Message ID | 20240307151856.2858651-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] tests: Skip EDNS test if the scapy version doesn't support it. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
On Thu, Mar 7, 2024 at 4:19 PM Dumitru Ceara <dceara@redhat.com> wrote: > EDNS0ClientSubnet is quite a recent addition to scapy and not all > distros might already have a new enough version of scapy available. > > Fixes: b7fe2c8b1b08 ("pinctrl: dns: Ignore additional records.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- > Hi Dumitru, thank you for the patch, I have one small comment down below. > tests/ovn-macros.at | 6 ++++++ > tests/ovn.at | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at > index 269023ca81..a70d2ccaa7 100644 > --- a/tests/ovn-macros.at > +++ b/tests/ovn-macros.at > @@ -1030,6 +1030,12 @@ m4_define([TAG_UNSTABLE], [ > AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes]) > ]) > > +m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT], > +[ > + AT_SKIP_IF([test $HAVE_SCAPY = no]) > + AT_SKIP_IF([! echo "from scapy.layers.dns import EDNS0ClientSubnet" | > python &> /dev/null]) > &> isn't POSIX compliant, we should use &2>1 >/dev/null. > +]) > + > m4_define([OFTABLE_PHY_TO_LOG], [0]) > m4_define([OFTABLE_LOG_INGRESS_PIPELINE], [8]) > m4_define([OFTABLE_OUTPUT_LARGE_PKT_DETECT], [37]) > diff --git a/tests/ovn.at b/tests/ovn.at > index d26c950543..e87df6c8dc 100644 > --- a/tests/ovn.at > +++ b/tests/ovn.at > @@ -11498,7 +11498,7 @@ AT_CLEANUP > > OVN_FOR_EACH_NORTHD([ > AT_SETUP([dns lookup : EDNS]) > -AT_SKIP_IF([test $HAVE_SCAPY = no]) > +OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT() > ovn_start > > check ovn-nbctl ls-add ls \ > -- > 2.39.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > With the above addressed: Acked-by: Ales Musil <amusil@redhat.com> Thanks, Ales
On 3/8/24 09:26, Ales Musil wrote: > On Thu, Mar 7, 2024 at 4:19 PM Dumitru Ceara <dceara@redhat.com> wrote: > >> EDNS0ClientSubnet is quite a recent addition to scapy and not all >> distros might already have a new enough version of scapy available. >> >> Fixes: b7fe2c8b1b08 ("pinctrl: dns: Ignore additional records.") >> Signed-off-by: Dumitru Ceara <dceara@redhat.com> >> --- >> > > Hi Dumitru, > thank you for the patch, I have one small comment down below. > > >> tests/ovn-macros.at | 6 ++++++ >> tests/ovn.at | 2 +- >> 2 files changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at >> index 269023ca81..a70d2ccaa7 100644 >> --- a/tests/ovn-macros.at >> +++ b/tests/ovn-macros.at >> @@ -1030,6 +1030,12 @@ m4_define([TAG_UNSTABLE], [ >> AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes]) >> ]) >> >> +m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT], >> +[ >> + AT_SKIP_IF([test $HAVE_SCAPY = no]) >> + AT_SKIP_IF([! echo "from scapy.layers.dns import EDNS0ClientSubnet" | >> python &> /dev/null]) >> > > &> isn't POSIX compliant, we should use &2>1 >/dev/null. > You're right, "2>&1" is the right way. I fixed it up. > >> +]) >> + >> m4_define([OFTABLE_PHY_TO_LOG], [0]) >> m4_define([OFTABLE_LOG_INGRESS_PIPELINE], [8]) >> m4_define([OFTABLE_OUTPUT_LARGE_PKT_DETECT], [37]) >> diff --git a/tests/ovn.at b/tests/ovn.at >> index d26c950543..e87df6c8dc 100644 >> --- a/tests/ovn.at >> +++ b/tests/ovn.at >> @@ -11498,7 +11498,7 @@ AT_CLEANUP >> >> OVN_FOR_EACH_NORTHD([ >> AT_SETUP([dns lookup : EDNS]) >> -AT_SKIP_IF([test $HAVE_SCAPY = no]) >> +OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT() >> ovn_start >> >> check ovn-nbctl ls-add ls \ >> -- >> 2.39.3 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >> > > With the above addressed: > > Acked-by: Ales Musil <amusil@redhat.com> > Thanks! Applied to main and all branches down to 22.03. Regards, Dumitru
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 269023ca81..a70d2ccaa7 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -1030,6 +1030,12 @@ m4_define([TAG_UNSTABLE], [ AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes]) ]) +m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT], +[ + AT_SKIP_IF([test $HAVE_SCAPY = no]) + AT_SKIP_IF([! echo "from scapy.layers.dns import EDNS0ClientSubnet" | python &> /dev/null]) +]) + m4_define([OFTABLE_PHY_TO_LOG], [0]) m4_define([OFTABLE_LOG_INGRESS_PIPELINE], [8]) m4_define([OFTABLE_OUTPUT_LARGE_PKT_DETECT], [37]) diff --git a/tests/ovn.at b/tests/ovn.at index d26c950543..e87df6c8dc 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -11498,7 +11498,7 @@ AT_CLEANUP OVN_FOR_EACH_NORTHD([ AT_SETUP([dns lookup : EDNS]) -AT_SKIP_IF([test $HAVE_SCAPY = no]) +OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT() ovn_start check ovn-nbctl ls-add ls \
EDNS0ClientSubnet is quite a recent addition to scapy and not all distros might already have a new enough version of scapy available. Fixes: b7fe2c8b1b08 ("pinctrl: dns: Ignore additional records.") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- tests/ovn-macros.at | 6 ++++++ tests/ovn.at | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)