From 11c74ccf959c00522eb1407e46bd339ab2a661ab Mon Sep 17 00:00:00 2001 From: Tomas Markovic Date: Thu, 5 Apr 2018 12:34:38 +0200 Subject: [PATCH] Adjust prefix counts Due to addition of new features in fluorine, it is no longer possible to achieve old counts. Change-Id: I37d145ce4f65101313df286b7b0780e36fb14495 Signed-off-by: Tomas Markovic --- .../bgpingest/bgp_app_peer_prefixcount.robot | 22 ++++++++------- .../bgpingest/manypeers_changecount.robot | 27 ++++++++++--------- .../bgpingest/manypeers_peercount.robot | 27 ++++++++++--------- .../bgpingest/manypeers_prefixcount.robot | 25 +++++++++-------- .../bgpingest/singlepeer_changecount.robot | 27 ++++++++++--------- .../bgpingest/singlepeer_prefixcount.robot | 23 +++++++++------- 6 files changed, 84 insertions(+), 67 deletions(-) diff --git a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot index a4fa052d38..cad18db6d9 100644 --- a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot @@ -33,15 +33,17 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Force Tags critical Library SSHLibrary timeout=10s Library RequestsLibrary -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPcliKeywords.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/BGPcliKeywords.robot +Resource ../../../libraries/BGPSpeaker.robot +Resource ../../../libraries/FailFast.robot +Resource ../../../libraries/KarafKeywords.robot +Resource ../../../libraries/KillPythonTool.robot +Resource ../../../libraries/PrefixCounting.robot +Resource ../../../libraries/SetupUtils.robot +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ @@ -50,7 +52,7 @@ ${HOLDTIME_APP_PEER_PREFIX_COUNT} ${HOLDTIME} ${COUNT} 200000 ${PREFILL} 100000 ${COUNT_APP_PEER_PREFIX_COUNT} ${COUNT} -${CHECK_PERIOD} 1 +${CHECK_PERIOD} 10 ${CHECK_PERIOD_APP_PEER_PREFIX_COUNT} ${CHECK_PERIOD} ${REPETITIONS_APP_PEER_PREFIX_COUNT} 1 ${BGP_PEER_LOG_LEVEL} info diff --git a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot index a0db657358..7d425ee718 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot @@ -52,23 +52,25 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/ChangeCounter.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +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 +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${CHECK_PERIOD} 1 +${CHECK_PERIOD} 60 ${CHECK_PERIOD_CHANGE_COUNT} ${CHECK_PERIOD} ${CHECK_PERIOD_CHANGE_COUNT_MANY} ${CHECK_PERIOD_CHANGE_COUNT} -${COUNT} 1000000 +${COUNT} 600000 ${COUNT_CHANGE_COUNT} ${COUNT} ${COUNT_CHANGE_COUNT_MANY} ${COUNT_CHANGE_COUNT} ${FIRST_PEER_IP} 127.0.0.1 @@ -91,7 +93,7 @@ ${RIB_INSTANCE} example-bgp-rib ${PROTOCOL_OPENCONFIG} ${RIB_INSTANCE} ${DEVICE_NAME} controller-config # TODO: Option names can be better. -${last_change_count_many} -1 +${last_change_count_many} 1 *** Test Cases *** Check_For_Empty_Ipv4_Topology_Before_Talking @@ -209,6 +211,7 @@ Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. # Environment issue may have dropped the SSH connection, but we do not want Teardown to fail. BuiltIn.Run_Keyword_And_Ignore_Error KillPythonTool.Search_And_Kill_Remote_Python 'play\.py' + BuiltIn.Run_Keyword_And_Ignore_Error Utils.Get_Sysstat_Statistics RequestsLibrary.Delete_All_Sessions SSHLibrary.Close_All_Connections diff --git a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot index 07f5757293..072f9caae3 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot @@ -27,21 +27,23 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/BGPSpeaker.robot +Resource ../../../libraries/FailFast.robot +Resource ../../../libraries/KarafKeywords.robot +Resource ../../../libraries/KillPythonTool.robot +Resource ../../../libraries/PrefixCounting.robot +Resource ../../../libraries/SetupUtils.robot +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info ${BGP_PEERS_LOG_FILE_NAME} bgp_peer.log ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${CHECK_PERIOD_PREFIX_COUNT_MANY_RRC} 10 -${COUNT} 100000 # With AdjRibsOut, the amount of data present is on the same scale as 1M ingest with single peer. +${CHECK_PERIOD_PREFIX_COUNT_MANY_RRC} 60 +${COUNT} 300000 # With AdjRibsOut, the amount of data present is on the same scale as 600k ingest with single peer. ${COUNT_PREFIX_COUNT_MANY_RRC} ${COUNT} ${FIRST_PEER_IP} 127.0.0.1 ${HOLDTIME} 180 @@ -49,8 +51,8 @@ ${HOLDTIME_PREFIX_COUNT_MANY_RRC} ${HOLDTIME} ${KARAF_LOG_LEVEL} INFO ${KARAF_BGPCEP_LOG_LEVEL} ${KARAF_LOG_LEVEL} ${KARAF_PROTOCOL_LOG_LEVEL} ${KARAF_BGPCEP_LOG_LEVEL} -${MULTIPLICITY_PREFIX_COUNT_MANY_RRC} 10 -${REPETITIONS_PREFIX_COUNT_MANY_RRC} 10 +${MULTIPLICITY_PREFIX_COUNT_MANY_RRC} 2 +${REPETITIONS_PREFIX_COUNT_MANY_RRC} 2 ${TEST_DURATION_MULTIPLIER} 1 ${TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY_RRC} ${TEST_DURATION_MULTIPLIER} ${RIB_INSTANCE} example-bgp-rib @@ -161,6 +163,7 @@ Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. # Environment issue may have dropped the SSH connection, but we do not want Teardown to fail. BuiltIn.Run_Keyword_And_Ignore_Error KillPythonTool.Search_And_Kill_Remote_Python 'play\.py' + BuiltIn.Run_Keyword_And_Ignore_Error Utils.Get_Sysstat_Statistics RequestsLibrary.Delete_All_Sessions SSHLibrary.Close_All_Connections diff --git a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot index 97d0b6034b..f0ef08de16 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot @@ -49,22 +49,24 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/BGPSpeaker.robot +Resource ../../../libraries/FailFast.robot +Resource ../../../libraries/KarafKeywords.robot +Resource ../../../libraries/KillPythonTool.robot +Resource ../../../libraries/PrefixCounting.robot +Resource ../../../libraries/SetupUtils.robot +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${CHECK_PERIOD} 1 # ${MULTIPLICITY*2} recommended for this suite, but keeping the common default. +${CHECK_PERIOD} 60 # ${MULTIPLICITY*2} recommended for this suite, but keeping the common default. ${CHECK_PERIOD_PREFIX_COUNT} ${CHECK_PERIOD} ${CHECK_PERIOD_PREFIX_COUNT_MANY} ${CHECK_PERIOD_PREFIX_COUNT} -${COUNT} 1000000 +${COUNT} 600000 ${COUNT_PREFIX_COUNT} ${COUNT} ${COUNT_PREFIX_COUNT_MANY} ${COUNT_PREFIX_COUNT} ${FIRST_PEER_IP} 127.0.0.1 @@ -74,7 +76,7 @@ ${HOLDTIME_PREFIX_COUNT_MANY} ${HOLDTIME_PREFIX_COUNT} ${KARAF_LOG_LEVEL} INFO ${KARAF_BGPCEP_LOG_LEVEL} ${KARAF_LOG_LEVEL} ${KARAF_PROTOCOL_LOG_LEVEL} ${KARAF_BGPCEP_LOG_LEVEL} -${MULTIPLICITY} 2 # May be increased after Bug 4488 is fixed. +${MULTIPLICITY} 2 # Changed in releng-builder variables ${MULTIPLICITY_PREFIX_COUNT} ${MULTIPLICITY} ${MULTIPLICITY_PREFIX_COUNT_MANY} ${MULTIPLICITY_PREFIX_COUNT} ${REPETITIONS} 1 @@ -190,5 +192,6 @@ Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. # Environment issue may have dropped the SSH connection, but we do not want Teardown to fail. BuiltIn.Run_Keyword_And_Ignore_Error KillPythonTool.Search_And_Kill_Remote_Python 'play\.py' + BuiltIn.Run_Keyword_And_Ignore_Error Utils.Get_Sysstat_Statistics RequestsLibrary.Delete_All_Sessions SSHLibrary.Close_All_Connections diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot index d194761428..29bad085de 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot @@ -39,23 +39,25 @@ Test Setup SetupUtils.Setup_Test_With_Logging_And_Fast_Failing Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed Library SSHLibrary timeout=10s Library RequestsLibrary -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/ChangeCounter.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +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 +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${CHECK_PERIOD} 1 +${CHECK_PERIOD} 60 ${CHECK_PERIOD_CHANGE_COUNT} ${CHECK_PERIOD} ${CHECK_PERIOD_CHANGE_COUNT_SINGLE} ${CHECK_PERIOD_CHANGE_COUNT} -${COUNT} 1000000 +${COUNT} 600000 ${COUNT_CHANGE_COUNT} ${COUNT} ${COUNT_CHANGE_COUNT_SINGLE} ${COUNT_CHANGE_COUNT} ${HOLDTIME} 180 @@ -80,7 +82,7 @@ ${PROTOCOL_OPENCONFIG} ${RIB_INSTANCE} ${DEVICE_NAME} controller-config ${BGP_PEER_NAME} example-bgp-peer # TODO: Option names can be better. -${last_change_count_single} -1 +${last_change_count_single} 1 *** Test Cases *** Check_For_Empty_Ipv4_Topology_Before_Talking @@ -246,6 +248,7 @@ Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. # Environment issue may have dropped the SSH connection, but we do not want Teardown to fail. BuiltIn.Run_Keyword_And_Ignore_Error KillPythonTool.Search_And_Kill_Remote_Python 'play\.py' + BuiltIn.Run_Keyword_And_Ignore_Error Utils.Get_Sysstat_Statistics RequestsLibrary.Delete_All_Sessions SSHLibrary.Close_All_Connections diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot index 0acf74652a..06647b29a8 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot @@ -32,22 +32,24 @@ Test Setup SetupUtils.Setup_Test_With_Logging_And_Fast_Failing Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed Library SSHLibrary timeout=10s Library RequestsLibrary -Resource ${CURDIR}/../../../variables/Variables.robot -Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot -Resource ${CURDIR}/../../../libraries/FailFast.robot -Resource ${CURDIR}/../../../libraries/KillPythonTool.robot -Resource ${CURDIR}/../../../libraries/PrefixCounting.robot -Resource ${CURDIR}/../../../libraries/SetupUtils.robot -Resource ${CURDIR}/../../../libraries/SSHKeywords.robot -Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/BGPSpeaker.robot +Resource ../../../libraries/FailFast.robot +Resource ../../../libraries/KarafKeywords.robot +Resource ../../../libraries/KillPythonTool.robot +Resource ../../../libraries/PrefixCounting.robot +Resource ../../../libraries/SetupUtils.robot +Resource ../../../libraries/SSHKeywords.robot +Resource ../../../libraries/TemplatedRequests.robot +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot *** Variables *** ${BGP_TOOL_LOG_LEVEL} info ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${CHECK_PERIOD} 1 +${CHECK_PERIOD} 60 ${CHECK_PERIOD_PREFIX_COUNT} ${CHECK_PERIOD} ${CHECK_PERIOD_PREFIX_COUNT_SINGLE} ${CHECK_PERIOD_PREFIX_COUNT} -${COUNT} 1000000 +${COUNT} 600000 ${COUNT_PREFIX_COUNT} ${COUNT} ${COUNT_PREFIX_COUNT_SINGLE} ${COUNT_PREFIX_COUNT} ${HOLDTIME} 180 @@ -221,6 +223,7 @@ Teardown_Everything [Documentation] Make sure Python tool was killed and tear down imported Resources. # Environment issue may have dropped the SSH connection, but we do not want Teardown to fail. BuiltIn.Run_Keyword_And_Ignore_Error KillPythonTool.Search_And_Kill_Remote_Python 'play\.py' + BuiltIn.Run_Keyword_And_Ignore_Error Utils.Get_Sysstat_Statistics RequestsLibrary.Delete_All_Sessions SSHLibrary.Close_All_Connections -- 2.36.6