Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / libraries / controller / DnbCommons.robot

diff --git a/csit/libraries/controller/DnbCommons.robot b/csit/libraries/controller/DnbCommons.robot
index e3de9e5b94b95c4cc02df6107710c0bef8049e73..ab4a65df0e99950723bcee4391fd0c29e490a8f8 100644 (file)
--- a/csit/libraries/controller/DnbCommons.robot
+++ b/csit/libraries/controller/DnbCommons.robot
@@ -26,12 +26,14 @@ Dom_Notification_Broker_Test_Templ
     BuiltIn.Log    Overall requested rate: ${total_notification_rate}, test duration: ${test_duration_in_seconds} seconds.
     WaitUtils.WU_Setup
     ${count} =    BuiltIn.Set_variable    ${0}
-    : FOR    ${suffix}    IN RANGE    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}    ${total_notification_rate}+1    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
-    \    ${count} =    BuiltIn.Evaluate    ${count}+1
-    \    MdsalLowlevel.Subscribe_Ynl    ${DNB_TESTED_MEMBER_INDEX}    ${DNB_PUBLISHER_LISTENER_PREFIX}${count}
+    FOR    ${suffix}    IN RANGE    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}    ${total_notification_rate}+1    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
+        ${count} =    BuiltIn.Evaluate    ${count}+1
+        MdsalLowlevel.Subscribe_Ynl    ${DNB_TESTED_MEMBER_INDEX}    ${DNB_PUBLISHER_LISTENER_PREFIX}${count}
+    END
     ${count} =    BuiltIn.Convert_To_Integer    ${count}
-    : FOR    ${index}    IN RANGE    1    ${count}+1
-    \    MdsalLowlevel.Start_Publish_Notifications    ${DNB_TESTED_MEMBER_INDEX}    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}    ${test_duration_in_seconds}    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
+    FOR    ${index}    IN RANGE    1    ${count}+1
+        MdsalLowlevel.Start_Publish_Notifications    ${DNB_TESTED_MEMBER_INDEX}    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}    ${test_duration_in_seconds}    ${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
+    END
     ${getter} =    ScalarClosures.Closure_From_Keyword_And_Arguments    Get_Notifications_Active_Status    ${DNB_TESTED_MEMBER_INDEX}    ${count}
     ${validator} =    ScalarClosures.Closure_From_Keyword_And_Arguments    Check_Notifications_Active_Status    data_holder
     ${validation_timeout} =    BuiltIn.Evaluate    ${test_duration_in_seconds}+${60}
@@ -39,16 +41,17 @@ Dom_Notification_Broker_Test_Templ
     ${sum_local_number}    BuiltIn.Set_Variable    ${0}
     ${low_limit_pair_rate} =    BuiltIn.Evaluate    0.9*${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
     ${high_limit_pair_rate} =    BuiltIn.Evaluate    1.1*${DNB_PUBLISHER_SUBSCRIBER_PAIR_RATE}
-    : FOR    ${index}    IN RANGE    1    ${count}+1
-    \    ${all_not}    ${id_not}    ${err_not}    ${local_number} =    MdsalLowlevel.Unsubscribe_Ynl    ${DNB_TESTED_MEMBER_INDEX}
-    \    ...    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}
-    \    BuiltIn.Should_Be_Equal_As_Numbers    ${err_not}    ${0}
-    \    BuiltIn.Should_Not_Be_Equal_As_Numbers    ${local_number}    ${0}
-    \    BuiltIn.Should_Be_Equal_As_Numbers    ${id_not}    ${local_number}
-    \    ${rate} =    BuiltIn.Evaluate    ${local_number}/${test_duration_in_seconds}
-    \    BuiltIn.Should_Be_True    ${rate} > ${low_limit_pair_rate}
-    \    BuiltIn.Should_Be_True    ${rate} < ${high_limit_pair_rate}
-    \    ${sum_local_number} =    BuiltIn.Evaluate    ${sum_local_number}+${local_number}
+    FOR    ${index}    IN RANGE    1    ${count}+1
+        ${all_not}    ${id_not}    ${err_not}    ${local_number} =    MdsalLowlevel.Unsubscribe_Ynl    ${DNB_TESTED_MEMBER_INDEX}
+        ...    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}
+        BuiltIn.Should_Be_Equal_As_Numbers    ${err_not}    ${0}
+        BuiltIn.Should_Not_Be_Equal_As_Numbers    ${local_number}    ${0}
+        BuiltIn.Should_Be_Equal_As_Numbers    ${id_not}    ${local_number}
+        ${rate} =    BuiltIn.Evaluate    ${local_number}/${test_duration_in_seconds}
+        BuiltIn.Should_Be_True    ${rate} > ${low_limit_pair_rate}
+        BuiltIn.Should_Be_True    ${rate} < ${high_limit_pair_rate}
+        ${sum_local_number} =    BuiltIn.Evaluate    ${sum_local_number}+${local_number}
+    END
     ${final_rate} =    BuiltIn.Evaluate    ${sum_local_number}/${test_duration_in_seconds}
     ${low_limit_final_rate} =    BuiltIn.Evaluate    0.9*${total_notification_rate}
     ${high_limit_final_rate} =    BuiltIn.Evaluate    1.1*${total_notification_rate}
@@ -58,13 +61,15 @@ Dom_Notification_Broker_Test_Templ
 Get_Notifications_Active_Status
     [Arguments]    ${node_to_ask}    ${nr_pairs}
     ${active_list} =    BuiltIn.Create_List
-    : FOR    ${index}    IN RANGE    1    ${nr_pairs}+1
-    \    ${active}    ${publ_count}    ${last_error}    MdsalLowlevel.Check_Publish_Notifications    ${node_to_ask}    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}
-    \    Collections.Append_To_List    ${active_list}    ${active}
-    \    BuiltIn.Should_Be_Equal    ${EMPTY}    ${last_error}
+    FOR    ${index}    IN RANGE    1    ${nr_pairs}+1
+        ${active}    ${publ_count}    ${last_error}    MdsalLowlevel.Check_Publish_Notifications    ${node_to_ask}    ${DNB_PUBLISHER_LISTENER_PREFIX}${index}
+        Collections.Append_To_List    ${active_list}    ${active}
+        BuiltIn.Should_Be_Equal    ${EMPTY}    ${last_error}
+    END
     BuiltIn.Return_From_Keyword    ${active_list}
 
 Check_Notifications_Active_Status
     [Arguments]    ${active_list}
-    : FOR    ${active}    IN    @{active_list}
-    \    BuiltIn.Should_Be_Equal    ${False}    ${active}
+    FOR    ${active}    IN    @{active_list}
+        BuiltIn.Should_Be_Equal    ${False}    ${active}
+    END