SXP: Use KWs from ClusterManagement

[integration/test.git] / csit / suites / sxp / cluster-routing / 010_Route_Switching.robot

diff --git a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
index 40b12af1dfd1fed1bc4d4a0baf02b51ac4937474..4d0e2246d63cb37ae4c408d5eb2bf01e412ab0b1 100644 (file)
--- a/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/010_Route_Switching.robot
@@ -13,22 +13,22 @@ Resource          ../../../libraries/SxpClusterLib.robot
 Route Definition Test
     [Documentation]    Test Route update mechanism without cluster node isolation
     SxpClusterLib.Check Shards Status
-    ${active_controller} =    SxpClusterLib.Get Leader Controller
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_controller}
-    Add Route Definition To Cluster    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${active_controller}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_controller}
-    SxpLib.Clean Routing Configuration To Controller    controller${active_controller}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_controller}
-    Put Route Definition To Cluster    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${active_controller}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${active_controller}
+    ${owner_controller} =    SxpClusterLib.Get Owner Controller
+    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${owner_controller}
+    Add Route Definition To Cluster    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${owner_controller}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${owner_controller}
+    SxpLib.Clean Routing Configuration To Controller    ClusterManagement__session_${owner_controller}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${owner_controller}
+    Put Route Definition To Cluster    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${owner_controller}
+    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${owner_controller}
 
 Isolation of SXP service follower Test
     [Documentation]    Test Route update mechanism during Cluster isolation,
-    ...    after each isolation virtual ip should be pre-routed to new leader
+    ...    after each isolation virtual IP should be pre-routed to new leader
     SxpClusterLib.Check Shards Status
     ${any_controller} =    SxpClusterLib.Get Any Controller
     Add Route Definition To Cluster    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${any_controller}
-    ${controller_index} =    SxpClusterLib.Get Leader Controller
+    ${controller_index} =    SxpClusterLib.Get Owner Controller
     Isolate SXP Controller    ${controller_index}
 
 *** Keywords ***
@@ -37,20 +37,19 @@ Put Route Definition To Cluster
     [Documentation]    Put Route definition to DS replacing all present
     ${route} =    Sxp.Route Definition Xml    ${virtual_ip}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}
     ${routes} =    Sxp.Route Definitions Xml    ${route}
-    SxpLib.Put Routing Configuration To Controller    ${routes}    controller${follower}
+    SxpLib.Put Routing Configuration To Controller    ${routes}    ClusterManagement__session_${follower}
 
 Add Route Definition To Cluster
     [Arguments]    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}    ${follower}
     [Documentation]    Add Route definition to DS
-    ${old_routes} =    SxpLib.Get Routing Configuration From Controller    controller${follower}
+    ${old_routes} =    SxpLib.Get Routing Configuration From Controller    ClusterManagement__session_${follower}
     ${route} =    Sxp.Route Definition Xml    ${VIRTUAL_IP}    ${VIRTUAL_IP_MASK}    ${VIRTUAL_INTERFACE}
     ${routes} =    Sxp.Route Definitions Xml    ${route}    ${old_routes}
-    SxpLib.Put Routing Configuration To Controller    ${routes}    controller${follower}
+    SxpLib.Put Routing Configuration To Controller    ${routes}    ClusterManagement__session_${follower}
 
 Custom Clean SXP Cluster
     [Documentation]    Cleans up Route definitions
-    ${follower} =    SxpClusterLib.Get Leader Controller
-    SxpLib.Clean Routing Configuration To Controller    controller${follower}
+    SxpLib.Clean Routing Configuration To Controller    ${CONTROLLER_SESSION}
 
 Setup Custom SXP Cluster Session
     [Documentation]    Prepare topology for testing, creates sessions and generate Route definitions based on Cluster nodes ip
@@ -62,19 +61,19 @@ Setup Custom SXP Cluster Session
 
 Clean Custom SXP Cluster Session
     [Documentation]    Cleans up resources generated by test
-    ${controller_index} =    SxpClusterLib.Get Leader Controller
-    SxpLib.Clean Routing Configuration To Controller    controller${controller_index}
+    SxpLib.Clean Routing Configuration To Controller    ${CONTROLLER_SESSION}
     SxpClusterLib.Clean SXP Cluster Session
     SxpClusterLib.Delete Virtual Interface
 
 Isolate SXP Controller
     [Arguments]    ${controller_index}
-    [Documentation]    Isolate one of cluster nodes and perform check that virtual ip is routed to another cluster node,
+    [Documentation]    Isolate the cluster leader node and perform check that virtual IP is routed to a new leader,
     ...    afterwards unisolate old leader.
     @{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    240    1    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${controller_index}
-    ${active_follower} =    SxpClusterLib.Get Leader Controller From Running    @{running_members}
+    ${running_member} =    Collections.Get From List    ${running_members}    0
+    ${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}