From 9c8a52fde063a6b2825b04eb34d12ba40aa2be59 Mon Sep 17 00:00:00 2001 From: Tomas Markovic Date: Tue, 19 Jun 2018 07:54:48 +0200 Subject: [PATCH] Remove karaf log set Since addition of CONTROLLERDEBUGMAP, this is not very necessary. And these Test cases do fail for some reason sometimes. Change-Id: I628f99f5a9044b4ef85eacdb456d3e2002cedc7e Signed-off-by: Tomas Markovic --- .../bgpcep/bgpingest/singlepeer_changecount.robot | 13 ------------- .../bgpcep/bgpingest/singlepeer_prefixcount.robot | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot index 29bad085de..bd74622e07 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot @@ -42,7 +42,6 @@ Library RequestsLibrary Resource ../../../libraries/BGPSpeaker.robot Resource ../../../libraries/ChangeCounter.robot Resource ../../../libraries/FailFast.robot -Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/KillPythonTool.robot Resource ../../../libraries/PrefixCounting.robot Resource ../../../libraries/SetupUtils.robot @@ -64,9 +63,6 @@ ${HOLDTIME} 180 ${HOLDTIME_CHANGE_COUNT} ${HOLDTIME} ${HOLDTIME_CHANGE_COUNT_SINGLE} ${HOLDTIME_CHANGE_COUNT} ${INSERT} 1 -${KARAF_LOG_LEVEL} INFO -${KARAF_BGPCEP_LOG_LEVEL} ${KARAF_LOG_LEVEL} -${KARAF_PROTOCOL_LOG_LEVEL} ${KARAF_BGPCEP_LOG_LEVEL} ${PREFILL} 0 ${REPETITIONS} 1 ${REPETITIONS_CHANGE_COUNT} ${REPETITIONS} @@ -105,10 +101,6 @@ Verify_Data_Change_Counter_Ready [Documentation] Data change counter might have been slower to start than ipv4 topology, wait for it. BuiltIn.Wait_Until_Keyword_Succeeds 5s 1s ChangeCounter.Get_Change_Count -Change_Karaf_Logging_Levels - [Documentation] We may want to set more verbose logging here after configuration is done. - KarafKeywords.Set_Bgpcep_Log_Levels bgpcep_level=${KARAF_BGPCEP_LOG_LEVEL} protocol_level=${KARAF_PROTOCOL_LOG_LEVEL} - Start_Talking_BGP_Speaker [Documentation] Start Python speaker to connect to ODL. Store_Change_Count @@ -204,10 +196,6 @@ Check_For_Empty_Ipv4_Topology_After_Listening [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing PrefixCounting.Check_Ipv4_Topology_Is_Empty -Restore_Karaf_Logging_Levels - [Documentation] Set logging on bgpcep and protocol to the global value. - KarafKeywords.Set_Bgpcep_Log_Levels bgpcep_level=${KARAF_LOG_LEVEL} protocol_level=${KARAF_LOG_LEVEL} - Restore_Data_Change_Counter_Configuration [Documentation] Configure data change counter back to count transactions affecting example-linkstate-topology. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing @@ -242,7 +230,6 @@ Setup_Everything ${timeout} = BuiltIn.Evaluate ${TEST_DURATION_MULTIPLIER_CHANGE_COUNT_SINGLE} * (${COUNT_CHANGE_COUNT_SINGLE} * 9.0 / 10000 + 20) Builtin.Set_Suite_Variable ${bgp_filling_timeout} ${timeout} Builtin.Set_Suite_Variable ${bgp_emptying_timeout} ${bgp_filling_timeout*3.0/4} - KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set ${KARAF_LOG_LEVEL} Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot index 06647b29a8..3db541ab3a 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot @@ -34,7 +34,6 @@ Library SSHLibrary timeout=10s Library RequestsLibrary Resource ../../../libraries/BGPSpeaker.robot Resource ../../../libraries/FailFast.robot -Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/KillPythonTool.robot Resource ../../../libraries/PrefixCounting.robot Resource ../../../libraries/SetupUtils.robot @@ -56,9 +55,6 @@ ${HOLDTIME} 180 ${HOLDTIME_PREFIX_COUNT} ${HOLDTIME} ${HOLDTIME_PREFIX_COUNT_SINGLE} ${HOLDTIME_PREFIX_COUNT} ${INSERT} 1 -${KARAF_LOG_LEVEL} INFO -${KARAF_BGPCEP_LOG_LEVEL} ${KARAF_LOG_LEVEL} -${KARAF_PROTOCOL_LOG_LEVEL} ${KARAF_BGPCEP_LOG_LEVEL} ${PREFILL} 0 ${REPETITIONS} 1 ${REPETITIONS_PREFIX_COUNT} ${REPETITIONS} @@ -88,10 +84,6 @@ Reconfigure_ODL_To_Accept_Connection ... INITIATE=false BGP_RIB=${RIB_INSTANCE} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} RIB_INSTANCE_NAME=${RIB_INSTANCE} TemplatedRequests.Put_As_Xml_Templated ${BGP_VARIABLES_FOLDER}${/}bgp_peer mapping=${mapping} -Change_Karaf_Logging_Levels - [Documentation] We may want to set more verbose logging here after configuration is done. - KarafKeywords.Set_Bgpcep_Log_Levels bgpcep_level=${KARAF_BGPCEP_LOG_LEVEL} protocol_level=${KARAF_PROTOCOL_LOG_LEVEL} - Start_Talking_BGP_Speaker [Documentation] Start Python speaker to connect to ODL. # Myport value is needed for checking whether connection at precise port was established. @@ -186,10 +178,6 @@ Check_For_Empty_Ipv4_Topology_After_Listening [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing PrefixCounting.Check_Ipv4_Topology_Is_Empty -Restore_Karaf_Logging_Levels - [Documentation] Set logging on bgpcep and protocol to the global value. - KarafKeywords.Set_Bgpcep_Log_Levels bgpcep_level=${KARAF_LOG_LEVEL} protocol_level=${KARAF_LOG_LEVEL} - Delete_Bgp_Peer_Configuration [Documentation] Revert the BGP configuration to the original state: without any configured peers. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing @@ -217,7 +205,6 @@ Setup_Everything # TODO: Replace 20 with some formula from period and repetitions. ${timeout} = BuiltIn.Evaluate ${TEST_DURATION_MULTIPLIER_PREFIX_COUNT_SINGLE} * (${COUNT_PREFIX_COUNT_SINGLE} * 9.0 / 10000 + 20) Builtin.Set_Suite_Variable ${bgp_filling_timeout} ${timeout} - KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set ${KARAF_LOG_LEVEL} Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. -- 2.36.6