[ovs-dev] [PATCH ovn] tests: Use ovn-nbctl --wait=hv for DHCP option tests.

Gregory Smith gasmith at nutanix.com
Tue Oct 13 04:00:45 UTC 2020


This patch makes the "dhcpv4 : 1 HV, 2 LS, 2 LSPs/LS" testcase more
deterministic, by waiting for updates to DHCP options to take effect on
the hypervisor, before sending a DHCP request.

Fixes: b06319993deb ("Fix the data type for DHCP option tftp_server (66)")
Fixes: d79bb92c4b49 ("Add support for DHCP domain search option (119)")
Signed-off-by: Gregory Smith <gasmith at nutanix.com>
---
 tests/ovn.at | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 6f1ab5926..488fd119b 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -5815,7 +5815,7 @@ rm -f 2.expected
 
 # Set tftp server option (IPv4 address) for ls1
 echo "------ Set tftp server (IPv4 address) --------"
-ovn-nbctl dhcp-options-set-options $d1 server_id=10.0.0.1 \
+ovn-nbctl --wait=hv dhcp-options-set-options $d1 server_id=10.0.0.1 \
 server_mac=ff:10:00:00:00:01 lease_time=3600 router=10.0.0.1 \
 tftp_server=10.10.10.10
 echo "----------------------------------------------"
@@ -5846,7 +5846,7 @@ rm -f 2.expected
 
 # Set tftp server option (Hostname) for ls1
 echo "------ Set tftp server (hostname) --------"
-ovn-nbctl dhcp-options-set-options $d1 server_id=10.0.0.1 \
+ovn-nbctl --wait=hv dhcp-options-set-options $d1 server_id=10.0.0.1 \
 server_mac=ff:10:00:00:00:01 lease_time=3600 router=10.0.0.1 \
 tftp_server=\"test_tftp_server\"
 echo "------------------------------------------"
@@ -5877,7 +5877,7 @@ rm -f 2.expected
 
 # Set domain search list option for ls1
 echo "------ Set domain search list --------"
-ovn-nbctl dhcp-options-set-options $d1 server_id=10.0.0.1 \
+ovn-nbctl --wait=hv dhcp-options-set-options $d1 server_id=10.0.0.1 \
 server_mac=ff:10:00:00:00:01 lease_time=3600 router=10.0.0.1 \
 domain_search_list=\"test1.com,test2.com\"
 echo "------------------------------------------"
-- 
2.28.0



More information about the dev mailing list