From 61c4a87449d38349827f1973bd098db66cb30404 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 15 Nov 2017 18:41:30 -0500 Subject: [PATCH 1/1] Move l2 clustering to use Get VM IPs Change-Id: If40be3121e7fd6b4a55237f702a95d989ec45c98 Signed-off-by: Sam Hague --- .../openstack/clustering/01_l2_tests.robot | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot index dbc2c606f4..be16cfa6a9 100644 --- a/csit/suites/openstack/clustering/01_l2_tests.robot +++ b/csit/suites/openstack/clustering/01_l2_tests.robot @@ -113,22 +113,10 @@ Check Vm Instances Have Ip Address ... already the other instances should have theirs already or at least shortly thereafter. # first, ensure all VMs are in ACTIVE state. if not, we can just fail the test case and not waste time polling # for dhcp addresses - : FOR ${vm} IN @{NET_1_VM_INSTANCES} @{NET_2_VM_INSTANCES} - \ Poll VM Is ACTIVE ${vm} - ${status} ${message} Run Keyword And Ignore Error Wait Until Keyword Succeeds 60s 5s Collect VM IP Addresses - ... true @{NET_1_VM_INSTANCES} - ${status} ${message} Run Keyword And Ignore Error Wait Until Keyword Succeeds 60s 5s Collect VM IP Addresses - ... true @{NET_2_VM_INSTANCES} - ${NET1_VM_IPS} ${NET1_DHCP_IP} Collect VM IP Addresses false @{NET_1_VM_INSTANCES} - ${NET2_VM_IPS} ${NET2_DHCP_IP} Collect VM IP Addresses false @{NET_2_VM_INSTANCES} - ${VM_INSTANCES}= Collections.Combine Lists ${NET_1_VM_INSTANCES} ${NET_2_VM_INSTANCES} - ${VM_IPS}= Collections.Combine Lists ${NET1_VM_IPS} ${NET2_VM_IPS} - ${LOOP_COUNT} Get Length ${VM_INSTANCES} - : FOR ${index} IN RANGE 0 ${LOOP_COUNT} - \ ${status} ${message} Run Keyword And Ignore Error Should Not Contain @{VM_IPS}[${index}] None - \ Run Keyword If '${status}' == 'FAIL' Write Commands Until Prompt openstack console log show @{VM_INSTANCES}[${index}] 30s - Set Suite Variable ${NET1_VM_IPS} - Set Suite Variable ${NET2_VM_IPS} + @{NET1_VM_IPS} ${NET1_DHCP_IP} = Get VM IPs @{NET_1_VM_INSTANCES} + @{NET2_VM_IPS} ${NET2_DHCP_IP} = Get VM IPs @{NET_2_VM_INSTANCES} + Set Suite Variable @{NET1_VM_IPS} + Set Suite Variable @{NET2_VM_IPS} Should Not Contain ${NET1_VM_IPS} None Should Not Contain ${NET2_VM_IPS} None Should Not Contain ${NET1_DHCP_IP} None -- 2.36.6