On 4/12/22 11:32, Numan Siddique wrote:
On Tue, Apr 12, 2022 at 6:08 AM Dumitru Ceara <[email protected]> wrote:

On 4/12/22 10:02, Lorenzo Bianconi wrote:
Meter bucket configuration has been fixed in ovs commit
7d742b509dd7 ("openvswitch: meter: remove rate from the
bucket size calculation"). Fix CoPP system test failures due to new ovs
datapath behaviour.

Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2073060
Signed-off-by: Lorenzo Bianconi <[email protected]>


---
  tests/system-ovn.at | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 4c6ba628f..3d2591ee9 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -6927,10 +6927,10 @@ p = IP(src="192.168.1.2", dst="192.168.1.1") / UDP(dport = 12345) 
/ Raw(b"X"*64)
  send (p, iface='sw01', loop = 0, verbose = 0, count = 20)
  EOF

-# 1pps + 1 burst size
+# 1pps
  OVS_WAIT_UNTIL([
      n_reject=$(grep unreachable reject.pcap | wc -l)
-    test "${n_reject}" = "2"
+    test "${n_reject}" = "1"
  ])
  kill $(pidof tcpdump)
  rm -f reject.pcap
@@ -6943,10 +6943,10 @@ p = IP(src="192.168.1.2", dst="192.168.1.1") / UDP(dport = 12345) 
/ Raw(b"X"*64)
  send (p, iface='sw01', loop = 0, verbose = 0, count = 100)
  EOF

-# 10pps + 1 burst size
+# 10pps
  OVS_WAIT_UNTIL([
      n_reject=$(grep unreachable reject.pcap | wc -l)
-    test "${n_reject}" = "20"
+    test "${n_reject}" = "10"
  ])

  kill $(pidof tcpdump)
@@ -6979,10 +6979,10 @@ p = IP(src="192.168.1.2", dst="172.16.1.100") / TCP(dport = 80, 
flags="S") / Raw
  send (p, iface='sw01', loop = 0, verbose = 0, count = 100)
  EOF

-# 1pps + 1 burst size
+# 1pps
  OVS_WAIT_UNTIL([
      n_arp=$(grep ARP arp.pcap | wc -l)
-    test "${n_arp}" = "2"
+    test "${n_arp}" = "1"
  ])
  kill $(pidof tcpdump)

@@ -6999,10 +6999,10 @@ p = IP(src="192.168.1.2", dst="172.16.1.100", ttl=1) / 
TCP(dport = 8080, flags="
  send (p, iface='sw01', loop = 0, verbose = 0, count = 100)
  EOF

-# 1pps + 1 burst size
+# 1pps
  OVS_WAIT_UNTIL([
      n_icmp=$(grep ICMP icmp.pcap | wc -l)
-    test "${n_icmp}" = "2"
+    test "${n_icmp}" = "1"
  ])
  kill $(pidof tcpdump)

@@ -7015,7 +7015,7 @@ bfd: bfd-meter

  check ovn-nbctl --bfd lr-route-add R1 240.0.0.0/8 172.16.1.50 rp-public
  printf "%08x" $(ovn-sbctl get bfd . disc) > /tmp/disc
-NS_EXEC([server], [tcpdump -l -n -i s1 udp port 3784 -Q in > bfd.pcap &])
+NS_EXEC([server], [tcpdump -l -nn -i s1 udp port 3784 and ip[[29]]==0x90 -Q in > 
bfd.pcap &])
  ip netns exec server scapy -H <<-EOF
  import binascii
  f = open("/tmp/disc", "r")
@@ -7028,10 +7028,10 @@ f.close()
  EOF
  rm /tmp/disc

-# 1pps + 1 burst size
+# 1pps
  OVS_WAIT_UNTIL([
-    n_tcp_rst=$(grep Final bfd.pcap | wc -l)
-    test "${n_tcp_rst}" = "2"
+    n_bfd=$(grep 3784 bfd.pcap | wc -l)
+    test "${n_bfd}" = "1"

I'm not sure how this used to work before "grep Final bfd.pcap | wc -l"
always returned 0 on my machine.  In any case, it looks correct now.

  ])
  kill $(pidof tcpdump)


Fixes: e050e63c6c84 ("ovn-northd: Add CoPP policies for flows that punt packets to 
ovn-controller.")
Fixes: 797c672472a0 ("CoPP: add self-test for bfd controller action")
Acked-by: Dumitru Ceara <[email protected]>

The CI is finally green again:
https://github.com/ovsrobot/ovn/actions/runs/2153622217
https://github.com/ovsrobot/ovn/actions/runs/2153622220

Thanks Lorenzo for fixing this.  I applied this patch to the main branch.

Do we need to backport to branch-22.03 too ?


Based on a quick test I ran on branch-22.03, yes it's needed there too.


Numan


Thanks!

_______________________________________________
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


_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to