Fix some of the race conditions that are present in the current OVN test suite.
Signed-off-by: Dumitru Ceara <[email protected]> Signed-off-by: Ben Pfaff <[email protected]> (cherry picked from commit d6594a4695084e1b0f4fb3170547942876d3a81a) Signed-off-by: Frode Nordahl <[email protected]> --- tests/ovn.at | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 8f7dec55d..b38f6c9bc 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -4045,6 +4045,7 @@ for i in 1 2 3; do ovn-nbctl lsp-set-addresses lp$i$j "f0:00:00:00:00:$i$j 192.168.0.$i$j" "$extra_addr" ovn-nbctl lsp-set-port-security lp$i$j "f0:00:00:00:00:$i$j 192.168.0.$i$j" "$extra_addr" fi + OVS_WAIT_UNTIL([test x`ovn-nbctl lsp-get-up lp$i$j` = xup]) done done @@ -13435,14 +13436,15 @@ ovn-nbctl --wait=hv sync # Check OVS flows, the less restrictive flows should have been installed. AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=45 | \ - grep "priority=1003" | awk '{print $7 " " $8}' | sort], [0], [dnl + grep "priority=1003" | awk '{print $7 " " $8}' | \ + sed 's/conjunction([[^)]]*)/conjunction()/g' | sort], [0], [dnl priority=1003,conj_id=2,ip,metadata=0x1 actions=resubmit(,46) priority=1003,conj_id=3,ip,metadata=0x1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(2,1/2),conjunction(3,1/2) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(2,1/2),conjunction(3,1/2) +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(),conjunction() priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction(2,2/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction(3,2/2) +priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction() ]) # Traffic 10.0.0.1, 10.0.0.2 -> 10.0.0.3, 10.0.0.4 should be allowed. @@ -13480,14 +13482,15 @@ ovn-nbctl --wait=hv sync # Check OVS flows, the second less restrictive allow ACL should have been installed. AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=45 | \ - grep "priority=1003" | awk '{print $7 " " $8}' | sort], [0], [dnl + grep "priority=1003" | awk '{print $7 " " $8}' | \ + sed 's/conjunction([[^)]]*)/conjunction()/g' | sort], [0], [dnl priority=1003,conj_id=2,ip,metadata=0x1 actions=resubmit(,46) priority=1003,conj_id=3,ip,metadata=0x1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(2,1/2),conjunction(3,1/2) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(2,1/2),conjunction(3,1/2) +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(),conjunction() priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction(2,2/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction(3,2/2) +priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction() ]) # Remove the less restrictive allow ACL. @@ -13496,14 +13499,15 @@ ovn-nbctl --wait=hv sync # Check OVS flows, the 10.0.0.1 conjunction should have been reinstalled. AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=45 | \ - grep "priority=1003" | awk '{print $7 " " $8}' | sort], [0], [dnl + grep "priority=1003" | awk '{print $7 " " $8}' | \ + sed 's/conjunction([[^)]]*)/conjunction()/g' | sort], [0], [dnl priority=1003,conj_id=2,ip,metadata=0x1 actions=resubmit(,46) priority=1003,conj_id=3,ip,metadata=0x1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(2,1/2),conjunction(3,1/2) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(2,1/2),conjunction(3,1/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 actions=conjunction(2,2/2),conjunction(3,2/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction(2,2/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction(3,2/2) +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction() ]) # Traffic 10.0.0.1, 10.0.0.2 -> 10.0.0.3, 10.0.0.4 should be allowed. @@ -13534,14 +13538,15 @@ ovn-nbctl --wait=hv sync # Check OVS flows, the less restrictive flows should have been installed. AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=45 | \ - grep "priority=1003" | awk '{print $7 " " $8}' | sort], [0], [dnl + grep "priority=1003" | awk '{print $7 " " $8}' | \ + sed 's/conjunction([[^)]]*)/conjunction()/g' | sort], [0], [dnl priority=1003,conj_id=2,ip,metadata=0x1 actions=resubmit(,46) priority=1003,conj_id=3,ip,metadata=0x1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(2,1/2),conjunction(3,1/2) -priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(2,1/2),conjunction(3,1/2) +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 actions=conjunction(),conjunction() +priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 actions=conjunction(),conjunction() priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 actions=resubmit(,46) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction(2,2/2) -priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction(3,2/2) +priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 actions=conjunction() +priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 actions=conjunction() ]) OVN_CLEANUP([hv1]) @@ -14139,6 +14144,7 @@ ovn-nbctl set Logical_Switch_Port ls1-lr0 type=router \ # Create HA chassis group ovn-nbctl ha-chassis-group-add hagrp1 ovn-nbctl ha-chassis-group-add-chassis hagrp1 hv1 30 +ovn-nbctl --wait=sb sync hagrp1_uuid=`ovn-nbctl --bare --columns _uuid find ha_chassis_group name="hagrp1"` -- 2.30.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
