Add karaf logging to controller-clustering.txt suites

Change-Id: I764b451dca4a49feac62ec3e290be47ace81b625
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index 2c8adde108aea47c39ee5c33ccc2f6e1165911ee..f83bed1b3389466a439a44162e33309cce37c2ea 100644 (file)
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -166,8 +166,8 @@ Log Message To Controller Karaf
     ...    By default, failure while processing a node is silently ignored, unless ${tolerate_failure} is False.
     ${index_list} =    ClusterManagement.ClusterManagement__Given_Or_Internal_Index_List    given_list=${member_index_list}
     : FOR    ${index}    IN    @{index_list}    # usually: 1, 2, 3.
-    \    ${status}    ${message}=    BuiltIn.Run Keyword And Ignore Error    Execute Controller Karaf Command With Retry On Background    log:log "ROBOT MESSAGE: ${message}"    member_index=${index}
-    \    BuiltIn.Run_Keyword_Unless    ${tolerate_failure} or "${status}" == "PASS"    BuiltIn.Fail    ${message}
+    \    ${status}    ${output}=    BuiltIn.Run Keyword And Ignore Error    Execute Controller Karaf Command With Retry On Background    log:log "ROBOT MESSAGE: ${message}"    member_index=${index}
+    \    BuiltIn.Run_Keyword_Unless    ${tolerate_failure} or "${status}" == "PASS"    BuiltIn.Fail    ${output}
 
 Log Test Suite Start To Controller Karaf
     [Arguments]    ${member_index_list}=${EMPTY}

diff --git a/csit/suites/controller/Clustering_Datastore/buycar_failover.robot b/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
index 444e4e2908d5ca67e732a48d00d8400c868b5095..40751ddcdfb58b1d29c2595252439d0b822df784 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
+++ b/csit/suites/controller/Clustering_Datastore/buycar_failover.robot
@@ -13,10 +13,12 @@ Documentation     This test focuses on testing buy-car RPC over 3 Leader reboots
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car, people and car-people modules to have separate Shards.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -94,7 +96,7 @@ Delete_All_Cars
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize shard leaders, compute item distribution.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     Set_Variables_For_Shard    shard_name=car
     Set_Variables_For_Shard    shard_name=people
     Set_Variables_For_Shard    shard_name=car-people

diff --git a/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot b/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
index 1e5cfd6db7d94bcb0e217af5064a0a8bee2da330..4ada866f026add85b244f1f2412402477dbb3e7a 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_failover_crud.robot
@@ -17,10 +17,12 @@ Documentation     Suite mixing basic operations with restart of car Leader.
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car module to have a separate Shard.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -107,7 +109,7 @@ Delete_Follower_Cars_On_New_Leader
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize car shard leader and followers.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=car
 
 Set_Variables_For_Less_Nodes

diff --git a/csit/suites/controller/Clustering_Datastore/car_outage_corners.robot b/csit/suites/controller/Clustering_Datastore/car_outage_corners.robot
index 8e10a1bc6fbc34e28f1a20da77d68f27089e24ef..507a2c2a2632f2a13519bafc3205ca496c16b368 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/car_outage_corners.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_outage_corners.robot
@@ -21,10 +21,12 @@ Documentation     Cluster suite for testing minimal and sum-minimal member popul
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car module to have a separate Shard.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -85,7 +87,7 @@ Delete_Cars_On_Leader
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize shard leaders, pre-compute member lists.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=car
     Set_Additional_Variables
 

diff --git a/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot b/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
index 3b2020d0aa474be919bd9ff7e41e479ba8a846c4..9ea49c0b0748dfa1f8152e8628322379d2b7831a 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
+++ b/csit/suites/controller/Clustering_Datastore/car_persistence_recovery.robot
@@ -13,10 +13,12 @@ Documentation     This test restarts all controllers to verify recovery of car d
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car module to have a separate Shard.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -60,5 +62,5 @@ Delete_Cars_On_Leader
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize car shard leader and followers.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=car

diff --git a/csit/suites/controller/Clustering_Datastore/carpeople_crud.robot b/csit/suites/controller/Clustering_Datastore/carpeople_crud.robot
index 2f53ebe71dc29734f68f139f33c9fbec970987fc..d91d001f096a9d4428871afd79c5ba240399fec2 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/carpeople_crud.robot
+++ b/csit/suites/controller/Clustering_Datastore/carpeople_crud.robot
@@ -18,10 +18,12 @@ Documentation     Suite for performing basic car/people CRUD operations on leade
 ...               All data is deleted at the end of the suite.
 ...               This suite expects car, people and car-people modules to have separate Shards.
 Suite Setup       Setup
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -93,7 +95,7 @@ Delete_All_Cars_On_Leader
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize shard leaders, compute item distribution.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=car
     CarPeople.Set_Variables_For_Shard    shard_name=people
     CarPeople.Set_Variables_For_Shard    shard_name=car-people

diff --git a/csit/suites/controller/Clustering_Datastore/cluster_ready.robot b/csit/suites/controller/Clustering_Datastore/cluster_ready.robot
index 33ad3cbc8029fb37563e339ae575b18f686b3603..8ba25f69d9fe72c00a705c4eda1be6596f2a8eab 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/cluster_ready.robot
+++ b/csit/suites/controller/Clustering_Datastore/cluster_ready.robot
@@ -11,9 +11,11 @@ Documentation     This test waits until cluster appears to be ready.
 ...               Intended use is at a start of testplan, so that suites can assume cluster works.
 ...
 ...               This suite expects car, people and car-people modules to have separate Shards.
-Suite Setup       ClusterManagement.ClusterManagement_Setup
+Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Variables ***
 ${CLUSTER_BOOTUP_SYNC_TIMEOUT}    180s

diff --git a/csit/suites/controller/Clustering_Datastore/entity_isolate.robot b/csit/suites/controller/Clustering_Datastore/entity_isolate.robot
index 290daae84c3cee317e59dff487c94aa89616e911..c76c025a9c460a68fddfd3c36192eb55b306b2f7 100644 (file)
--- a/csit/suites/controller/Clustering_Datastore/entity_isolate.robot
+++ b/csit/suites/controller/Clustering_Datastore/entity_isolate.robot
@@ -2,10 +2,12 @@
 Documentation     Suite for performing member isolation and rejoin, we do with entity-ownership leader.
 Suite Setup       Setup
 Suite Teardown    Teardown
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Default Tags      clustering    carpeople    critical
 Library           Collections
 Resource          ${CURDIR}/../../../libraries/CarPeople.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Variables         ${CURDIR}/../../../variables/Variables.py
 
@@ -41,7 +43,7 @@ Check All Shards After Rejoin
 *** Keywords ***
 Setup
     [Documentation]    Initialize resources, memorize car shard leader and followers.
-    ClusterManagement.ClusterManagement_Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
     CarPeople.Set_Variables_For_Shard    shard_name=entity-ownership    shard_type=operational
 
 Teardown