Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / controller / dom_data_broker / client_isolation_prefbasedshard.robot

diff --git a/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
index 7b76f004212408f61090219601c43c3b8b469eb3..838f8602e1650c743576070bba812b7d041027fb 100644 (file)
--- a/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
@@ -11,12 +11,12 @@ Documentation     DOMDataBroker testing: Client Isolation
 ...               cds-access-client work as expected. This is performed by having a steady
 ...               stream of transactions flowing from the frontend and isolating the node hosting
 ...               the frontend from the rest of the cluster.
-Suite Setup       BuiltIn.Run_Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown    http_timeout=30
+Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown    http_timeout=125
+Suite Teardown    SSHLibrary.Close_All_Connections
+Test Setup        BuiltIn.Run_Keywords    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 ...               AND    DdbCommons.Create_Prefix_Based_Shard_And_Verify
-Suite Teardown    BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
-...               AND    SSHLibrary.Close_All_Connections
-Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
+Test Teardown     BuiltIn.Run_Keywords    DdbCommons.Remove_Prefix_Based_Shard_And_Verify
+...               AND    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Default Tags      critical
 Test Template     DdbCommons.Client_Isolation_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -29,18 +29,20 @@ Producer_On_Shard_Leader_Node_Isolated_Transactions
     leader    ${ISOLATED_TRANS_TRUE}
 
 Restart1
-    [Documentation]    Restart odl
-    [Template]
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Producer_On_Shard_Leader_Node_Nonisolated_Transactions
     [Documentation]    Client isolation with producer on shard leader with isolated transactions flag unset.
     leader    ${ISOLATED_TRANS_FALSE}
 
 Restart2
-    [Documentation]    Restart odl
-    [Template]
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Producer_On_Shard_Non_Leader_Node_Isolated_Transactions
     [Documentation]    Client isolation with producer on shard non-leader with isolated transactions flag set.
@@ -48,8 +50,9 @@ Producer_On_Shard_Non_Leader_Node_Isolated_Transactions
 
 Restart3
     [Documentation]    Restart odl
-    [Template]
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Producer_On_Shard_Non_Leader_Node_Nonisolated_Transactions
     [Documentation]    Client isolation with producer on shard non-leader with isolated transactions flag unset.