X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fcontroller%2FClustering_Datastore%2Fcar_persistence_recovery.robot;h=9a80b5b03709d40e61a2372e143d21c121b80029;hb=94651ca9711d8eb316721775561e815830bc6c7e;hp=3b2020d0aa474be919bd9ff7e41e479ba8a846c4;hpb=9f7b48072f28df34ec3e561c5e5ca1a3766bd2fc;p=integration%2Ftest.git

diff --git a/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot b/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
index 3b2020d0aa..9a80b5b037 100644
--- a/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
@@ -13,10 +13,12 @@ Documentation     This test restarts all controllers to verify recovery of car d
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car module to have a separate Shard.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -29,12 +31,14 @@ ${VAR_DIR}        ${CURDIR}/../../../variables/carpeople/crud
 Add_Cars_On_Leader_And_Verify
     [Documentation]    Single big PUT to datastore to add cars to car Leader.
     TemplatedRequests.Put_As_Json_Templated    folder=${VAR_DIR}/cars    session=${car_leader_session}    iterations=${CAR_ITEMS}
-    : FOR    ${session}    IN    @{ClusterManagement__session_list}
-    \    TemplatedRequests.Get_As_Json_Templated    folder=${VAR_DIR}/cars    session=${session}    verify=True    iterations=${CAR_ITEMS}
+    FOR    ${session}    IN    @{ClusterManagement__session_list}
+        BuiltIn.Wait_Until_Keyword_Succeeds    10s    2s    TemplatedRequests.Get_As_Json_Templated    folder=${VAR_DIR}/cars    session=${session}
+        ...    verify=True    iterations=${CAR_ITEMS}
+    END
 
-Kill_All_Members
-    [Documentation]    Kill all controllers.
-    ClusterManagement.Kill_Members_From_List_Or_All    confirm=True
+Stop_All_Members
+    [Documentation]    Stop all controllers.
+    ClusterManagement.Stop_Members_From_List_Or_All    confirm=True
 
 Start_All_Members
     [Documentation]    Start all controllers (should restore the persisted data).
@@ -50,8 +54,9 @@ See_Cars_On_Leader
 
 See_Cars_On_Followers
     [Documentation]    The same check on other members.
-    : FOR    ${session}    IN    @{car_follower_sessions}
-    \    TemplatedRequests.Get_As_Json_Templated    folder=${VAR_DIR}/cars    session=${session}    verify=True    iterations=${CAR_ITEMS}
+    FOR    ${session}    IN    @{car_follower_sessions}
+        TemplatedRequests.Get_As_Json_Templated    folder=${VAR_DIR}/cars    session=${session}    verify=True    iterations=${CAR_ITEMS}
+    END
 
 Delete_Cars_On_Leader
     [Documentation]    Delete cars on the new Leader.
@@ -60,5 +65,5 @@ Delete_Cars_On_Leader
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize car shard leader and followers.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=car