Update certificates for OpenFlow TLS connection

[integration/test.git] / csit / libraries / L2GatewayOperations.robot

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index 2c0a86d0d06b53aff3d88abe7e8e97902844782e..4e7e085be50a663c800205dd071a7545a36fb418 100644 (file)
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -168,8 +168,9 @@ Verify Strings In Command Output
     [Arguments]    ${conn_id}    ${command}    @{string_list}
     [Documentation]    Keyword to run the ${command} in ${conn_id} and verify if the output contains the list @{string_list}.
     ${output}=    Exec Command    ${conn_id}    ${command}
-    : FOR    ${item}    IN    @{string_list}
-    \    Should Contain    ${output}    ${item}
+    FOR    ${item}    IN    @{string_list}
+        Should Contain    ${output}    ${item}
+    END
 
 Verify Ping In Namespace Extra Timeout
     [Arguments]    ${ns_name}    ${ns_port_mac}    ${vm_ip}    ${conn_id}=${hwvtep_conn_id}    ${hwvtep_ip}=${HWVTEP_IP}
@@ -199,18 +200,18 @@ Verify Nova VM IP
     @{vm_ip}    ${dhcp_ip} =    Get VM IPs    ${vm_name}
     Should Not Contain    ${vm_ip}    None
     Should Not Contain    ${dhcp_ip}    None
-    [Return]    @{vm_ip}[0]
+    [Return]    ${vm_ip}[0]
 
 Get L2gw Debug Info
     [Documentation]    Keyword to collect the general debug information required for HWVTEP Test Suite.
     Exec Command    ${hwvtep_conn_id}    ${OVSDB_CLIENT_DUMP}
     OpenStackOperations.Get Test Teardown Debugs
     ${resp} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/itm-state:external-tunnel-list/
-    Log    ${resp.content}
+    Log    ${resp.text}
     ${resp} =    RequestsLibrary.Get Request    session    ${CONFIG_API}/network-topology:network-topology/topology/hwvtep:1
-    Log    ${resp.content}
+    Log    ${resp.text}
     ${resp} =    RequestsLibrary.Get Request    session    ${OPERATIONAL_API}/network-topology:network-topology/topology/hwvtep:1
-    Log    ${resp.content}
+    Log    ${resp.text}
     Exec Command    ${OS_CNTL_CONN_ID}    cat /etc/neutron/neutron.conf
     Exec Command    ${OS_CNTL_CONN_ID}    cat /etc/neutron/l2gw_plugin.ini
     Exec Command    ${OS_CNTL_CONN_ID}    ps -ef | grep neutron-server
@@ -230,8 +231,9 @@ Verify Vtep List
     [Arguments]    ${conn_id}    ${table_name}    @{list}
     [Documentation]    Keyword to run vtep-ctl list for the table ${table_name} and verify the list @{list} contents exists in output.
     ${output}=    Exec Command    ${conn_id}    ${VTEP LIST} ${table_name}
-    : FOR    ${item}    IN    @{list}
-    \    Should Contain    ${output}    ${item}
+    FOR    ${item}    IN    @{list}
+        Should Contain    ${output}    ${item}
+    END
 
 Get Vtep List
     [Arguments]    ${table_name}    ${conn_id}=${hwvtep_conn_id}
@@ -289,13 +291,15 @@ Verify Elan Flow Entries
     Should Contain    ${flow_output}    table=50
     ${sMac_output} =    Get Lines Containing String    ${flow_output}    table=50
     Log    ${sMac_output}
-    : FOR    ${sMacAddr}    IN    @{srcMacAddrs}
-    \    ${resp}=    Should Contain    ${sMac_output}    dl_src=${sMacAddr}
+    FOR    ${sMacAddr}    IN    @{srcMacAddrs}
+        ${resp}=    Should Contain    ${sMac_output}    dl_src=${sMacAddr}
+    END
     Should Contain    ${flow_output}    table=51
     ${dMac_output} =    Get Lines Containing String    ${flow_output}    table=51
     Log    ${dMac_output}
-    : FOR    ${dMacAddr}    IN    @{destMacAddrs}
-    \    ${resp}=    Should Contain    ${dMac_output}    dl_dst=${dMacAddr}
+    FOR    ${dMacAddr}    IN    @{destMacAddrs}
+        ${resp}=    Should Contain    ${dMac_output}    dl_dst=${dMacAddr}
+    END
     Should Contain    ${flow_output}    table=52
     ${sMac_output} =    Get Lines Containing String    ${flow_output}    table=52
     Log    ${sMac_output}