Check that DHCP server address is not None

in some cases it seems the nova console-log will already show the
obtained lease (the instance ip address) but not yet show the
nameserver string we are looking for (test moving too fast). So,
we need to make sure we keep checking until we have all of it.

Change-Id: If50742be982e54a8c9f0274de262ae24a2144faf
Signed-off-by: mor.zvi <mor.zvi@hpe.com>
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot
index cdb9720ebf1e06e5ccaea68a002f0cbdf43c65d9..01d2e8ebc115ff7dbbe6969384ec8ed922cfe733 100644 (file)
--- a/csit/suites/openstack/clustering/01_l2_tests.robot
+++ b/csit/suites/openstack/clustering/01_l2_tests.robot
@@ -111,17 +111,17 @@ Check Vm Instances Have Ip Address
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Wait Until Keyword Succeeds    15s    5s    Verify VM Is ACTIVE    ${vm}
     : FOR    ${index}    IN RANGE    1    5
-    \    ${NET1_VM_IPS}    ${NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
-    \    ${NET2_VM_IPS}    ${NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
-    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_VM_IPS}    ${NET2_VM_IPS}
+    \    ${NET1_VM_IPS}    @{NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
+    \    ${NET2_VM_IPS}    @{NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
+    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_VM_IPS}    ${NET2_VM_IPS}    ${NET1_DHCP_IP}    ${NET2_DHCP_IP}
     \    ${status}    ${message}    Run Keyword And Ignore Error    List Should Not Contain Value    ${VM_IPS}    None
     \    Exit For Loop If    '${status}' == 'PASS'
     \    BuiltIn.Sleep    5s
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Write Commands Until Prompt    nova console-log ${vm}    30s
-    Append To List    ${NET1_VM_IPS}    ${NET1_DHCP_IP}
+    Append To List    ${NET1_VM_IPS}    @{NET1_DHCP_IP}[0]
     Set Suite Variable    ${NET1_VM_IPS}
-    Append To List    ${NET2_VM_IPS}    ${NET2_DHCP_IP}
+    Append To List    ${NET2_VM_IPS}    @{NET2_DHCP_IP}[0]
     Set Suite Variable    ${NET2_VM_IPS}
     Should Not Contain    ${NET1_VM_IPS}    None
     Should Not Contain    ${NET2_VM_IPS}    None

diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/02_l3_tests.robot
index b37a4e3b711261972c6b9312d3cfce4b9a48384d..dae8ea79a74ac7359002c9ed2dbcec4be3ff3bc7 100644 (file)
--- a/csit/suites/openstack/clustering/02_l3_tests.robot
+++ b/csit/suites/openstack/clustering/02_l3_tests.robot
@@ -74,20 +74,22 @@ Check Vm Instances Have Ip Address
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Wait Until Keyword Succeeds    15s    5s    Verify VM Is ACTIVE    ${vm}
     : FOR    ${index}    IN RANGE    1    5
-    \    ${NET1_L3_VM_IPS}    ${NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
-    \    ${NET2_L3_VM_IPS}    ${NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
-    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_L3_VM_IPS}    ${NET2_L3_VM_IPS}
+    \    ${NET1_L3_VM_IPS}    @{NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
+    \    ${NET2_L3_VM_IPS}    @{NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
+    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_L3_VM_IPS}    ${NET2_L3_VM_IPS}    ${NET1_DHCP_IP}    ${NET2_DHCP_IP}
     \    ${status}    ${message}    Run Keyword And Ignore Error    List Should Not Contain Value    ${VM_IPS}    None
     \    Exit For Loop If    '${status}' == 'PASS'
     \    BuiltIn.Sleep    5s
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Write Commands Until Prompt    nova console-log ${vm}    30s
     Set Suite Variable    ${NET1_L3_VM_IPS}
-    Set Suite Variable    ${NET1_DHCP_IP}
     Set Suite Variable    ${NET2_L3_VM_IPS}
+    Set Suite Variable    ${NET1_DHCP_IP}
     Set Suite Variable    ${NET2_DHCP_IP}
     Should Not Contain    ${NET1_L3_VM_IPS}    None
     Should Not Contain    ${NET2_L3_VM_IPS}    None
+    Should Not Contain    ${NET1_DHCP_IP}    None
+    Should Not Contain    ${NET2_DHCP_IP}    None
     [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get Test Teardown Debugs
 

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index c7a011cee9d410a13da3df1df13ee2b065c9a89f..e7a07cf38fd05277b995248f2839dacc60c23a6b 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -62,17 +62,17 @@ Check Vm Instances Have Ip Address
     \    Wait Until Keyword Succeeds    15s    5s    Verify VM Is ACTIVE    ${vm}
     : FOR    ${index}    IN RANGE    1    5
     \    # creating 50s pool at 5s interval
-    \    ${NET1_VM_IPS}    ${NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
-    \    ${NET2_VM_IPS}    ${NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
-    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_VM_IPS}    ${NET2_VM_IPS}
+    \    ${NET1_VM_IPS}    @{NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
+    \    ${NET2_VM_IPS}    @{NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
+    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_VM_IPS}    ${NET2_VM_IPS}    ${NET1_DHCP_IP}    ${NET2_DHCP_IP}
     \    ${status}    ${message}    Run Keyword And Ignore Error    List Should Not Contain Value    ${VM_IPS}    None
     \    Exit For Loop If    '${status}' == 'PASS'
     \    BuiltIn.Sleep    5s
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Write Commands Until Prompt    nova console-log ${vm}    30s
-    Append To List    ${NET1_VM_IPS}    ${NET1_DHCP_IP}
+    Append To List    ${NET1_VM_IPS}    @{NET1_DHCP_IP}[0]
     Set Suite Variable    ${NET1_VM_IPS}
-    Append To List    ${NET2_VM_IPS}    ${NET2_DHCP_IP}
+    Append To List    ${NET2_VM_IPS}    @{NET2_DHCP_IP}[0]
     Set Suite Variable    ${NET2_VM_IPS}
     Should Not Contain    ${NET1_VM_IPS}    None
     Should Not Contain    ${NET2_VM_IPS}    None

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index 6288d1180a5fe48ef4dc444e26dd1d8b741167ac..c347fc3e25c508d32c9236cfc6ae63540f371090 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -51,9 +51,9 @@ Check Vm Instances Have Ip Address
     : FOR    ${vm}    IN    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     \    Wait Until Keyword Succeeds    15s    5s    Verify VM Is ACTIVE    ${vm}
     : FOR    ${index}    IN RANGE    1    5
-    \    ${NET1_L3_VM_IPS}    ${NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
-    \    ${NET2_L3_VM_IPS}    ${NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
-    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_L3_VM_IPS}    ${NET2_L3_VM_IPS}
+    \    ${NET1_L3_VM_IPS}    @{NET1_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_1_VM_INSTANCES}
+    \    ${NET2_L3_VM_IPS}    @{NET2_DHCP_IP}    Verify VMs Received DHCP Lease    @{NET_2_VM_INSTANCES}
+    \    ${VM_IPS}=    Collections.Combine Lists    ${NET1_L3_VM_IPS}    ${NET2_L3_VM_IPS}    ${NET1_DHCP_IP}    ${NET2_DHCP_IP}
     \    ${status}    ${message}    Run Keyword And Ignore Error    List Should Not Contain Value    ${VM_IPS}    None
     \    Exit For Loop If    '${status}' == 'PASS'
     \    BuiltIn.Sleep    5s
@@ -65,6 +65,8 @@ Check Vm Instances Have Ip Address
     Set Suite Variable    ${NET2_DHCP_IP}
     Should Not Contain    ${NET1_L3_VM_IPS}    None
     Should Not Contain    ${NET2_L3_VM_IPS}    None
+    Should Not Contain    ${NET1_DHCP_IP}    None
+    Should Not Contain    ${NET2_DHCP_IP}    None
     [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get Test Teardown Debugs
 

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot
index c40706be91c9c4c0c87f389e67722190b063f74f..a5e2ede32130fbd383b86569328d34b9af400417 100644 (file)
--- a/csit/suites/openstack/connectivity/03_external_network_tests.robot
+++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot
@@ -56,17 +56,19 @@ Check Vm Instances Have Ip Address
     ${SNAT_VM_COUNT}    Get Length    ${VM_INSTANCES_SNAT}
     ${LOOP_COUNT}    Evaluate    ${FLOATING_VM_COUNT}+${SNAT_VM_COUNT}
     : FOR    ${index}    IN RANGE    1    ${LOOP_COUNT}
-    \    ${FLOATING_VM_IPS}    ${FLOATING_DHCP_IP}    Wait Until Keyword Succeeds    180s    10s    Verify VMs Received DHCP Lease
+    \    ${FLOATING_VM_IPS}    @{FLOATING_DHCP_IP}    Wait Until Keyword Succeeds    180s    10s    Verify VMs Received DHCP Lease
     \    ...    @{VM_INSTANCES_FLOATING}
-    \    ${SNAT_VM_IPS}    ${SNAT_DHCP_IP}    Wait Until Keyword Succeeds    180s    10s    Verify VMs Received DHCP Lease
+    \    ${SNAT_VM_IPS}    @{SNAT_DHCP_IP}    Wait Until Keyword Succeeds    180s    10s    Verify VMs Received DHCP Lease
     \    ...    @{VM_INSTANCES_SNAT}
     \    ${FLOATING_VM_LIST_LENGTH}=    Get Length    ${FLOATING_VM_IPS}
     \    ${SNAT_VM_LIST_LENGTH}=    Get Length    ${SNAT_VM_IPS}
     \    Exit For Loop If    ${FLOATING_VM_LIST_LENGTH}==${FLOATING_VM_COUNT} and ${SNAT_VM_LIST_LENGTH}==${SNAT_VM_COUNT}
-    Append To List    ${FLOATING_VM_IPS}    ${FLOATING_DHCP_IP}
+    Append To List    ${FLOATING_VM_IPS}    @{FLOATING_DHCP_IP}[0]
     Set Suite Variable    ${FLOATING_VM_IPS}
-    Append To List    ${SNAT_VM_IPS}    ${SNAT_DHCP_IP}
+    Append To List    ${SNAT_VM_IPS}    @{SNAT_DHCP_IP}[0]
     Set Suite Variable    ${SNAT_VM_IPS}
+    Should Not Contain    ${FLOATING_VM_IPS}    None
+    Should Not Contain    ${SNAT_VM_IPS}    None
     [Teardown]    Run Keywords    Show Debugs    ${VM_INSTANCES_FLOATING}    ${VM_INSTANCES_SNAT}
     ...    AND    Get Test Teardown Debugs