system-ovn: fix CoPP test failures

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 <lorenzo.bianconi@redhat.com>
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Numan Siddique <numans@ovn.org>
(cherry picked from commit e922c05)

tests/system-ovn.at

@@ -6922,10 +6922,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
@@ -6938,10 +6938,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)
@@ -6974,10 +6974,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)
 
@@ -6994,10 +6994,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)
 
@@ -7010,7 +7010,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")
@@ -7023,10 +7023,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"
 ])
 kill $(pidof tcpdump)