Make AAA TLS test more robust

Use retry on karaf session commands

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

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index deaa0387d7a614054bd24750b4ae440e9d9ca37b..1ec60c3905a8f7fe706f647914dd7acc21a15a95 100644 (file)
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -208,18 +208,18 @@ 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
-    Safe_Issue_Command_On_Karaf_Console    bundle:restart -f $(bundle:id '${bundle_id}')
+    Execute_Controller_Karaf_Command_With_Retry_On_Background    bundle:restart -f $(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
-    Safe_Issue_Command_On_Karaf_Console    log:clear
-    Issue_Command_On_Karaf_Console    shutdown -r -f
+    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
 
 Restart_Jetty
     [Documentation]    Restarts jetty bundle (to reload certificates or key/truststore information)
-    Safe_Issue_Command_On_Karaf_Console    log:clear
+    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

diff --git a/csit/suites/aaa/tls/010__aaa_restconf_tls.robot b/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
index 9caffd2eabb7e457acf0e554045b0ca9567d7807..84884ec25b59e8c8ec53c6df045c21f2dcc63349 100644 (file)
--- a/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
+++ b/csit/suites/aaa/tls/010__aaa_restconf_tls.robot
@@ -259,7 +259,7 @@ Enable Client TLS Authentication in ODL
 
 Init Suite
     [Documentation]    Cleans TLS configuration and restart Karaf system to reload
-    ClusterManagement_Setup
+    KarafKeywords.Setup Karaf Keywords
     Clean Up Certificates In Server
     Disable TLS in ODL
     Install a Feature    odl-jolokia