Add verify_restconf check for odl restart suites

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

diff --git a/csit/libraries/ShardStability.robot b/csit/libraries/ShardStability.robot
index 4611d3613beb3633720145d984c3ecdbc0924950..c479ee3ceebc3eb5f543c24b28a28b481f55588b 100644 (file)
--- a/csit/libraries/ShardStability.robot
+++ b/csit/libraries/ShardStability.robot
@@ -32,14 +32,14 @@ Shards_Stability_Init_Details
     BuiltIn.Set_Suite_Variable    ${stored_details}    ${shards_details}
 
 Shards_Stability_Get_Details
-    [Arguments]    ${shard_list}    ${member_index_list}=${EMPTY}
+    [Arguments]    ${shard_list}    ${member_index_list}=${EMPTY}    ${verify_restconf}=False
     [Documentation]    Return shard details stored in dictionary.
     ...    ${shard_list} should be initialized as @{list} shard_name1:shard_type1 shard_name2:shard..
     &{shards_details}    BuiltIn.Create_Dictionary
     : FOR    ${shard_details}    IN    @{shard_list}
     \    ${shard_name}    ${shard_type}    String.Split_String    ${shard_details}    separator=:
     \    ${leader}    ${followers}    ClusterManagement.Get_Leader_And_Followers_For_Shard    shard_name=${shard_name}    shard_type=${shard_type}    member_index_list=${member_index_list}
-    \    ...    verify_restconf=False
+    \    ...    verify_restconf=${verify_restconf}
     \    Collections.Sort_List    ${followers}
     \    Collections.Set_To_Dictionary    ${shards_details}    ${shard_name}_${shard_type}_leader=${leader}
     \    Collections.Set_To_Dictionary    ${shards_details}    ${shard_name}_${shard_type}_followers=${followers}

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 19f391151c2c80045965f63cc9c057434bc18ca3..398b9e5b225a4fb73d0c0a53c78211c65fdfcda5 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
@@ -34,5 +34,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    300s    10s    ShardStability.Shards_Stability_Get_Details    ${DEFAULT_SHARD_LIST}
+    BuiltIn.Wait_Until_Keyword_Succeeds    300s    10s    ShardStability.Shards_Stability_Get_Details    ${DEFAULT_SHARD_LIST}    verify_restconf=True
     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 9a5bb932596107aa64d3e6b2246079ebd2d89656..c9e5ae61b046d3234d242233da0338a8e0f2eeb6 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
@@ -34,5 +34,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    300s    10s    ShardStability.Shards_Stability_Get_Details    ${DEFAULT_SHARD_LIST}
+    BuiltIn.Wait_Until_Keyword_Succeeds    300s    10s    ShardStability.Shards_Stability_Get_Details    ${DEFAULT_SHARD_LIST}    verify_restconf=True
     ClusterManagement.Run_Bash_Command_On_List_Or_All    ps -ef | grep java