The test doesn't sort the OpenFlow dump resulting in failures
depending on hash map order, i.e., compiler flags and architecture.
Fixes: 7c3f7f415f1d ("northd, controller: Flood ARP and NA packet on transit
router.")
Signed-off-by: Ilya Maximets <[email protected]>
---
tests/ovn-controller.at | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
index 33bae69e1..181a8afe0 100644
--- a/tests/ovn-controller.at
+++ b/tests/ovn-controller.at
@@ -3657,16 +3657,16 @@ AT_CHECK([grep -c "reg10=0/0x10000" flood_flows], [0],
[dnl
# Check ingress flows for ARP and ND NA
# Geneve
hv2_cookie="$(chassis_cookie hv2)"
-AT_CHECK_UNQUOTED([grep "cookie=$hv2_cookie," phy_to_log_flows], [0], [dnl
+AT_CHECK_UNQUOTED([grep "cookie=$hv2_cookie," phy_to_log_flows | sort], [0],
[dnl
cookie=$hv2_cookie,
priority=120,arp,tun_metadata0=0,in_port="ovn-hv2-0",arp_op=2
actions=load:0x1->NXM_NX_REG10[[16]],move:NXM_NX_TUN_ID[[0..23]]->OXM_OF_METADATA[[0..23]],move:NXM_NX_TUN_METADATA0[[16..30]]->NXM_NX_REG14[[0..14]],move:NXM_NX_TUN_METADATA0[[0..15]]->NXM_NX_REG15[[0..15]],load:0x1->NXM_NX_REG5[[16..31]],resubmit(,OFTABLE_LOG_INGRESS_PIPELINE)
cookie=$hv2_cookie,
priority=120,icmp6,tun_metadata0=0,in_port="ovn-hv2-0",icmp_type=136,icmp_code=0
actions=load:0x1->NXM_NX_REG10[[16]],move:NXM_NX_TUN_ID[[0..23]]->OXM_OF_METADATA[[0..23]],move:NXM_NX_TUN_METADATA0[[16..30]]->NXM_NX_REG14[[0..14]],move:NXM_NX_TUN_METADATA0[[0..15]]->NXM_NX_REG15[[0..15]],load:0x1->NXM_NX_REG5[[16..31]],resubmit(,OFTABLE_LOG_INGRESS_PIPELINE)
])
# VXLAN
hv3_cookie="$(chassis_cookie hv3)"
-AT_CHECK_UNQUOTED([grep "cookie=$hv3_cookie," phy_to_log_flows], [0], [dnl
- cookie=$hv3_cookie,
priority=120,icmp6,in_port="ovn-hv3-0",icmp_type=136,icmp_code=0
actions=load:0x1->NXM_NX_REG10[[16]],move:NXM_NX_TUN_ID[[12..23]]->NXM_NX_REG15[[0..11]],move:NXM_NX_TUN_ID[[0..11]]->OXM_OF_METADATA[[0..11]],resubmit(,OFTABLE_LOG_INGRESS_PIPELINE),resubmit(,OFTABLE_LOCAL_OUTPUT)
+AT_CHECK_UNQUOTED([grep "cookie=$hv3_cookie," phy_to_log_flows | sort], [0],
[dnl
cookie=$hv3_cookie, priority=120,arp,in_port="ovn-hv3-0",arp_op=2
actions=load:0x1->NXM_NX_REG10[[16]],move:NXM_NX_TUN_ID[[12..23]]->NXM_NX_REG15[[0..11]],move:NXM_NX_TUN_ID[[0..11]]->OXM_OF_METADATA[[0..11]],resubmit(,OFTABLE_LOG_INGRESS_PIPELINE),resubmit(,OFTABLE_LOCAL_OUTPUT)
+ cookie=$hv3_cookie,
priority=120,icmp6,in_port="ovn-hv3-0",icmp_type=136,icmp_code=0
actions=load:0x1->NXM_NX_REG10[[16]],move:NXM_NX_TUN_ID[[12..23]]->NXM_NX_REG15[[0..11]],move:NXM_NX_TUN_ID[[0..11]]->OXM_OF_METADATA[[0..11]],resubmit(,OFTABLE_LOG_INGRESS_PIPELINE),resubmit(,OFTABLE_LOCAL_OUTPUT)
])
OVN_CLEANUP([hv1])
--
2.52.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
