Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / controller / benchmark / dsbenchmark.robot

diff --git a/csit/suites/controller/benchmark/dsbenchmark.robot b/csit/suites/controller/benchmark/dsbenchmark.robot
index f51d192b20212b943e208bfe3eba58ea5fa42dda..2c70b92b872ef68805ce3508e53f2124e75643fb 100644 (file)
--- a/csit/suites/controller/benchmark/dsbenchmark.robot
+++ b/csit/suites/controller/benchmark/dsbenchmark.robot
@@ -42,6 +42,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/RemoteBash.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
+Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
 Resource          ${CURDIR}/../../../libraries/Utils.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
 
@@ -244,7 +245,7 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SSHLibrary.Open_Connection    ${TOOLS_SYSTEM_IP}
-    Utils.Flexible_Mininet_Login
+    SSHKeywords.Flexible_Mininet_Login
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/mdsal_benchmark/${tool}
     SSHKeywords.Virtual_Env_Create
     SSHKeywords.Virtual_Env_Install_Package    requests
@@ -359,13 +360,14 @@ Merge_Csv
     ${final_values}=    BuiltIn.Set_variable    ${Empty}
     @{csv_files}=    OperatingSystem.List_Files_In_Directory    .    *${final_file}
     Collections.Sort_List    ${csv_files}
-    : FOR    ${file}    IN    @{csv_files}
-    \    BuiltIn.Log_To_Console    ${file}
-    \    ${csv_content}=    OperatingSystem.GetFile    ${file}
-    \    ${column_names}=    Get_Column_Names    ${file}    ${csv_content}
-    \    ${column_values}=    String.Get_Line    ${csv_content}    1
-    \    ${final_columns}=    BuiltIn.Set_Variable_If    "${final_columns}"=="${Empty}"    ${column_names}    ${final_columns},${column_names}
-    \    ${final_values}=    BuiltIn.Set_Variable_If    "${final_values}"=="${Empty}"    ${column_values}    ${final_values},${column_values}
+    FOR    ${file}    IN    @{csv_files}
+        BuiltIn.Log_To_Console    ${file}
+        ${csv_content}=    OperatingSystem.GetFile    ${file}
+        ${column_names}=    Get_Column_Names    ${file}    ${csv_content}
+        ${column_values}=    String.Get_Line    ${csv_content}    1
+        ${final_columns}=    BuiltIn.Set_Variable_If    "${final_columns}"=="${Empty}"    ${column_names}    ${final_columns},${column_names}
+        ${final_values}=    BuiltIn.Set_Variable_If    "${final_values}"=="${Empty}"    ${column_values}    ${final_values},${column_values}
+    END
     ${content}=    BuiltIn.Catenate    SEPARATOR=${\n}    ${final_columns}    ${final_values}
     OperatingSystem.Create_File    ${final_file}    ${content}
 
@@ -378,6 +380,7 @@ Get_Column_Names
     # now we have followers and FOL_ will be prepended to the column names
     @{columns}    String.Split_String    ${column_names}    ,
     ${final_columns}    BuiltIn.Set_Variable    ${Empty}
-    : FOR    ${column}    IN    @{columns}
-    \    ${final_columns}    BuiltIn.Set_Variable_If    "${final_columns}"=="${Empty}"    FOL_${column}    ${final_columns},FOL_${column}
+    FOR    ${column}    IN    @{columns}
+        ${final_columns}    BuiltIn.Set_Variable_If    "${final_columns}"=="${Empty}"    FOL_${column}    ${final_columns},FOL_${column}
+    END
     BuiltIn.Return_From_Keyword    ${final_columns}