SXP: Get leader only from running members

[integration/test.git] / csit / suites / sxp / clustering / 030_RPC_functionality.robot

diff --git a/csit/suites/sxp/clustering/030_RPC_functionality.robot b/csit/suites/sxp/clustering/030_RPC_functionality.robot
index 41f7c0fbe1d91ef5f52b35e053300701a707cb46..403b8d80562200dcf2c8c6920a59bd2f514bd19e 100644 (file)
--- a/csit/suites/sxp/clustering/030_RPC_functionality.robot
+++ b/csit/suites/sxp/clustering/030_RPC_functionality.robot
@@ -13,7 +13,7 @@ Resource          ../../../libraries/SxpLib.robot
 Isolation of RCP service Test
     [Documentation]    Test SXP RPC functionality only if Controller with SCS is isolated
     SxpClusterLib.Check Shards Status
-    ${controller_index} =    SxpClusterLib.Get Active Controller
+    ${controller_index} =    SxpClusterLib.Get Leader Controller
     Isolate SXP Controller    ${controller_index}
 
 Isolation of RPC noservice Test
@@ -26,13 +26,13 @@ Isolation of RPC noservice Test
 Isolate SXP Controller
     [Arguments]    ${controller_index}
     [Documentation]    Isolate one of cluster nodes and perform check that RPC changes were performed afterwards reverts isolation
-    ${active_controller} =    SxpClusterLib.Get Active Controller
+    ${active_controller} =    SxpClusterLib.Get Leader Controller
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
     \    SxpLib.Add Bindings    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${CLUSTER_NODE_ID}    session=controller${active_controller}
-    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
+    @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    240    1    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
     BuiltIn.Wait Until Keyword Succeeds    30    1    Check Bindings Exist
-    ${active_controller} =    SxpClusterLib.Get Active Controller
+    ${active_controller} =    SxpClusterLib.Get Leader Controller From Running    @{running_members}
     : 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=${CLUSTER_NODE_ID}    session=controller${active_controller}
     ClusterManagement.Flush_Iptables_From_List_Or_All
@@ -41,14 +41,14 @@ Isolate SXP Controller
 
 Check Bindings Exist
     [Documentation]    Check that bindings exists in Cluster datastore
-    ${controller_index} =    SxpClusterLib.Get Active Controller
+    ${controller_index} =    SxpClusterLib.Get Leader Controller
     ${resp} =    SxpLib.Get Bindings    node=${CLUSTER_NODE_ID}    session=controller${controller_index}
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
     \    SxpLib.Should Contain Binding    ${resp}    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32
 
 Check Bindings Does Not Exist
     [Documentation]    Check that bindings does not exist in Cluster datastore
-    ${controller_index} =    SxpClusterLib.Get Active Controller
+    ${controller_index} =    SxpClusterLib.Get Leader Controller
     ${resp} =    SxpLib.Get Bindings    node=${CLUSTER_NODE_ID}    session=controller${controller_index}
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
     \    SxpLib.Should Not Contain Binding    ${resp}    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32