Use openstack cli instead of nova console-log cli

Change-Id: Ida40d777d99cd7fe1e38edaece1fc781814bccee
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 19fc4be34c11feb20758978a3357aa376af71832..b937e6b0e81a42aa07030f518c03a653c40a6632 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -322,7 +322,7 @@ Poll VM Is ACTIVE
 
 Collect VM IP Addresses
     [Arguments]    ${fail_on_none}    @{vm_list}
-    [Documentation]    Using nova console-log on the provided ${vm_list} to search for the string "obtained" which
+    [Documentation]    Using the console-log on the provided ${vm_list} to search for the string "obtained" which
     ...    correlates to the instance receiving it's IP address via DHCP. Also retrieved is the ip of the nameserver
     ...    if available in the console-log output. The keyword will also return a list of the learned ips as it
     ...    finds them in the console log output, and will have "None" for Vms that no ip was found.
@@ -353,12 +353,12 @@ Collect VM IP Addresses
 
 Collect VM IPv6 SLAAC Addresses
     [Arguments]    ${fail_on_none}    ${prefix}    @{vm_list}
-    [Documentation]    Using nova console-log on the provided ${vm_list} to search for the string "inet6" which
+    [Documentation]    Using the console-log on the provided ${vm_list} to search for the string "inet6" which
     ...    correlates to the instance generated IPv6 address, based on the ${prefix} received from ODL (SLAAC mode).
     ${ip_list}    Create List    @{EMPTY}
     : FOR    ${vm}    IN    @{vm_list}
     \    Log    ${vm}
-    \    ${rc}    ${vm_ip_line}=    Run And Return Rc And Output    nova console-log ${vm} | grep -i "inet6"
+    \    ${rc}    ${vm_ip_line}=    Run And Return Rc And Output    openstack console log show ${vm} | grep -i "inet6"
     \    Log    ${vm_ip_line}
     \    Log    ${rc}
     \    @{vm_ip_list}    Get Regexp Matches    ${vm_ip_line}    ${prefix}
@@ -374,7 +374,7 @@ View Vm Console
     [Arguments]    ${vm_instance_names}
     [Documentation]    View Console log of the created vm instances using nova show.
     : FOR    ${VmElement}    IN    @{vm_instance_names}
-    \    ${rc}    ${output}=    Run And Return Rc And Output    nova show ${VmElement}
+    \    ${rc}    ${output}=    Run And Return Rc And Output    openstack server show ${VmElement}
     \    Log    ${output}
     \    Should Not Be True    ${rc}
     \    ${rc}    ${output}=    Run And Return Rc And Output    openstack console log show ${VmElement}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
index 666211bbf74b06f1dc3e18241daa1effe134b0f9..3b9f60e0699878a4067e3c5e3f1aaa007f3d7de1 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
@@ -100,7 +100,7 @@ Create Nova VMs
     ${LOOP_COUNT}    Get Length    ${VM_INSTANCES_NET10}
     : 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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Log    ${VM_IP_NET10}
     Set Suite Variable    ${VM_IP_NET10}
     Log    ${VM_IP_NET20}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
index 6eb21ac777073018e7a95ee07497497e2dd33034..28dcdea776752f5153c410d6332d727a4ae2e9b5 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
@@ -136,7 +136,7 @@ Create Nova VMs
     ${LOOP_COUNT}    Get Length    ${VM_INSTANCES_NET10}
     : 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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Log    ${VM_IP_NET10}
     Set Suite Variable    ${VM_IP_NET10}
     Log    ${VM_IP_NET20}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot b/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot
index a6f8b8681ae2be295d7a4ae92ded25f995993bdc..b73529b9619c7dff90147f74738d12f1b423aa6d 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/ARP_Learning.robot
@@ -35,7 +35,7 @@ TC00 Verify Setup
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    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}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot b/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
index 353cae350d3c1b47fef0f2c8835d7d03d58b72bc..119b642ac1ebcbe1236a5b11db86bbf33a597815 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/BFD_Monitoring.robot
@@ -275,7 +275,7 @@ Verify VMs received IP
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Log    ${VM_IP_NET1}
     Log    ${VM_IP_NET2}
     Should Not Contain    ${VM_IP_NET2}    None

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot
index 13fb553ec610377204ad0a93eda06c0b4e62b106..dbc2c606f4f6e56384976570645663cf56392ce0 100644 (file)
--- a/csit/suites/openstack/clustering/01_l2_tests.robot
+++ b/csit/suites/openstack/clustering/01_l2_tests.robot
@@ -126,7 +126,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    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}
     Should Not Contain    ${NET1_VM_IPS}    None

diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/02_l3_tests.robot
index a033fd0d5b287c0c03def7b1b5289d350a4aa3f4..e76f8913ef901bb74e835e9bf8e6ec1fd5cb4733 100644 (file)
--- a/csit/suites/openstack/clustering/02_l3_tests.robot
+++ b/csit/suites/openstack/clustering/02_l3_tests.robot
@@ -85,7 +85,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Set Suite Variable    ${NET1_L3_VM_IPS}
     Set Suite Variable    ${NET2_L3_VM_IPS}
     Set Suite Variable    ${NET1_DHCP_IP}

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index 507d58c9e97dfa3d79c71429615ab95337bc4bfd..492bdce84d112fdd1be07c491b24d4b8961fac84 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -81,7 +81,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    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}
     Should Not Contain    ${NET1_VM_IPS}    None

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index a5253bce060f50fb1fd26c63fb461834b4f181ec..39b8cfa5e9d3da57158c64323e411d647a7faf06 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -90,7 +90,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Set Suite Variable    ${NET1_L3_VM_IPS}
     Set Suite Variable    ${NET1_DHCP_IP}
     Set Suite Variable    ${NET2_L3_VM_IPS}

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot
index 2a638fa94414703614c1925771b4938542cf4277..6c7d7de8c2ab58d35fcb78d30992a0425de8ac27 100644 (file)
--- a/csit/suites/openstack/connectivity/03_external_network_tests.robot
+++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot
@@ -68,7 +68,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Set Suite Variable    ${FLOATING_VM_IPS}
     Set Suite Variable    ${SNAT_VM_IPS}
     Should Not Contain    ${FLOATING_VM_IPS}    None

diff --git a/csit/suites/openstack/connectivity/04_security_group_tests.robot b/csit/suites/openstack/connectivity/04_security_group_tests.robot
index edc4baf448cbfd7d5413a289174f2f5039f859d8..e9aee5fdba9a65ee9f6c6addfca4b2b88db75d6a 100644 (file)
--- a/csit/suites/openstack/connectivity/04_security_group_tests.robot
+++ b/csit/suites/openstack/connectivity/04_security_group_tests.robot
@@ -75,7 +75,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    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    ${NET1_DHCP_IP}
     Should Not Contain    ${NET1_VM_IPS}    None

diff --git a/csit/suites/openstack/extensions/sfc.robot b/csit/suites/openstack/extensions/sfc.robot
index f796d90e73f523462432f6900252b5aaa0acacf2..94a556a1a133e2eb331680f28c66832188052d9e 100644 (file)
--- a/csit/suites/openstack/extensions/sfc.robot
+++ b/csit/suites/openstack/extensions/sfc.robot
@@ -66,7 +66,7 @@ Check Vm Instances Have Ip Address
     ${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    nova console-log @{VM_INSTANCES}[${index}]    30s
+    \    Run Keyword If    '${status}' == 'FAIL'    Write Commands Until Prompt    openstack console log show @{VM_INSTANCES}[${index}]    30s
     Set Suite Variable    ${NET1_VM_IPS}
     Should Not Contain    ${NET1_VM_IPS}    None
     Should Not Contain    ${NET1_DHCP_IP}    None