Tidy up merged Robot files.

Change-Id: Iae3dd94ca027ae996fd15fa7985bafe700731451
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot
index a6737e756bcb8b9d824d7d74cda2078cb444acbf..dcc5f8ca809275d00ce9d6c4a440033432037074 100644 (file)
--- a/csit/libraries/AAAKeywords.robot
+++ b/csit/libraries/AAAKeywords.robot
@@ -23,10 +23,10 @@ Create Auth Data
     [Documentation]    returns a string in the direct authentacation format (e.g., grant_type=password&username=admin&password=admin).
     ...    It can also be passed scope, client_id and client_secret arguments for the case of client specific authorization
     ${data}=    Set Variable    grant_type=password&username=${user}&password=${password}&scope=${scope}
-    ${data}=    Run Keyword If    "${client_id}" != "${EMPTY}"    Set Variable    ${data}&client_id=${client_id}
-    ...    ELSE    Set Variable    ${data}
-    ${data}=    Run Keyword If    "${client_secret}" != "${EMPTY}"    Set Variable    ${data}&client_secret=${client_secret}
-    ...    ELSE    Set Variable    ${data}
+    ${data}=    Run Keyword If    "${client_id}" != "${EMPTY}"    Set Variable    ${data}&client_id=${client_id}    ELSE    Set Variable
+    ...    ${data}
+    ${data}=    Run Keyword If    "${client_secret}" != "${EMPTY}"    Set Variable    ${data}&client_secret=${client_secret}    ELSE    Set Variable
+    ...    ${data}
     [Return]    ${data}
 
 Disable Authentication On Controller

diff --git a/csit/libraries/LISPFlowMapping.robot b/csit/libraries/LISPFlowMapping.robot
index 6f15ad4857c7e499f21b78babcbf99b3e229815b..b721f956bfcc8ff0af02859f4b54095c6a0db4f9 100644 (file)
--- a/csit/libraries/LISPFlowMapping.robot
+++ b/csit/libraries/LISPFlowMapping.robot
@@ -10,8 +10,8 @@ ${ODL_VERSION}    Be
 *** Keywords ***
 Check Mapping Removal
     [Arguments]    ${json}
-    Run Keyword If    "${ODL_VERSION}" == "Li"    Check Mapping Removal Lithium    ${json}
-    ...    ELSE    Post Log Check    ${LFM_RPC_API}:get-mapping    ${json}    404
+    Run Keyword If    "${ODL_VERSION}" == "Li"    Check Mapping Removal Lithium    ${json}    ELSE    Post Log Check    ${LFM_RPC_API}:get-mapping
+    ...    ${json}    404
 
 Check Mapping Removal Lithium
     [Arguments]    ${json}

diff --git a/csit/libraries/SwitchUtils.robot b/csit/libraries/SwitchUtils.robot
index 4058ff0549a29df480bc0952f68d305242d2144a..e863f4c457988ea3799f0b9faaafba706c81cef3 100644 (file)
--- a/csit/libraries/SwitchUtils.robot
+++ b/csit/libraries/SwitchUtils.robot
@@ -92,8 +92,8 @@ Open Connection Wrapper
     Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Call Method    ${switch}    set_mgmt_user    ${MININET_USER}
     ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    SSHLibrary.Open Connection    ${switch.mgmt_ip}    prompt=${switch.mgmt_prompt}    timeout=30s
     Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    Login With Public Key    ${switch.mgmt_user}    ${switch.ssh_key}    any
-    ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "telnet"    Telnet.Open Connection    ${switch.mgmt_ip}
-    ...    ELSE    Set Variable    ${connection_index}
+    ${connection_index}=    Run Keyword If    "${switch.mgmt_protocol}" == "telnet"    Telnet.Open Connection    ${switch.mgmt_ip}    ELSE    Set Variable
+    ...    ${connection_index}
     [Return]    ${connection_index}
 
 Configure Connection Index And Prompt Wrapper
@@ -124,8 +124,8 @@ Execute Command Wrapper
     [Documentation]    Wraps the Execute Command keyword so that depending on the switch.mgmt_protocol the right
     ...    library (Telnet or SSHLibrary) is used.
     ${output}=    Run Keyword If    "${switch.mgmt_protocol}" == "ssh"    SSHLibrary.Execute Command    ${cmd}
-    ${output}=    Run Keyword If    "${switch.mgmt_protocol}" == "telnet"    Telnet.Execute Command    ${cmd}
-    ...    ELSE    Set Variable    ${output}
+    ${output}=    Run Keyword If    "${switch.mgmt_protocol}" == "telnet"    Telnet.Execute Command    ${cmd}    ELSE    Set Variable
+    ...    ${output}
     [Return]    ${output}
 
 Connect To Switch

diff --git a/csit/libraries/TsdrUtils.robot b/csit/libraries/TsdrUtils.robot
index f876c4326857cb04595939eff7b60b1f7de2a79c..09d0d509b3fa9159b7530b58ece05341dfb80079 100644 (file)
--- a/csit/libraries/TsdrUtils.robot
+++ b/csit/libraries/TsdrUtils.robot
@@ -78,10 +78,9 @@ Prepare HBase Filter
     [Documentation]    Prepare the Hbase Filter from Tsdr List output
     ${left_str}=    Remove Space on String    ${left_str}
     ${right_str}=    Remove Space on String    ${right_str}    1
-    ${x}=    Run Keyword If    '${left_str}' == 'MetricID'    Catenate    ${SPACE}    _
-    ...    ELSE IF    '${left_str}' == 'ObjectKeys'    Catenate    ${right_str}    _
-    ...    ELSE IF    '${left_str}' == 'TimeStamp'    Get Epoch Time    ${right_str}
-    ...    ELSE    Catenate    ${SPACE}
+    ${x}=    Run Keyword If    '${left_str}' == 'MetricID'    Catenate    ${SPACE}    _    ELSE IF
+    ...    '${left_str}' == 'ObjectKeys'    Catenate    ${right_str}    _    ELSE IF    '${left_str}' == 'TimeStamp'
+    ...    Get Epoch Time    ${right_str}    ELSE    Catenate    ${SPACE}
     [Return]    ${x}
 
 Create the Hbase table row

diff --git a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
index ac9f4b4139bb01b491c153e884420f4262f46ca9..259c9d1d3bd73c139750c444ce5a6bfa605f29ed 100644 (file)
--- a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
+++ b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
@@ -111,5 +111,5 @@ Verify Switch S1 Group Table
     ${result}=    Get Lines Containing String    ${group_output}    output:${port-id1}
     Should Contain    ${result}    type=${group-type}
     Should Contain    ${result}    output:${port-id1}
-    Run Keyword If    "${port-id2-state}" == "up"    Should Contain    ${result}    output:${port-id2}
-    ...    ELSE    Should not Contain    ${result}    output:${port-id2}
+    Run Keyword If    "${port-id2-state}" == "up"    Should Contain    ${result}    output:${port-id2}    ELSE    Should not Contain
+    ...    ${result}    output:${port-id2}