OpenstackOperations: fixes due to openstack CLI

Due to migration to Openstack CLI in OpenStackOperations.robot and
DevstackUtils.robot, introduced in the following commit
02eb3418af8de2831ad8a5aa1d119746fffd1bac ("Migrate to Openstack CLI"),
appropriate fix is needed for  "openstack security group rule create"
command and formatted output is needed for "openstack router list",
"openstack port list" commands.

Change-Id: I9831e3909c38c7a70389ba29754526a2f675111f
Signed-off-by: Valentina Krasnobaeva <valentina.krasnobaeva@6wind.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index a36c5ebe8527453c1e0796eed4a4a59003b6e9d0..192987e0e2fa23bcacb2347b41a932a3857e0f10 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -286,7 +286,7 @@ Get Router Id
     [Arguments]    ${router1}    ${devstack_conn_id}
     [Documentation]    Retrieve the router id for the given router name
     Switch Connection    ${devstack_conn_id}
-    ${output}=    Write Commands Until Prompt    openstack router list | grep "${router1}" | awk '{print $2}'    30s
+    ${output}=    Write Commands Until Prompt    openstack router list -f table | grep "${router1}" | awk '{print $2}'    30s
     Log    ${output}
     ${splitted_output}=    Split String    ${output}    ${EMPTY}
     ${router_id}=    Get from List    ${splitted_output}    0
@@ -572,7 +572,7 @@ List Router
     [Documentation]    List Router and return output with neutron client.
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
-    ${output}=    Write Commands Until Prompt    openstack router list    30s
+    ${output}=    Write Commands Until Prompt    openstack router list -f value    30s
     Close Connection
     Log    ${output}
     [Return]    ${output}
@@ -590,7 +590,7 @@ Show Router Interface
     [Documentation]    List Router interface associated with given Router and return output with neutron client.
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
-    ${output}=    Write Commands Until Prompt    openstack port list --router ${router_name}    30s
+    ${output}=    Write Commands Until Prompt    openstack port list --router ${router_name} -f value    30s
     Close Connection
     Log    ${output}
     [Return]    ${output}
@@ -735,7 +735,7 @@ Create Security Rule
     [Arguments]    ${direction}    ${protocol}    ${min_port}    ${max_port}    ${remote_ip}    ${sg_name}
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}
-    ${output}=    Write Commands Until Prompt    openstack security group rule create --${direction} --protocol ${protocol} --dst-port ${min_port}:${max_port} --remote-ip ${remote_ip} ${sg_name}
+    ${output}=    Write Commands Until Prompt    openstack security group rule create --${direction} --protocol ${protocol} --dst-port ${min_port}:${max_port} ${sg_name}
     Close Connection
 
 Neutron Security Group Show