From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 5 Mar 2019 04:03:21 +0000 (-0800)
Subject: Repair Karaf command
X-Git-Tag: pre-potassium~361
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=db38c2ec21847d54805e7deef40609fda9d04d2e;p=integration%2Ftest.git

Repair Karaf command

Option -f is not available in bundle:restart.
Some of the expected logs are not there anymore.

Change-Id: Ie8f2c7be83a4b5c08ed06034996dba7e4b0523de
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index b96599519a..39592b1a23 100644
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -328,19 +328,17 @@ Restart_Bundle
     [Arguments]    ${bundle_id}
     [Documentation]    Restarts bundle passed as argument. Note this operation is only for testing and not production environments
     # TODO: prepare this for cluster environment and multiple controllers
-    Execute_Controller_Karaf_Command_With_Retry_On_Background    bundle:restart -f $(bundle:id '${bundle_id}')
+    Execute_Controller_Karaf_Command_With_Retry_On_Background    bundle:restart $(bundle:id '${bundle_id}')
 
 Restart_Karaf
     [Documentation]    Restarts Karaf and polls log to detect when Karaf is up and running again
     # TODO: prepare this for cluster environment and multiple controllers
     Execute_Controller_Karaf_Command_With_Retry_On_Background    log:clear
     Execute_Controller_Karaf_Command_With_Retry_On_Background    shutdown -r -f
-    BuiltIn.Run_Keyword_And_Return_Status    BuiltIn.Wait_Until_Keyword_Succeeds    240s    60s    Wait_For_Karaf_Log    Karaf started in
+    BuiltIn.Run_Keyword_And_Return_Status    BuiltIn.Wait_Until_Keyword_Succeeds    240s    60s    Wait_For_Karaf_Log    Shiro environment initialized in
 
 Restart_Jetty
     [Documentation]    Restarts jetty bundle (to reload certificates or key/truststore information)
     Execute_Controller_Karaf_Command_With_Retry_On_Background    log:clear
     Restart_Bundle    OPS4J Pax Web - Jetty
-    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.restconf.RestconfApplication
-    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.netconf.sal.rest.impl.RestconfApplication
-    Wait_For_Karaf_Log    Instantiated the Application class org.opendaylight.aaa.idm.IdmLightApplication
+    Wait_For_Karaf_Log    Started jetty-default