SXP: Fix clustering tests

[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 4eeaf73a2caca365d24184ce71f96bc711bd10bd..4d158f980d8cba4a42ad11dc06a84c8388491ce9 100644 (file)
--- a/csit/suites/sxp/clustering/030_RPC_functionality.robot
+++ b/csit/suites/sxp/clustering/030_RPC_functionality.robot
@@ -1,9 +1,9 @@
 *** Settings ***
 Documentation     Test suite to verify RPC funcionality on cluster
-Suite Setup       Setup SXP Cluster Session
-Suite Teardown    Clean SXP Cluster Session
-Test Setup        Setup SXP Cluster
-Test Teardown     Clean SXP Cluster
+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
 Library           ../../../libraries/Sxp.py
 Resource          ../../../libraries/ClusterManagement.robot
 Resource          ../../../libraries/SxpClusterLib.robot
@@ -28,28 +28,28 @@ Isolate SXP Controller
     [Documentation]    Isolate one of cluster nodes and perform check that RPC changes were performed afterwards reverts isolation
     ${owner_controller} =    SxpClusterLib.Get Owner 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${owner_controller}
+    \    SxpLib.Add 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}
     @{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
     ${running_member} =    Collections.Get From List    ${running_members}    0
     ${owner_controller} =    SxpClusterLib.Get Owner Controller    ${running_member}
+    BuiltIn.Wait Until Keyword Succeeds    30    1    Check Bindings Exist    ${owner_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=${CLUSTER_NODE_ID}    session=controller${owner_controller}
+    \    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    30    1    Check Bindings Does Not Exist
+    BuiltIn.Wait Until Keyword Succeeds    30    1    Check Bindings Does Not Exist    ${owner_controller}
 
 Check Bindings Exist
+    [Arguments]    ${owner_controller}
     [Documentation]    Check that bindings exists in Cluster datastore
-    ${controller_index} =    SxpClusterLib.Get Owner Controller
-    ${resp} =    SxpLib.Get Bindings    node=${CLUSTER_NODE_ID}    session=controller${controller_index}
+    ${resp} =    SxpLib.Get Bindings    node=${INADDR_ANY}    session=ClusterManagement__session_${owner_controller}
     : 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
+    [Arguments]    ${owner_controller}
     [Documentation]    Check that bindings does not exist in Cluster datastore
-    ${controller_index} =    SxpClusterLib.Get Owner Controller
-    ${resp} =    SxpLib.Get Bindings    node=${CLUSTER_NODE_ID}    session=controller${controller_index}
+    ${resp} =    SxpLib.Get Bindings    node=${INADDR_ANY}    session=ClusterManagement__session_${owner_controller}
     : 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