SXP: Check cluster is in sync

- check that all cluster nodes are
in sync after leader isolation is
reverted

JIRA: SXP-154
Change-Id: I770c148d55c7b046eb72f85a13f8d4902854f6db
Signed-off-by: Ivan Hrasko <ihrasko@cisco.com>

diff --git a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
index b01477933e6396069baea22475def9e81773d60e..cbb4207e7f2480e68da8faec32e6747f6ee95fcc 100644 (file)
--- a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
@@ -76,4 +76,4 @@ Isolate SXP Controller
     ${active_follower} =    SxpClusterLib.Get Owner Controller    ${running_member}
     BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_follower}
     ClusterManagement.Flush_Iptables_From_List_Or_All
-    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_True    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Check_Cluster_Is_In_Sync

diff --git a/csit/suites/sxp/clustering/010_Connection_switchover.robot b/csit/suites/sxp/clustering/010_Connection_switchover.robot
index 81c15d26bc2582a0a7feafb5f4fd7e3145ad44b4..8aeac109baf07aef8892ce95022cbe65f4488a91 100644 (file)
--- a/csit/suites/sxp/clustering/010_Connection_switchover.robot
+++ b/csit/suites/sxp/clustering/010_Connection_switchover.robot
@@ -28,5 +28,5 @@ Isolate SXP Controller
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
     ClusterManagement.Flush_Iptables_From_List_Or_All
-    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_True    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Check_Cluster_Is_In_Sync
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}

diff --git a/csit/suites/sxp/clustering/020_Bindings_consistency.robot b/csit/suites/sxp/clustering/020_Bindings_consistency.robot
index b84872be5262e3ab25ddbdb67b411f26510f3ec3..1766bac250ebde51822c4ebbc878a8012ec690b2 100644 (file)
--- a/csit/suites/sxp/clustering/020_Bindings_consistency.robot
+++ b/csit/suites/sxp/clustering/020_Bindings_consistency.robot
@@ -76,7 +76,7 @@ UnIsolate SXP Controller
     [Arguments]    ${controller_index}
     [Documentation]    Un-Isolate one of cluster nodes and perform check that device is connected
     ClusterManagement.Flush_Iptables_From_List_Or_All
-    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_True    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Check_Cluster_Is_In_Sync
     BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
 
 Check Bindings

diff --git a/csit/suites/sxp/clustering/030_RPC_functionality.robot b/csit/suites/sxp/clustering/030_RPC_functionality.robot
index ebad48d34cdba5d2819f1501502ea6574b8c2cd6..111d56b07f203936661f07d5a4a7bc948b271e53 100644 (file)
--- a/csit/suites/sxp/clustering/030_RPC_functionality.robot
+++ b/csit/suites/sxp/clustering/030_RPC_functionality.robot
@@ -37,7 +37,7 @@ Isolate SXP Controller
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
     \    SxpLib.Delete Bindings    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${INADDR_ANY}    session=ClusterManagement__session_${owner_controller}
     ClusterManagement.Flush_Iptables_From_List_Or_All
-    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_True    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Check_Cluster_Is_In_Sync
     BuiltIn.Wait Until Keyword Succeeds    30    1    Check Bindings Does Not Exist    ${owner_controller}
 
 Check Bindings Exist