Fix bulkomatic cluster suite

WUKS after node restart is added to avoid operations on node
when it is not ready.

Change-Id: I40831cb4ea97c3c3375684cf8619ab6e2a030a97
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/csit/suites/openflowplugin/Clustering_Bulkomatic/020__Cluster_HA_Data_Recovery_BulkFlow_2Node_Cluster.robot b/csit/suites/openflowplugin/Clustering_Bulkomatic/020__Cluster_HA_Data_Recovery_BulkFlow_2Node_Cluster.robot
index 7aedcc0f38fda6b9ce91ea85c949fabd6db9f5da..215dd39b196b0446423cd29be7a22f8b10e67cd2 100644 (file)
--- a/csit/suites/openflowplugin/Clustering_Bulkomatic/020__Cluster_HA_Data_Recovery_BulkFlow_2Node_Cluster.robot
+++ b/csit/suites/openflowplugin/Clustering_Bulkomatic/020__Cluster_HA_Data_Recovery_BulkFlow_2Node_Cluster.robot
@@ -82,9 +82,13 @@ Restart Pre Leader From Cluster Node
     [Documentation]    Restart Leader Node.
     ClusterManagement.Start Single Member    ${Inventory_Leader}
 
+Check Shards Status After Leader Restart
+    [Documentation]    Wait for node convergence and check status for all shards in OpenFlow application.
+    Wait Until Keyword Succeeds    ${restart_timeout}    2s    ClusterOpenFlow.Check OpenFlow Shards Status
+
 Verify Data Recovery After Leader Restart
     [Documentation]    ${flow_count_after_add} Flows preserved in all controller instances.
-    Wait Until Keyword Succeeds    ${restart_timeout}    2s    BulkomaticKeywords.Get Bulk Flow And Verify Count In Cluster    ${temp_json_config_get}    ${operation_timeout}    ${flow_count_after_add}
+    Wait Until Keyword Succeeds    ${operation_timeout}    2s    BulkomaticKeywords.Get Bulk Flow And Verify Count In Cluster    ${temp_json_config_get}    ${operation_timeout}    ${flow_count_after_add}
     ...    ${Inventory_Leader_List_Post}
 
 Verify Flows In Switch After Leader Restart
@@ -149,9 +153,13 @@ Restart Follower From Cluster Node
     [Documentation]    Restart Follower Node2.
     ClusterManagement.Start Single Member    ${Follower_Node_2}
 
+Check Shards Status After Follower Restart
+    [Documentation]    Wait for node convergence and check status for all shards in OpenFlow application.
+    Wait Until Keyword Succeeds    ${restart_timeout}    2s    ClusterOpenFlow.Check OpenFlow Shards Status
+
 Verify Data Recovery After Follower Restart
     [Documentation]    ${flow_count_after_add} Flows preserved in all controller instances.
-    Wait Until Keyword Succeeds    ${restart_timeout}    2s    BulkomaticKeywords.Get Bulk Flow And Verify Count In Cluster    ${temp_json_config_get}    ${operation_timeout}    ${flow_count_after_add}
+    Wait Until Keyword Succeeds    ${operation_timeout}    2s    BulkomaticKeywords.Get Bulk Flow And Verify Count In Cluster    ${temp_json_config_get}    ${operation_timeout}    ${flow_count_after_add}
     ...    ${Inventory_Leader_List}
 
 Verify Flows In Switch After Follower Restart