SXP: Adapt/increase retry timers

- adapt/increase retry timers for cluster
routing tests

Change-Id: I2003fe719be257b4ed0c25fc26a05599bf2cea11
Signed-off-by: Ivan Hrasko <ihrasko@cisco.com>

diff --git a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
index 742ab58ac20671d2aff811d7ce561a8e4d1532b4..1ec947f55a82db6daac8227848e82c8697d6e554 100644 (file)
--- a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
@@ -17,10 +17,10 @@ Isolation Of SXP Service Follower W/O Bindings Listener Test
     [Documentation]    Device is listener. Connection between device and cluster must be established despite of cluster owner isolation
     [Setup]    Setup Nodes And Connections    listener
     ${cluster_owner} =    SxpClusterLib.Get Owner Controller
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
     Check Connections    ${cluster_owner}    listener
     Isolate SXP Controller    ${cluster_owner}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
     Check Connections    ${NEW_OWNER}    listener
     [Teardown]    Clean Custom SXP Cluster
 
@@ -28,10 +28,10 @@ Isolation Of SXP Service Follower W/O Bindings Speaker Test
     [Documentation]    Device is speaker. Connection between device and cluster must be established despite of cluster owner isolation
     [Setup]    Setup Nodes And Connections    speaker
     ${cluster_owner} =    SxpClusterLib.Get Owner Controller
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
     Check Connections    ${cluster_owner}    speaker
     Isolate SXP Controller    ${cluster_owner}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
     Check Connections    ${NEW_OWNER}    speaker
     [Teardown]    Clean Custom SXP Cluster
 
@@ -39,28 +39,28 @@ Isolation Of SXP Service Follower Listener Test
     [Documentation]    Device is listener. Cluster owner is isolated but bindings must be propagated to the device throught virtual IP
     [Setup]    Setup Nodes And Connections    listener
     ${cluster_owner} =    SxpClusterLib.Get Owner Controller
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
     Check Connections    ${cluster_owner}    listener
     Add Bindings To Node    ${CLUSTER_NODE_ID}    ClusterManagement__session_${cluster_owner}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    Check Bindings    ${DEVICE_NODE_ID}    ${DEVICE_SESSION}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    Check Bindings    ${DEVICE_NODE_ID}    ${DEVICE_SESSION}
     Isolate SXP Controller    ${cluster_owner}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
     Check Connections    ${NEW_OWNER}    listener
-    BuiltIn.Wait Until Keyword Succeeds    240    1    Check Bindings    ${DEVICE_NODE_ID}    ${DEVICE_SESSION}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    Check Bindings    ${DEVICE_NODE_ID}    ${DEVICE_SESSION}
     [Teardown]    Clean Custom SXP Cluster
 
 Isolation Of SXP Service Follower Speaker Test
     [Documentation]    Device is speaker. Cluster owner is isolated but bindings must be propagated to the cluster throught virtual IP
     [Setup]    Setup Nodes And Connections    speaker
     ${cluster_owner} =    SxpClusterLib.Get Owner Controller
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${cluster_owner}
     Check Connections    ${cluster_owner}    speaker
     Add Bindings To Node    ${DEVICE_NODE_ID}    ${DEVICE_SESSION}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    Check Bindings    ${CLUSTER_NODE_ID}    ClusterManagement__session_${cluster_owner}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    Check Bindings    ${CLUSTER_NODE_ID}    ClusterManagement__session_${cluster_owner}
     Isolate SXP Controller    ${cluster_owner}
-    BuiltIn.Wait Until Keyword Succeeds    240    1    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${NEW_OWNER}
     Check Connections    ${NEW_OWNER}    speaker
-    BuiltIn.Wait Until Keyword Succeeds    240    1    Check Bindings    ${CLUSTER_NODE_ID}    ClusterManagement__session_${NEW_OWNER}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    Check Bindings    ${CLUSTER_NODE_ID}    ClusterManagement__session_${NEW_OWNER}
     [Teardown]    Clean Custom SXP Cluster
 
 *** Keywords ***
@@ -89,11 +89,11 @@ Setup Nodes And Connections
     [Documentation]    Setup and connect SXP cluster topology and one device
     SxpClusterLib.Check Shards Status
     SxpLib.Add Node    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}    retry_open_timer=2
-    BuiltIn.Wait Until Keyword Succeeds    20x    10s    SxpLib.Check Node Started    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpLib.Check Node Started    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
     SxpLib.Add Connection    version4    ${peer_mode}    ${VIRTUAL_IP}    64999    ${DEVICE_NODE_ID}    session=${DEVICE_SESSION}
     ${cluster_mode} =    Sxp.Get Opposing Mode    ${peer_mode}
     SxpLib.Add Node    ${CLUSTER_NODE_ID}    session=${CONTROLLER_SESSION}    retry_open_timer=5
-    BuiltIn.Wait Until Keyword Succeeds    20x    10s    SxpClusterLib.Check Cluster Node Started    ${CLUSTER_NODE_ID}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Check Cluster Node Started    ${CLUSTER_NODE_ID}
     SxpLib.Add Connection    version4    ${cluster_mode}    ${DEVICE_NODE_ID}    64999    ${CLUSTER_NODE_ID}    session=${CONTROLLER_SESSION}
 
 Clean Custom SXP Cluster Session
@@ -122,8 +122,8 @@ Isolate SXP Controller
     @{running_members} =    ClusterManagement.Isolate_Member_From_List_Or_All    ${controller_index}
     BuiltIn.Wait_Until_Keyword_Succeeds    60    1    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    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}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    ClusterManagement.Sync_Status_Should_Be_False    ${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    240x    1s    SxpClusterLib.Ip Addres Should Not Be Routed To Follower    ${MAC_ADDRESS_TABLE}    ${VIRTUAL_IP}    ${controller_index}
     ${running_member} =    Collections.Get From List    ${running_members}    0
     ${new_owner} =    SxpClusterLib.Get Owner Controller    ${running_member}
     BuiltIn.Set Test Variable    ${NEW_OWNER}    ${new_owner}
@@ -132,8 +132,8 @@ Check Connections
     [Arguments]    ${controller_index}    ${peer_mode}
     [Documentation]    Check that connection is established between device and the cluster
     ${cluster_mode} =    Sxp.Get Opposing Mode    ${peer_mode}
-    BuiltIn.Wait Until Keyword Succeeds    60    1    SxpClusterLib.Check Cluster is Connected    ${CLUSTER_NODE_ID}    mode=${cluster_mode}    session=ClusterManagement__session_${controller_index}
-    BuiltIn.Wait Until Keyword Succeeds    60    1    Check Device is Connected    ${DEVICE_NODE_ID}    ${peer_mode}    session=${DEVICE_SESSION}
+    BuiltIn.Wait Until Keyword Succeeds    480x    1s    SxpClusterLib.Check Cluster is Connected    ${CLUSTER_NODE_ID}    mode=${cluster_mode}    session=ClusterManagement__session_${controller_index}
+    BuiltIn.Wait Until Keyword Succeeds    480x    1s    Check Device is Connected    ${DEVICE_NODE_ID}    ${peer_mode}    session=${DEVICE_SESSION}
 
 Check Device is Connected
     [Arguments]    ${node}    ${mode}    ${session}    ${version}=version4    ${port}=64999