Add router and sg listings to Show Debugs keyword

- also refactored List Router to List Routers because it makes
  more sense to be plural

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

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 76b0f99738fe00063f7b128b88665df6c377a46a..64baaacf74b63eb5c4324561d9792505873ac72e 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -569,8 +569,8 @@ Create Router
     ${rc}    ${output}=    Run And Return Rc And Output    openstack router create ${router_name}
     Should Not Be True    ${rc}
 
-List Router
-    [Documentation]    List Router and return output with neutron client.
+List Routers
+    [Documentation]    List Routers and return output with neutron client.
     ${rc}    ${output}=    Run And Return Rc And Output    openstack router list -f value
     Log    ${output}
     Should Not Be True    ${rc}
@@ -583,7 +583,7 @@ Add Router Interface
 
 Show Router Interface
     [Arguments]    ${router_name}
-    [Documentation]    List Router interface associated with given Router and return output with neutron client.
+    [Documentation]    List Routers interface associated with given Router and return output with neutron client.
     ${rc}    ${output}=    Run And Return Rc And Output    openstack port list --router ${router_name} -f value
     Should Not Be True    ${rc}
     [Return]    ${output}
@@ -696,9 +696,19 @@ Show Debugs
     \    ${rc}    ${output}=    Run And Return Rc And Output    nova show ${index}
     \    Log    ${output}
     List Nova VMs
+    List Routers
     List Networks
     List Subnets
     List Ports
+    List Security Groups
+
+List Security Groups
+    [Documentation]    Logging keyword to display all security groups using the openstack cli. Assumes openstack
+    ...    credentials are already sourced
+    ${rc}    ${output}=    Run And Return Rc And Output    openstack security group list
+    Log    ${output}
+    Should Not Be True    ${rc}
+    [Return]    ${output}
 
 Neutron Security Group Show
     [Arguments]    ${SecurityGroupRuleName}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
index af804e060b24a626d8bf9f1851bb7f89f6baa3ab..e1c61996a000ea3dcb3465e985e490ad8d4025fe 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
@@ -225,7 +225,7 @@ Delete Router And Router Interfaces With L3VPN
     \    ${subnet_id} =    Get Subnet Id    ${INTERFACE}    ${devstack_conn_id}
     \    Should Not Contain    ${interface_output}    ${subnet_id}
     Delete Router    ${ROUTERS[0]}
-    ${router_output} =    List Router
+    ${router_output} =    List Routers
     Should Not Contain    ${router_output}    ${ROUTERS[0]}
     ${router_list} =    Create List    ${ROUTERS[0]}
     Wait Until Keyword Succeeds    3s    1s    Check For Elements Not At URI    ${ROUTER_URL}    ${router_list}

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 5e93decd39766d66409f8fb37c54789e6e773f26..6a6833801344b4048356766f4a1a06f207222a6c 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
@@ -244,7 +244,7 @@ Delete Router And Router Interfaces With L3VPN
     \    ${subnet_id} =    Get Subnet Id    ${INTERFACE}    ${devstack_conn_id}
     \    Should Not Contain    ${interface_output}    ${subnet_id}
     Delete Router    ${ROUTERS[0]}
-    ${router_output} =    List Router
+    ${router_output} =    List Routers
     Should Not Contain    ${router_output}    ${ROUTERS[0]}
     ${router_list} =    Create List    ${ROUTERS[0]}
     Wait Until Keyword Succeeds    3s    1s    Check For Elements Not At URI    ${ROUTER_URL}    ${router_list}