X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsxp%2Fclustering%2F010_Connection_switchover.robot;h=724ad01b97096cc25345836235d9bf3f428da5e8;hb=d11f5895faa57e1fa84e5b3cb92ed9aabe62229b;hp=69481d80caecb10f8e83e95959290b7a6af48d6c;hpb=2e2d81e857113575325038257a861bae300e16eb;p=integration%2Ftest.git

diff --git a/csit/suites/sxp/clustering/010_Connection_switchover.robot b/csit/suites/sxp/clustering/010_Connection_switchover.robot
index 69481d80ca..724ad01b97 100644
--- a/csit/suites/sxp/clustering/010_Connection_switchover.robot
+++ b/csit/suites/sxp/clustering/010_Connection_switchover.robot
@@ -1,33 +1,67 @@
 *** Settings ***
-Documentation     Test suite to test cluster connection switchover
-Suite Setup       Setup SXP Cluster Session
-Suite Teardown    Clean SXP Cluster Session
-Test Setup        Setup SXP Cluster
-Test Teardown     Clean SXP Cluster
-Library           ../../../libraries/Sxp.py
-Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/SxpClusterLib.robot
+Documentation       Test suite to test cluster connection switchover
+
+Resource            ../../../libraries/ClusterManagement.robot
+Resource            ../../../libraries/SxpClusterLib.robot
+
+Suite Setup         SxpClusterLib.Setup SXP Cluster Session With Device
+Suite Teardown      SxpClusterLib.Clean SXP Cluster Session
+Test Setup          SxpClusterLib.Setup SXP Cluster
+Test Teardown       SxpClusterLib.Clean SXP Cluster
+
 
 *** Test Cases ***
 Isolation of SXP service follower Test
     [Documentation]    Test SXP connection switchover only if Controller with SCS is isolated
-    Check Shards Status
-    ${controller_index} =    Get Active Controller
+    SxpClusterLib.Check Shards Status
+    ${controller_index} =    SxpClusterLib.Get Owner Controller
     Isolate SXP Controller    ${controller_index}
 
 Isolation of SXP noservice follower Test
     [Documentation]    Test SXP connection switchover only if Controller without SCS are isolated
-    Check Shards Status
-    ${controller_index} =    Get Inactive Controller
+    SxpClusterLib.Check Shards Status
+    ${controller_index} =    SxpClusterLib.Get Not Owner Controller
     Isolate SXP Controller    ${controller_index}
 
+
 *** Keywords ***
 Isolate SXP Controller
-    [Arguments]    ${controller_index}
     [Documentation]    Isolate one of cluster nodes and perform check that Device is still connected afterwards reverts isolation
-    Isolate_Member_From_List_Or_All    ${controller_index}
-    Wait Until Keyword Succeeds    240    1    Sync_Status_Should_Be_False    ${controller_index}
-    Wait Until Keyword Succeeds    60    1    Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
-    Flush_Iptables_From_List_Or_All
-    Wait Until Keyword Succeeds    240    1    Sync_Status_Should_Be_True    ${controller_index}
-    Wait Until Keyword Succeeds    60    1    Check Device is Connected    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
+    [Arguments]    ${controller_index}
+    ${running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds
+    ...    120x
+    ...    1s
+    ...    ClusterManagement.Verify_Members_Are_Ready
+    ...    member_index_list=${running_members}
+    ...    verify_cluster_sync=True
+    ...    verify_restconf=True
+    ...    verify_system_status=False
+    ...    service_list=${EMPTY_LIST}
+    BuiltIn.Wait Until Keyword Succeeds
+    ...    240x
+    ...    1s
+    ...    ClusterManagement.Sync_Status_Should_Be_False
+    ...    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds
+    ...    120x
+    ...    1s
+    ...    SxpClusterLib.Check Device is Connected
+    ...    ${DEVICE_NODE_ID}
+    ...    session=${DEVICE_SESSION}
+    ClusterManagement.Flush_Iptables_From_List_Or_All
+    BuiltIn.Wait Until Keyword Succeeds
+    ...    120x
+    ...    1s
+    ...    ClusterManagement.Verify_Members_Are_Ready
+    ...    member_index_list=${EMPTY}
+    ...    verify_cluster_sync=True
+    ...    verify_restconf=True
+    ...    verify_system_status=False
+    ...    service_list=${EMPTY_LIST}
+    BuiltIn.Wait Until Keyword Succeeds
+    ...    120x
+    ...    1s
+    ...    SxpClusterLib.Check Device is Connected
+    ...    ${DEVICE_NODE_ID}
+    ...    session=${DEVICE_SESSION}