From 2f53859f24e23f75984b295c364fa578bd7eca49 Mon Sep 17 00:00:00 2001 From: Alon Kochba Date: Tue, 27 Dec 2016 14:32:24 +0200 Subject: [PATCH] Fix karaf log grep at test teardown Refactor karaf logs grep at teardown of test cases. Currently the first ODL is always grepped twice, remove the duplicate logic and refactor into its own function. Change-Id: I62b5b82ffb180874480a6d5a041d94534273c7cd Signed-off-by: Alon Kochba --- csit/libraries/OpenStackOperations.robot | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 14cbd76eee..3ade496689 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -498,6 +498,13 @@ Get Karaf Log Types From Test Start \ Get Karaf Log Type From Test Start ${ip} ${test_name} ${type} ${user} ${password} \ ... ${prompt} ${log_file} +Get Karaf Log Events From Test Start + [Arguments] ${test_name} ${user}=${ODL_SYSTEM_USER} ${password}=${ODL_SYSTEM_PASSWORD} ${prompt}=${ODL_SYSTEM_PROMPT} + ${log_types} = Create List ERROR WARN Exception + Run Keyword If 0 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_IP} ${test_name} ${log_types} + Run Keyword If 1 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_2_IP} ${test_name} ${log_types} + Run Keyword If 2 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_3_IP} ${test_name} ${log_types} + Get ControlNode Connection ${control_conn_id}= SSHLibrary.Open Connection ${OS_CONTROL_NODE_IP} prompt=${DEFAULT_LINUX_PROMPT_STRICT} Utils.Flexible SSH Login ${OS_USER} ${DEVSTACK_SYSTEM_PASSWORD} @@ -515,11 +522,7 @@ Get Test Teardown Debugs [Arguments] ${test_name}=${TEST_NAME} Get OvsDebugInfo Get Model Dump ${HA_PROXY_IP} - ${log_types} = Create List ERROR WARN Exception - Get Karaf Log Types From Test Start ${ODL_SYSTEM_IP} ${test_name} ${log_types} - Run Keyword If 0 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_IP} ${test_name} ${log_types} - Run Keyword If 1 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_2_IP} ${test_name} ${log_types} - Run Keyword If 2 < ${NUM_ODL_SYSTEM} Get Karaf Log Types From Test Start ${ODL_SYSTEM_3_IP} ${test_name} ${log_types} + Get Karaf Log Events From Test Start ${test_name} Show Debugs [Arguments] @{vm_indices} -- 2.36.6