Message ID | 20250122084134.402764-1-dceara@redhat.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev,branch-22.03] tests: Add missing reset_pcap_file() definition to EDNS test. | expand |
Context | Check | Description |
---|---|---|
ovsrobot/apply-robot | success | apply and check: success |
ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On 1/22/25 9:41 AM, Dumitru Ceara wrote: > When backporting f22a1ba9c127 ("Skip only OVN DNS responder packets from > OUT_ACL.") we missed the fact that on branch-22.03 reset_pcap_file() had > not been factored out as a standalone helper. That is, commit > 8f841ecbe28e ("tests: Factor out reset_pcap_file() helper.") is missing > on branch 22.03. > > For simplicity, adapt the EDNS test to include its own definition of the > helper (similar to other tests on the 22.03 branch). > > Fixes: f22a1ba9c127 ("Skip only OVN DNS responder packets from OUT_ACL.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- Recheck-request: github-robot
Thanks Dumitru. Acked-by: Mark Michelson <mmichels@redhat.com> On 1/22/25 03:41, Dumitru Ceara wrote: > When backporting f22a1ba9c127 ("Skip only OVN DNS responder packets from > OUT_ACL.") we missed the fact that on branch-22.03 reset_pcap_file() had > not been factored out as a standalone helper. That is, commit > 8f841ecbe28e ("tests: Factor out reset_pcap_file() helper.") is missing > on branch 22.03. > > For simplicity, adapt the EDNS test to include its own definition of the > helper (similar to other tests on the 22.03 branch). > > Fixes: f22a1ba9c127 ("Skip only OVN DNS responder packets from OUT_ACL.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- > tests/ovn.at | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/tests/ovn.at b/tests/ovn.at > index 2fb8519959..4649d733ad 100644 > --- a/tests/ovn.at > +++ b/tests/ovn.at > @@ -10904,6 +10904,16 @@ OVN_POPULATE_ARP > wait_for_ports_up > check ovn-nbctl --wait=hv sync > > +reset_pcap_file() { > + local iface=$1 > + local pcap_file=$2 > + check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \ > +options:rxq_pcap=dummy-rx.pcap > + rm -f ${pcap_file}*.pcap > + check ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \ > +options:rxq_pcap=${pcap_file}-rx.pcap > +} > + > dns_req=$(fmt_pkt "Ether(dst='00:00:00:00:00:02', src='00:00:00:00:00:01') / \ > IP(dst='10.0.0.254', src='10.0.0.1') / \ > UDP(sport=42424, dport=53) / \
On 1/22/25 4:02 PM, Mark Michelson wrote: > Thanks Dumitru. > > Acked-by: Mark Michelson <mmichels@redhat.com> > Applied to branch-22.03. Thanks!
diff --git a/tests/ovn.at b/tests/ovn.at index 2fb8519959..4649d733ad 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -10904,6 +10904,16 @@ OVN_POPULATE_ARP wait_for_ports_up check ovn-nbctl --wait=hv sync +reset_pcap_file() { + local iface=$1 + local pcap_file=$2 + check ovs-vsctl -- set Interface $iface options:tx_pcap=dummy-tx.pcap \ +options:rxq_pcap=dummy-rx.pcap + rm -f ${pcap_file}*.pcap + check ovs-vsctl -- set Interface $iface options:tx_pcap=${pcap_file}-tx.pcap \ +options:rxq_pcap=${pcap_file}-rx.pcap +} + dns_req=$(fmt_pkt "Ether(dst='00:00:00:00:00:02', src='00:00:00:00:00:01') / \ IP(dst='10.0.0.254', src='10.0.0.1') / \ UDP(sport=42424, dport=53) / \
When backporting f22a1ba9c127 ("Skip only OVN DNS responder packets from OUT_ACL.") we missed the fact that on branch-22.03 reset_pcap_file() had not been factored out as a standalone helper. That is, commit 8f841ecbe28e ("tests: Factor out reset_pcap_file() helper.") is missing on branch 22.03. For simplicity, adapt the EDNS test to include its own definition of the helper (similar to other tests on the 22.03 branch). Fixes: f22a1ba9c127 ("Skip only OVN DNS responder packets from OUT_ACL.") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- tests/ovn.at | 10 ++++++++++ 1 file changed, 10 insertions(+)