summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBen Pfaff <blp@ovn.org>2016-10-07 08:32:22 -0700
committerBen Pfaff <blp@ovn.org>2016-10-07 08:33:56 -0700
commit8bc2c143e808e99177a3fb30649366e22088b395 (patch)
tree3db63f218ba939b7e4a3469ac02645b66df39471 /tests
parent6d53e8a9841a4421c15fb10049f4c2bfb361363e (diff)
downloadopenvswitch-8bc2c143e808e99177a3fb30649366e22088b395.tar.gz
ovn: Fix some races in IPAM connectivity test.
It can take a way for dynamic addresses to propagate through ovn-northd, so wait for it to happen. Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/ovn.at12
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/ovn.at b/tests/ovn.at
index e204c275f..50dce92e8 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -4731,23 +4731,17 @@ ovn-nbctl lsp-add alice rp-alice -- set Logical_Switch_Port rp-alice type=router
# Create logical port foo1 in foo
ovn-nbctl --wait=sb lsp-add foo foo1 \
-- lsp-set-addresses foo1 "dynamic"
-AT_CHECK([ovn-nbctl get Logical-Switch-Port foo1 dynamic_addresses], [0],
- ["0a:00:00:00:00:01 192.168.1.2"
-])
+AT_CHECK([ovn-nbctl --timeout=10 wait-until Logical-Switch-Port foo1 dynamic_addresses='"0a:00:00:00:00:01 192.168.1.2"'], [0])
# Create logical port alice1 in alice
ovn-nbctl --wait=sb lsp-add alice alice1 \
-- lsp-set-addresses alice1 "dynamic"
-AT_CHECK([ovn-nbctl get Logical-Switch-Port alice1 dynamic_addresses], [0],
- ["0a:00:00:00:00:02 192.168.2.2"
-])
+AT_CHECK([ovn-nbctl --timeout=10 wait-until Logical-Switch-Port alice1 dynamic_addresses='"0a:00:00:00:00:02 192.168.2.2"'])
# Create logical port foo2 in foo
ovn-nbctl --wait=sb lsp-add foo foo2 \
-- lsp-set-addresses foo2 "dynamic"
-AT_CHECK([ovn-nbctl get Logical-Switch-Port foo2 dynamic_addresses], [0],
- ["0a:00:00:00:00:03 192.168.1.3"
-])
+AT_CHECK([ovn-nbctl --timeout=10 wait-until Logical-Switch-Port foo2 dynamic_addresses='"0a:00:00:00:00:03 192.168.1.3"'])
# Create a hypervisor and create OVS ports corresponding to logical ports.
net_add n1