The iproute2 tool recently changed behavior [0] which has effect
on representation of values currently used for assertions in the
"egress qos" system test.

The purpose of the OVN test case is to ensure the system is
updated on the back of changes to the database and not to
implementation details of iproute2.

Relax the assertions made on the tc representation of htb cburst
values.

0: 
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=d947f365602b30657d1b797e7464000d0ab88d5a
Reported-at: https://bugs.launchpad.net/ubuntu/+source/iproute2/+bug/2129005
Signed-off-by: Frode Nordahl <[email protected]>
---
 tests/system-ovn.at | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 2b880ec37..28ad896e9 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -6974,7 +6974,7 @@ AT_CHECK([ovn-nbctl remove Logical_Switch_Port public 
options qos_min_rate=20000
 AT_CHECK([ovn-nbctl remove Logical_Switch_Port public options 
qos_max_rate=300000])
 
 OVS_WAIT_UNTIL([tc class show dev ovs-public | \
-                grep -q 'class htb .* rate 12Kbit ceil 34359Mbit burst 375000b 
cburst 373662b'])
+                grep -q 'class htb .* rate 12Kbit ceil 34359Mbit burst 375000b 
cburst 37....b'])
 
 AT_CHECK([ovn-nbctl remove Logical_Switch_Port public options 
qos_burst=3000000])
 OVS_WAIT_UNTIL([test "$(tc qdisc show | grep 'htb 1: dev ovs-public')" = ""])
@@ -7079,7 +7079,7 @@ AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 
options:qos_max_rate=6000000000
 AT_CHECK([ovn-nbctl set Logical_Switch_Port sw02 options:qos_burst=1000000])
 
 OVS_WAIT_UNTIL([tc class show dev ovs-public | \
-                grep -q 'class htb .* prio 0 rate 5Gbit ceil 6Gbit burst 
125000b cburst 124500b'])
+                grep -q 'class htb .* prio 0 rate 5Gbit ceil 6Gbit burst 
125000b cburst 12....b'])
 
 OVN_CLEANUP_CONTROLLER([hv1])
 
-- 
2.51.0

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

Reply via email to