Add shard leader verification after odl restart

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

diff --git a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
index b6cc2f100a7849955bd4deb3507b6d549dc44e5d..a21a5be483d3c8cf0c63e5f22376850d2a059c5d 100644 (file)
--- a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
+++ b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
@@ -17,6 +17,8 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Variables ***
 ${DATASTORE_CFG}    /${WORKSPACE}/${BUNDLEFOLDER}/etc/org.opendaylight.controller.cluster.datastore.cfg
+${SHARD_NAME}     default
+${SHARD_TYPE}     config
 
 *** Test Cases ***
 Kill_All_Members
@@ -31,4 +33,5 @@ Unset_Tell_Based_Protocol_Usage
 Start_All_And_Sync
     [Documentation]    Start each member and wait for sync.
     ClusterManagement.Start_Members_From_List_Or_All
+    BuiltIn.Wait_Until_Keyword_Succeeds    30s    5s    ClusterManagement.Get_Leader_And_Followers_For_Shard    shard_name=${SHARD_NAME}    shard_type=${SHARD_TYPE}
     ClusterManagement.Run_Bash_Command_On_List_Or_All    ps -ef | grep java

diff --git a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
index cd85b249a5d3211b94273e4382066e8a1a3cad4b..0474636001a2197bb51abf1ffd6523b635dc2c5f 100644 (file)
--- a/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
+++ b/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
@@ -17,6 +17,8 @@ Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Variables ***
 ${DATASTORE_CFG}    /${WORKSPACE}/${BUNDLEFOLDER}/etc/org.opendaylight.controller.cluster.datastore.cfg
+${SHARD_NAME}     default
+${SHARD_TYPE}     config
 
 *** Test Cases ***
 Kill_All_Members
@@ -31,4 +33,5 @@ Set_Tell_Based_Protocol_Usage
 Start_All_And_Sync
     [Documentation]    Start each member and wait for sync.
     ClusterManagement.Start_Members_From_List_Or_All
+    BuiltIn.Wait_Until_Keyword_Succeeds    30s    5s    ClusterManagement.Get_Leader_And_Followers_For_Shard    shard_name=${SHARD_NAME}    shard_type=${SHARD_TYPE}
     ClusterManagement.Run_Bash_Command_On_List_Or_All    ps -ef | grep java