From bfd68bfbb7801e923c05273146c2331610091cbb Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 15 Nov 2017 18:34:31 -0500 Subject: [PATCH] Move arp learning to use Get VM IPs Change-Id: I48ac351469f66875335763119081c503a12d2841 Signed-off-by: Sam Hague --- csit/libraries/OpenStackOperations.robot | 2 +- .../Netvirt_Vpnservice/ARP_Learning.robot | 24 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index f0578ca3db..76b0f99738 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -365,7 +365,7 @@ Get VM IPs @{vm_ips} BuiltIn.Create List @{EMPTY} : FOR ${vm} IN @{vms} \ Poll VM Is ACTIVE ${vm} - \ ${status} ${ips_and_console_log} Run Keyword And Ignore Error Wait Until Keyword Succeeds 60s 15s + \ ${status} ${ips_and_console_log} Run Keyword And Ignore Error Wait Until Keyword Succeeds 120s 15s \ ... Get VM IP true ${vm} \ # If there is trouble with Get VM IP, the status will be FAIL and the return value will be a string of what went \ # wrong. We need to handle both the PASS and FAIL cases. In the FAIL case we know we wont have access to the diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot b/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot index 80d82b73a5..37d893876e 100644 --- a/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot +++ b/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot @@ -24,24 +24,18 @@ ${CREATE_IMPORT_RT} ["2200:2","2200:3"] *** Test Cases *** TC00 Verify Setup [Documentation] Verify that VMs received ip and ping is happening between different VM - ${VM_INSTANCES} = Create List @{VM_INSTANCES_NET1} @{VM_INSTANCES_NET2} @{VM_INSTANCES_NET3} - : FOR ${VM} IN @{VM_INSTANCES} - \ Poll VM Is ACTIVE ${VM} - ${VM_IP_NET1} ${DHCP_IP1} Collect VM IP Addresses false @{VM_INSTANCES_NET1} - ${VM_IP_NET2} ${DHCP_IP2} Collect VM IP Addresses false @{VM_INSTANCES_NET2} - ${VM_IP_NET3} ${DHCP_IP3} Collect VM IP Addresses false @{VM_INSTANCES_NET3} - ${VM_INSTANCES}= Collections.Combine Lists ${VM_INSTANCES_NET1} ${VM_INSTANCES_NET2} ${VM_INSTANCES_NET3} - ${VM_IPS}= Collections.Combine Lists ${VM_IP_NET1} ${VM_IP_NET2} ${VM_IP_NET3} - ${LOOP_COUNT} Get Length ${VM_INSTANCES_NET1} - : 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 ${VM_IP_NET1} - Set Suite Variable ${VM_IP_NET2} - Set Suite Variable ${VM_IP_NET3} + @{VM_IP_NET1} ${DHCP_IP1} = Get VM IPs @{VM_INSTANCES_NET1} + @{VM_IP_NET2} ${DHCP_IP2} = Get VM IPs @{VM_INSTANCES_NET2} + @{VM_IP_NET3} ${DHCP_IP3} = Get VM IPs @{VM_INSTANCES_NET3} + Set Suite Variable @{VM_IP_NET1} + Set Suite Variable @{VM_IP_NET2} + Set Suite Variable @{VM_IP_NET3} Should Not Contain ${VM_IP_NET1} None Should Not Contain ${VM_IP_NET2} None Should Not Contain ${VM_IP_NET3} None + Should Not Contain ${DHCP_IP1} None + Should Not Contain ${DHCP_IP2} None + Should Not Contain ${DHCP_IP3} None ${vm_instances} = Create List @{VM_IP_NET1} @{VM_IP_NET2} @{VM_IP_NET3} Wait Until Keyword Succeeds 30s 10s Check For Elements At URI ${FIB_ENTRIES_URL} ${vm_instances} Verify Ping On Same Networks -- 2.36.6