From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 12 May 2017 11:04:36 +0000 (+0200)
Subject: Tolerate karaf console refusal
X-Git-Tag: release/carbon~69
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=87c6de79a247b8b5d4dd047863bcd3dfd93f9199;p=integration%2Ftest.git

Tolerate karaf console refusal

Sometimes a suite breaks ODL so hard it starts rejecting SSH connections
to karaf console. We need this for a suite to reset ODL.

Change-Id: Ib81653aaaa058f91204f22e2ccd35732e4d6fbd8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index e60a517ceb..e9260d0e84 100644
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -19,7 +19,7 @@ Setup_Karaf_Keywords
     ClusterManagement.ClusterManagement_Setup    http_timeout=${http_timeout}
     BuiltIn.Comment    First connections to Karaf console may fail, so WUKS is used. TODO: Track as a Bug.
     : FOR    ${index}    IN    @{ClusterManagement__member_index_list}
-    \    BuiltIn.Wait_Until_Keyword_Succeeds    10x    0.2s    Open_Controller_Karaf_Console_On_Background    member_index=${index}
+    \    BuiltIn.Run_Keyword_And_Ignore_Error    BuiltIn.Wait_Until_Keyword_Succeeds    3s    1s    Open_Controller_Karaf_Console_On_Background    member_index=${index}
 
 Verify_Feature_Is_Installed
     [Arguments]    ${feature_name}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}