Fix logic in prefbasedshard creation after restart

Change-Id: Ib043fd5cf0d1bb3fcf1b583df151d49aa9170243
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
index 276522565b8816704b50b8583bc20eb10d69029f..f670fddcfaebd672e7b4a6ccda1473573d6cdb8b 100644 (file)
--- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
@@ -11,12 +11,12 @@ Documentation     DOMDataBroker testing: Clean Leader Shutdown
 ...               leader is shut down cleanly. This is performed by having a steady-stream
 ...               producer execute operations against the shard and then initiate leader shard
 ...               shutdown, then the producer is shut down cleanly.
-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=30
+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.Clean_Leader_Shutdown_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -29,9 +29,11 @@ Local_Leader_Shutdown
     local
 
 Restart
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Remote_Leader_Shutdown
     [Documentation]    Shutdown the leader on different node as transaction producer.

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..62973940fae3cf60d74df1f0cba4967b1ed63c4f 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=30
+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,22 @@ Producer_On_Shard_Leader_Node_Isolated_Transactions
     leader    ${ISOLATED_TRANS_TRUE}
 
 Restart1
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     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
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     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.

diff --git a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
index 0adbfd77ad4fdfb6310646d9f7df83efdd6e5f59..6d8bdd5389dcd0449ab42d5cb2cb2ed710a9843d 100644 (file)
--- a/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
@@ -11,12 +11,12 @@ Documentation     DOMDataBroker testing: Explicit Leader Movement
 ...               leader is moved as the result of explicit application request. This is performed
 ...               by having a steady-stream producer execute operations against the shard and then
 ...               initiate shard leader shutdown, then the producer is shut down cleanly.
-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=30
+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.Explicit_Leader_Movement_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -29,18 +29,22 @@ Local_To_Remote_Movement
     local    remote
 
 Restart1
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Remote_To_Remote_Movement
     [Documentation]    Leader moves from one remote to other remote node during transaction producing.
     remote    remote
 
 Restart2
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Remote_To_Local_Movement
     [Documentation]    Leader moves from remote to local node during transaction producing.

diff --git a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
index 6d0fd445e383e1c95d42dc3f46e4986a10bcbfe8..6e4030f399ec74d43f444dbe2c2926fab91e5e52 100644 (file)
--- a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
@@ -9,12 +9,12 @@ Documentation     DOMDataBroker testing: Leader Isolation
 ...
 ...               The goal is to ensure the datastore succeeds in basic isolation/rejoin scenario,
 ...               simulating either a network partition, or a prolonged GC pause.
-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=30
+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.Leader_Isolation_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -28,9 +28,11 @@ Healing_Within_Transaction_Timeout
     ${HEAL_WITHIN_TRANS_TIMEOUT}
 
 Restart
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Healing_After_2x_Transaction_Timeout
     [Documentation]    The isolated node (leader) is rejoined after 2x transaction timeout.

diff --git a/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
index c81fa1780de1d7234984db55f638e332db2075e7..089573eba728ffa662bd883de20f9156482d3be3 100644 (file)
--- a/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
@@ -10,12 +10,12 @@ Documentation     DOMDataBroker testing: Remote Listener
 ...               The goal is to ensure listeners do no observe disruption when the leader moves.
 ...               This is performed by having a steady stream of transactions being observed by
 ...               the listeners and having the leader move.
-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=30
+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.Remote_Listener_PrefBasedShard_Test_Templ
 Library           SSHLibrary
@@ -28,9 +28,11 @@ Listener_On_Shard_Leader_Node
     leader
 
 Restart
-    [Documentation]    Restart odl
+    [Documentation]    Restart odl.
+    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     [Template]
     DdbCommons.Restart_Test_Templ
+    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 
 Listener_On_Shard_Non_Leader_Node
     [Documentation]    Listener runs on non-leader node when leader changed.