X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsxp%2Fbasic%2F030_Connectivity.robot;h=37302ab484c34fa2387676486c09f6c7aee741d0;hb=94651ca9711d8eb316721775561e815830bc6c7e;hp=1907c035c78edee6aef5e07a46a06a015c21d810;hpb=734a3e4e395d94d1f3d16ec3c03a476a4af92490;p=integration%2Ftest.git

diff --git a/csit/suites/sxp/basic/030_Connectivity.robot b/csit/suites/sxp/basic/030_Connectivity.robot
index 1907c035c7..37302ab484 100644
--- a/csit/suites/sxp/basic/030_Connectivity.robot
+++ b/csit/suites/sxp/basic/030_Connectivity.robot
@@ -63,29 +63,30 @@ Mixed Versions
 Test Nodes
     [Arguments]    ${version}    ${PASSWORD}    @{versions}
     [Documentation]    Setup connection Speaker => Listener / Listener => Speaker / Both <=> Both for specific versions
-    : FOR    ${r_version}    IN    @{versions}
-    \    ${cmp_version}    Lower Version    ${r_version}    ${version}
-    \    BuiltIn.Log    ${r_version}
-    \    SxpLib.Add Connection    ${r_version}    listener    127.0.0.2    64999    127.0.0.1
-    \    ...    ${PASSWORD}
-    \    SxpLib.Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2
-    \    ...    ${PASSWORD}
-    \    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    listener
-    \    ...    127.0.0.2    64999    127.0.0.1
-    \    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    speaker
-    \    ...    127.0.0.1    64999    127.0.0.2
-    \    BuiltIn.Log    OK ${r_version}:listener ${version}:speaker
-    \    SxpLib.Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.3
-    \    ...    ${PASSWORD}
-    \    SxpLib.Add Connection    ${r_version}    speaker    127.0.0.3    64999    127.0.0.2
-    \    ...    ${PASSWORD}
-    \    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    listener
-    \    ...    127.0.0.2    64999    127.0.0.3
-    \    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    speaker
-    \    ...    127.0.0.3    64999    127.0.0.2
-    \    BuiltIn.Log    OK ${version}:listener ${r_version}:speaker
-    \    BuiltIn.Run Keyword If    '${version}' == 'version4' and '${r_version}' == 'version4'    Test Both    ${version}    ${r_version}    ${PASSWORD}
-    \    Clean Nodes
+    FOR    ${r_version}    IN    @{versions}
+        ${cmp_version}    Lower Version    ${r_version}    ${version}
+        BuiltIn.Log    ${r_version}
+        SxpLib.Add Connection    ${r_version}    listener    127.0.0.2    64999    127.0.0.1
+        ...    ${PASSWORD}
+        SxpLib.Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2
+        ...    ${PASSWORD}
+        BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    listener
+        ...    127.0.0.2    64999    127.0.0.1
+        BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    speaker
+        ...    127.0.0.1    64999    127.0.0.2
+        BuiltIn.Log    OK ${r_version}:listener ${version}:speaker
+        SxpLib.Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.3
+        ...    ${PASSWORD}
+        SxpLib.Add Connection    ${r_version}    speaker    127.0.0.3    64999    127.0.0.2
+        ...    ${PASSWORD}
+        BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    listener
+        ...    127.0.0.2    64999    127.0.0.3
+        BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    speaker
+        ...    127.0.0.3    64999    127.0.0.2
+        BuiltIn.Log    OK ${version}:listener ${r_version}:speaker
+        BuiltIn.Run Keyword If    '${version}' == 'version4' and '${r_version}' == 'version4'    Test Both    ${version}    ${r_version}    ${PASSWORD}
+        Clean Nodes
+    END
 
 Test Both
     [Arguments]    ${version}    ${r_version}    ${PASSWORD}
@@ -93,9 +94,9 @@ Test Both
     ${cmp_version}    Sxp.Lower Version    ${r_version}    ${version}
     SxpLib.Add Connection    ${r_version}    both    127.0.0.3    64999    127.0.0.1    ${PASSWORD}
     SxpLib.Add Connection    ${version}    both    127.0.0.1    64999    127.0.0.3    ${PASSWORD}
-    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    both    127.0.0.3
+    BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    both    127.0.0.3
     ...    64999    127.0.0.1
-    BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${cmp_version}    both    127.0.0.1
+    BuiltIn.Wait Until Keyword Succeeds    120x    1s    SxpLib.Verify Connection    ${cmp_version}    both    127.0.0.1
     ...    64999    127.0.0.3
     BuiltIn.Log    OK ${r_version}:both ${version}:both