From 7a967664b60a91b60a719476413f6086eeb78a20 Mon Sep 17 00:00:00 2001 From: Tomas Markovic Date: Fri, 26 Jan 2018 13:40:55 +0100 Subject: [PATCH] Cleanup bgp-ingest tests Remove Boron, Beryllium compability. Remove netconf test cases, as it is no longer used. Change-Id: I02e980377541ddd37483f2282b738d3d3403f8d3 Signed-off-by: Tomas Markovic --- .../bgpingest/bgp_app_peer_prefixcount.robot | 15 ++++----- .../bgpingest/manypeers_changecount.robot | 28 +---------------- .../bgpingest/manypeers_peercount.robot | 4 +-- .../bgpingest/manypeers_prefixcount.robot | 4 +-- .../bgpingest/singlepeer_changecount.robot | 28 +---------------- .../bgpingest/singlepeer_prefixcount.robot | 4 +-- csit/testplans/bgpcep-bgp-ingest-mixed.txt | 1 - csit/testplans/bgpcep-bgp-ingest.txt | 1 - .../bgp_application_peer.beryllium/data.xml | 14 --------- .../location.uri | 1 - .../bgp_application_peer.boron/data.xml | 14 --------- .../bgp_application_peer.boron/location.uri | 1 - .../bgpuser/bgp_peer.beryllium/data.xml | 28 ----------------- .../bgpuser/bgp_peer.beryllium/location.uri | 1 - .../variables/bgpuser/bgp_peer.boron/data.xml | 28 ----------------- .../bgpuser/bgp_peer.boron/location.uri | 1 - .../bgpuser/change_counter.beryllium/data.xml | 9 ------ .../change_counter.beryllium/location.uri | 1 - .../bgpuser/change_counter.boron/data.xml | 10 ------ .../bgpuser/change_counter.boron/location.uri | 1 - .../bgpuser/ebgp_peers.beryllium/data.xml | 31 ------------------- .../bgpuser/ebgp_peers.beryllium/location.uri | 1 - .../bgpuser/ebgp_peers.boron/data.xml | 31 ------------------- .../bgpuser/ebgp_peers.boron/location.uri | 1 - .../bgpuser/ibgp_peers.beryllium/data.xml | 29 ----------------- .../bgpuser/ibgp_peers.beryllium/location.uri | 1 - .../bgpuser/ibgp_peers.boron/data.xml | 29 ----------------- .../bgpuser/ibgp_peers.boron/location.uri | 1 - 28 files changed, 11 insertions(+), 307 deletions(-) delete mode 100644 csit/variables/bgpuser/bgp_application_peer.beryllium/data.xml delete mode 100644 csit/variables/bgpuser/bgp_application_peer.beryllium/location.uri delete mode 100644 csit/variables/bgpuser/bgp_application_peer.boron/data.xml delete mode 100644 csit/variables/bgpuser/bgp_application_peer.boron/location.uri delete mode 100644 csit/variables/bgpuser/bgp_peer.beryllium/data.xml delete mode 100644 csit/variables/bgpuser/bgp_peer.beryllium/location.uri delete mode 100644 csit/variables/bgpuser/bgp_peer.boron/data.xml delete mode 100644 csit/variables/bgpuser/bgp_peer.boron/location.uri delete mode 100644 csit/variables/bgpuser/change_counter.beryllium/data.xml delete mode 100644 csit/variables/bgpuser/change_counter.beryllium/location.uri delete mode 100644 csit/variables/bgpuser/change_counter.boron/data.xml delete mode 100644 csit/variables/bgpuser/change_counter.boron/location.uri delete mode 100644 csit/variables/bgpuser/ebgp_peers.beryllium/data.xml delete mode 100644 csit/variables/bgpuser/ebgp_peers.beryllium/location.uri delete mode 100644 csit/variables/bgpuser/ebgp_peers.boron/data.xml delete mode 100644 csit/variables/bgpuser/ebgp_peers.boron/location.uri delete mode 100644 csit/variables/bgpuser/ibgp_peers.beryllium/data.xml delete mode 100644 csit/variables/bgpuser/ibgp_peers.beryllium/location.uri delete mode 100644 csit/variables/bgpuser/ibgp_peers.boron/data.xml delete mode 100644 csit/variables/bgpuser/ibgp_peers.boron/location.uri diff --git a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot index 80cc0e3d0e..2c73ddd1f2 100644 --- a/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot @@ -23,9 +23,6 @@ Documentation BGP performance of ingesting from 1 BGP application peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#application-peer-configuration ... -... The bgp peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. -... ... Reported bugs: ... Bug 4689 - Not a reasonable duration of 1M prefix introduction from BGP application peer via restconf ... Bug 4791 - BGPSessionImpl: Failed to send message Update logged even all UPDATE mesages received by iBGP peer @@ -36,7 +33,7 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Force Tags critical Library SSHLibrary timeout=10s Library RequestsLibrary -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPcliKeywords.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/FailFast.robot @@ -63,10 +60,10 @@ ${ODL_BGP_LOG_LEVEL} DEFAULT ${BGP_PEER_COMMAND} python play.py --amount 0 --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --${BGP_PEER_LOG_LEVEL} ${BGP_PEER_OPTIONS} &>bgp_peer.log ${BGP_APP_PEER_ID} 10.0.0.10 -${BGP_APP_PEER_INITIAL_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command post --count ${PREFILL} --prefix 8.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} --stream=${ODL_STREAM} -${BGP_APP_PEER_PUT_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command put --count ${PREFILL} --prefix 8.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} --stream=${ODL_STREAM} -${BGP_APP_PEER_DELETE_ALL_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command delete-all --${BGP_APP_PEER_LOG_LEVEL} --stream=${ODL_STREAM} -${BGP_APP_PEER_GET_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command get --${BGP_APP_PEER_LOG_LEVEL} --stream=${ODL_STREAM} +${BGP_APP_PEER_INITIAL_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command post --count ${PREFILL} --prefix 8.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} +${BGP_APP_PEER_PUT_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command put --count ${PREFILL} --prefix 8.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} +${BGP_APP_PEER_DELETE_ALL_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command delete-all --${BGP_APP_PEER_LOG_LEVEL} +${BGP_APP_PEER_GET_COMMAND} python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command get --${BGP_APP_PEER_LOG_LEVEL} ${BGP_APP_PEER_OPTIONS} &>bgp_app_peer.log ${TEST_DURATION_MULTIPLIER} 30 ${last_prefix_count} -1 @@ -116,7 +113,7 @@ Check_Bgp_Peer_Updates_For_Prefilled_Routes BGP_Application_Peer_Introduce_Single_Routes [Documentation] Start BGP application peer tool and introduce routes. SSHLibrary.Switch Connection bgp_app_peer_console - Start_Console_Tool python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command add --count ${remaining_prefixes} --prefix 12.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} --stream=${ODL_STREAM} ${script_uri_opt} ${BGP_APP_PEER_OPTIONS} + Start_Console_Tool python bgp_app_peer.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} --command add --count ${remaining_prefixes} --prefix 12.0.0.0 --prefixlen 28 --${BGP_APP_PEER_LOG_LEVEL} ${script_uri_opt} ${BGP_APP_PEER_OPTIONS} Wait_Until_Console_Tool_Finish ${bgp_filling_timeout} Store_File_To_Workspace bgp_app_peer.log bgp_app_peer_singles.log diff --git a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot index 4b679ae72d..a0db657358 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot @@ -41,8 +41,6 @@ Documentation BGP performance of ingesting from many iBGP peers, data change ... Brief description how to configure BGP peer can be found here: ... https://wiki.opendaylight.org/view/BGP_LS_PCEP:User_Guide#BGP_Peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering -... The peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. ... ... TODO: Is there a need for version of this suite where ODL connects to pers? ... Note that configuring ODL is slow, which may affect measured performance singificantly. @@ -54,10 +52,9 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/ChangeCounter.robot -Resource ${CURDIR}/../../../libraries/CompareStream.robot Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot Resource ${CURDIR}/../../../libraries/PrefixCounting.robot @@ -84,8 +81,6 @@ ${KARAF_PROTOCOL_LOG_LEVEL} ${KARAF_BGPCEP_LOG_LEVEL} ${MULTIPLICITY} 2 # May be increased after Bug 4488 is fixed. ${MULTIPLICITY_CHANGE_COUNT} ${MULTIPLICITY} ${MULTIPLICITY_CHANGE_COUNT_MANY} ${MULTIPLICITY_CHANGE_COUNT} -${NETCONF_DEV_FOLDER} ${CURDIR}/../../../variables/netconf/device/full-uri-device -${NETCONF_MOUNT_FOLDER} ${CURDIR}/../../../variables/netconf/device/full-uri-mount ${REPETITIONS} 1 # Should be increased depending on multiplicity. ${REPETITIONS_CHANGE_COUNT} ${REPETITIONS} ${REPETITIONS_CHANGE_COUNT_MANY} ${REPETITIONS_CHANGE_COUNT} @@ -105,14 +100,6 @@ Check_For_Empty_Ipv4_Topology_Before_Talking # TODO: Choose which tags to assign and make sure they are assigned correctly. BuiltIn.Wait_Until_Keyword_Succeeds 120s 1s PrefixCounting.Check_Ipv4_Topology_Is_Empty -Configure_Netconf_Device - [Documentation] Configures netconf device if ${USE_NETCONF_CONNECTOR} is False. - BuiltIn.Run_Keyword_If """${USE_NETCONF_CONNECTOR}""" == """True""" BuiltIn.Pass_Execution No need to configure netconf device because netconf connector is present. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No need to configure netconf device because data change counter is not configured via it. - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${ODL_SYSTEM_IP} DEVICE_USER=admin DEVICE_PASSWORD=admin - TemplatedRequests.Put_As_Xml_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} - BuiltIn.Wait_Until_Keyword_Succeeds 10x 3s TemplatedRequests.Get_As_Xml_Templated ${NETCONF_MOUNT_FOLDER} mapping=${mapping} - Reconfigure_ODL_To_Accept_Connections [Documentation] Configure BGP peer modules with initiate-connection set to false. : FOR ${index} IN RANGE 1 ${MULTIPLICITY_CHANGE_COUNT_MANY}+1 @@ -124,11 +111,6 @@ Reconfigure_ODL_To_Accept_Connections \ TemplatedRequests.Put_As_Xml_Templated ${BGP_VARIABLES_FOLDER}${/}bgp_peer mapping=${mapping} # FIXME: Add testcase to change bgpcep and protocol log levels, when a Keyword that does it without messing with current connection is ready. -Wait_For_Data_Change_Counter_Ready - [Documentation] Data change counter might have been slower to start than ipv4 topology, wait for it. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No data change counter is present yet. - BuiltIn.Wait_Until_Keyword_Succeeds 180s 1s ChangeCounter.Get_Change_Count - Reconfigure_Data_Change_Counter [Documentation] Configure data change counter to count transactions in example-ipv4-topology instead of example-linkstate-topology. ChangeCounter.Reconfigure_Topology_Name example-ipv4-topology @@ -196,14 +178,6 @@ Delete_Bgp_Peer_Configuration \ &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${peer_name} IP=${peer_ip} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} \ TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER}${/}bgp_peer mapping=${mapping} -Remove_Netconf_Device - [Documentation] Removes netconf device if ${USE_NETCONF_CONNECTOR} is False. - [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - BuiltIn.Run_Keyword_If """${USE_NETCONF_CONNECTOR}""" == """True""" BuiltIn.Pass_Execution No need to remove netconf device because netconf connector is present. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No need to remove netconf device because none was used. - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${ODL_SYSTEM_IP} DEVICE_USER=admin DEVICE_PASSWORD=admin - TemplatedRequests.Delete_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} - *** Keywords *** Setup_Everything [Documentation] Setup imported resources, SSH-login to ODL system, diff --git a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot index 088661921a..07f5757293 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot @@ -20,8 +20,6 @@ Documentation BGP performance of ingesting from many iBGP rrc peers, iBGPs r ... Brief description how to configure BGP peer can be found here: ... https://wiki.opendaylight.org/view/BGP_LS_PCEP:User_Guide#BGP_Peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering -... The peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. Suite Setup Setup_Everything Suite Teardown Teardown_Everything Test Setup SetupUtils.Setup_Test_With_Logging_And_Fast_Failing @@ -29,7 +27,7 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot diff --git a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot index 51d89b551d..97d0b6034b 100644 --- a/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot @@ -38,8 +38,6 @@ Documentation BGP performance of ingesting from many iBGP peers, data change ... Brief description how to configure BGP peer can be found here: ... https://wiki.opendaylight.org/view/BGP_LS_PCEP:User_Guide#BGP_Peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering -... The peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. ... ... TODO: Is there a need for version of this suite where ODL connects to pers? ... Note that configuring ODL is slow, which may affect measured performance singificantly. @@ -51,7 +49,7 @@ Test Teardown SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_T Library DateTime Library RequestsLibrary Library SSHLibrary timeout=10s -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot index 24210abfcb..d194761428 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot @@ -25,8 +25,6 @@ Documentation BGP performance of ingesting from 1 iBGP peer, data change cou ... Brief description how to configure BGP peer can be found here: ... https://wiki.opendaylight.org/view/BGP_LS_PCEP:User_Guide#BGP_Peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering -... The peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. ... ... TODO: Currently, if a bug causes zero increase of data changes, ... affected test cases will wait for max time. Reconsider. @@ -41,10 +39,9 @@ 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 -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/ChangeCounter.robot -Resource ${CURDIR}/../../../libraries/CompareStream.robot Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot Resource ${CURDIR}/../../../libraries/PrefixCounting.robot @@ -84,8 +81,6 @@ ${DEVICE_NAME} controller-config ${BGP_PEER_NAME} example-bgp-peer # TODO: Option names can be better. ${last_change_count_single} -1 -${NETCONF_DEV_FOLDER} ${CURDIR}/../../../variables/netconf/device/full-uri-device -${NETCONF_MOUNT_FOLDER} ${CURDIR}/../../../variables/netconf/device/full-uri-mount *** Test Cases *** Check_For_Empty_Ipv4_Topology_Before_Talking @@ -94,25 +89,12 @@ Check_For_Empty_Ipv4_Topology_Before_Talking # TODO: Choose which tags to assign and make sure they are assigned correctly. BuiltIn.Wait_Until_Keyword_Succeeds 120s 1s PrefixCounting.Check_Ipv4_Topology_Is_Empty -Configure_Netconf_Device - [Documentation] Configures netconf device if ${USE_NETCONF_CONNECTOR} is False. - BuiltIn.Run_Keyword_If """${USE_NETCONF_CONNECTOR}""" == """True""" BuiltIn.Pass_Execution No need to configure netconf device because netconf connector is present. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No need to configure netconf device because data change counter is not configured via it. - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${ODL_SYSTEM_IP} DEVICE_USER=admin DEVICE_PASSWORD=admin - TemplatedRequests.Put_As_Xml_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} - BuiltIn.Wait_Until_Keyword_Succeeds 10x 3s TemplatedRequests.Get_As_Xml_Templated ${NETCONF_MOUNT_FOLDER} mapping=${mapping} - Reconfigure_ODL_To_Accept_Connection [Documentation] Configure BGP peer module with initiate-connection set to false. &{mapping} Create Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME_CHANGE_COUNT_SINGLE} PEER_PORT=${BGP_TOOL_PORT} ... 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} -Wait_For_Data_Change_Counter_Ready - [Documentation] Data change counter might have been slower to start than ipv4 topology, wait for it. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No data change counter is present yet. - BuiltIn.Wait_Until_Keyword_Succeeds 180s 1s ChangeCounter.Get_Change_Count - Reconfigure_Data_Change_Counter [Documentation] Configure data change counter to count transactions in example-ipv4-topology instead of example-linkstate-topology. ChangeCounter.Reconfigure_Topology_Name example-ipv4-topology @@ -235,14 +217,6 @@ Delete_Bgp_Peer_Configuration &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER}${/}bgp_peer mapping=${mapping} -Remove_Netconf_Device - [Documentation] Removes netconf device if ${USE_NETCONF_CONNECTOR} is False. - [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - BuiltIn.Run_Keyword_If """${USE_NETCONF_CONNECTOR}""" == """True""" BuiltIn.Pass_Execution No need to remove netconf device because netconf connector is present. - CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution No need to remove netconf device because none was used. - &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${ODL_SYSTEM_IP} DEVICE_USER=admin DEVICE_PASSWORD=admin - TemplatedRequests.Delete_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} - *** Keywords *** Setup_Everything [Documentation] Setup imported resources, SSH-login to tools system, diff --git a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot index 92e333f15d..0acf74652a 100644 --- a/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot +++ b/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot @@ -19,8 +19,6 @@ Documentation BGP performance of ingesting from 1 iBGP peer, data change cou ... Brief description how to configure BGP peer can be found here: ... https://wiki.opendaylight.org/view/BGP_LS_PCEP:User_Guide#BGP_Peer ... http://docs.opendaylight.org/en/stable-boron/user-guide/bgp-user-guide.html#bgp-peering -... The peer configuration depends on the ${ODL_STREAM}. For "boron" and older streams it uses netconf connector and -... for carbon and further it configures peer via openconfig. ... ... TODO: Currently, if a bug causes prefix count to remain at zero, ... affected test cases will wait for max time. Reconsider. @@ -34,7 +32,7 @@ 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 -Variables ${CURDIR}/../../../variables/Variables.py +Resource ${CURDIR}/../../../variables/Variables.robot Resource ${CURDIR}/../../../libraries/BGPSpeaker.robot Resource ${CURDIR}/../../../libraries/FailFast.robot Resource ${CURDIR}/../../../libraries/KillPythonTool.robot diff --git a/csit/testplans/bgpcep-bgp-ingest-mixed.txt b/csit/testplans/bgpcep-bgp-ingest-mixed.txt index e9ceb48cb2..faabd7b526 100644 --- a/csit/testplans/bgpcep-bgp-ingest-mixed.txt +++ b/csit/testplans/bgpcep-bgp-ingest-mixed.txt @@ -5,6 +5,5 @@ # and is available at http://www.eclipse.org/legal/epl-v10.html # Place the suites in run order: -integration/test/csit/suites/netconf/ready integration/test/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot integration/test/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot diff --git a/csit/testplans/bgpcep-bgp-ingest.txt b/csit/testplans/bgpcep-bgp-ingest.txt index f73136e944..c32804c0da 100644 --- a/csit/testplans/bgpcep-bgp-ingest.txt +++ b/csit/testplans/bgpcep-bgp-ingest.txt @@ -5,7 +5,6 @@ # and is available at http://www.eclipse.org/legal/epl-v10.html # Place the suites in run order: -integration/test/csit/suites/netconf/ready/netconfready.robot integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot integration/test/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot integration/test/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot diff --git a/csit/variables/bgpuser/bgp_application_peer.beryllium/data.xml b/csit/variables/bgpuser/bgp_application_peer.beryllium/data.xml deleted file mode 100644 index 5cc23e3bc0..0000000000 --- a/csit/variables/bgpuser/bgp_application_peer.beryllium/data.xml +++ /dev/null @@ -1,14 +0,0 @@ - - x:bgp-application-peer - example-bgp-peer-app - $IP - - x:rib-instance - example-bgp-rib - - example-app-rib - - x:dom-async-data-broker - pingpong-broker - - diff --git a/csit/variables/bgpuser/bgp_application_peer.beryllium/location.uri b/csit/variables/bgpuser/bgp_application_peer.beryllium/location.uri deleted file mode 100644 index 9797aba4f5..0000000000 --- a/csit/variables/bgpuser/bgp_application_peer.beryllium/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-application-peer/$NAME diff --git a/csit/variables/bgpuser/bgp_application_peer.boron/data.xml b/csit/variables/bgpuser/bgp_application_peer.boron/data.xml deleted file mode 100644 index 5cc23e3bc0..0000000000 --- a/csit/variables/bgpuser/bgp_application_peer.boron/data.xml +++ /dev/null @@ -1,14 +0,0 @@ - - x:bgp-application-peer - example-bgp-peer-app - $IP - - x:rib-instance - example-bgp-rib - - example-app-rib - - x:dom-async-data-broker - pingpong-broker - - diff --git a/csit/variables/bgpuser/bgp_application_peer.boron/location.uri b/csit/variables/bgpuser/bgp_application_peer.boron/location.uri deleted file mode 100644 index 9797aba4f5..0000000000 --- a/csit/variables/bgpuser/bgp_application_peer.boron/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-application-peer/$NAME diff --git a/csit/variables/bgpuser/bgp_peer.beryllium/data.xml b/csit/variables/bgpuser/bgp_peer.beryllium/data.xml deleted file mode 100644 index 234b39a24f..0000000000 --- a/csit/variables/bgpuser/bgp_peer.beryllium/data.xml +++ /dev/null @@ -1,28 +0,0 @@ - - prefix:bgp-peer - $BGP_NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $RIB_INSTANCE_NAME - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - diff --git a/csit/variables/bgpuser/bgp_peer.beryllium/location.uri b/csit/variables/bgpuser/bgp_peer.beryllium/location.uri deleted file mode 100644 index b88d6eb86c..0000000000 --- a/csit/variables/bgpuser/bgp_peer.beryllium/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$BGP_NAME diff --git a/csit/variables/bgpuser/bgp_peer.boron/data.xml b/csit/variables/bgpuser/bgp_peer.boron/data.xml deleted file mode 100644 index 234b39a24f..0000000000 --- a/csit/variables/bgpuser/bgp_peer.boron/data.xml +++ /dev/null @@ -1,28 +0,0 @@ - - prefix:bgp-peer - $BGP_NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $RIB_INSTANCE_NAME - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - diff --git a/csit/variables/bgpuser/bgp_peer.boron/location.uri b/csit/variables/bgpuser/bgp_peer.boron/location.uri deleted file mode 100644 index b88d6eb86c..0000000000 --- a/csit/variables/bgpuser/bgp_peer.boron/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$BGP_NAME diff --git a/csit/variables/bgpuser/change_counter.beryllium/data.xml b/csit/variables/bgpuser/change_counter.beryllium/data.xml deleted file mode 100644 index 1a9310070b..0000000000 --- a/csit/variables/bgpuser/change_counter.beryllium/data.xml +++ /dev/null @@ -1,9 +0,0 @@ - - prefix:data-change-counter-impl - data-change-counter-singleton - - binding:binding-async-data-broker - pingpong-binding-data-broker - - $TOPOLOGY_NAME - diff --git a/csit/variables/bgpuser/change_counter.beryllium/location.uri b/csit/variables/bgpuser/change_counter.beryllium/location.uri deleted file mode 100644 index 624e0c8526..0000000000 --- a/csit/variables/bgpuser/change_counter.beryllium/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-data-change-counter-cfg:data-change-counter-impl/data-change-counter-singleton diff --git a/csit/variables/bgpuser/change_counter.boron/data.xml b/csit/variables/bgpuser/change_counter.boron/data.xml deleted file mode 100644 index 3bfead4216..0000000000 --- a/csit/variables/bgpuser/change_counter.boron/data.xml +++ /dev/null @@ -1,10 +0,0 @@ - - prefix:data-change-counter-impl - data-change-counter - data-change-counter - - binding:binding-async-data-broker - pingpong-binding-data-broker - - $TOPOLOGY_NAME - diff --git a/csit/variables/bgpuser/change_counter.boron/location.uri b/csit/variables/bgpuser/change_counter.boron/location.uri deleted file mode 100644 index fa7f634edf..0000000000 --- a/csit/variables/bgpuser/change_counter.boron/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-data-change-counter-cfg:data-change-counter-impl/data-change-counter diff --git a/csit/variables/bgpuser/ebgp_peers.beryllium/data.xml b/csit/variables/bgpuser/ebgp_peers.beryllium/data.xml deleted file mode 100644 index 74c0028c07..0000000000 --- a/csit/variables/bgpuser/ebgp_peers.beryllium/data.xml +++ /dev/null @@ -1,31 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $PEER_ROLE - $AS_NUMBER - $HOLDTIME - $INITIATE - - prefix:rib-instance - example-bgp-rib - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - - diff --git a/csit/variables/bgpuser/ebgp_peers.beryllium/location.uri b/csit/variables/bgpuser/ebgp_peers.beryllium/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- a/csit/variables/bgpuser/ebgp_peers.beryllium/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME diff --git a/csit/variables/bgpuser/ebgp_peers.boron/data.xml b/csit/variables/bgpuser/ebgp_peers.boron/data.xml deleted file mode 100644 index 74c0028c07..0000000000 --- a/csit/variables/bgpuser/ebgp_peers.boron/data.xml +++ /dev/null @@ -1,31 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $PEER_ROLE - $AS_NUMBER - $HOLDTIME - $INITIATE - - prefix:rib-instance - example-bgp-rib - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - - diff --git a/csit/variables/bgpuser/ebgp_peers.boron/location.uri b/csit/variables/bgpuser/ebgp_peers.boron/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- a/csit/variables/bgpuser/ebgp_peers.boron/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME diff --git a/csit/variables/bgpuser/ibgp_peers.beryllium/data.xml b/csit/variables/bgpuser/ibgp_peers.beryllium/data.xml deleted file mode 100644 index a7e01bc0aa..0000000000 --- a/csit/variables/bgpuser/ibgp_peers.beryllium/data.xml +++ /dev/null @@ -1,29 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $PEER_ROLE - $HOLDTIME - $INITIATE - - prefix:rib-instance - example-bgp-rib - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - diff --git a/csit/variables/bgpuser/ibgp_peers.beryllium/location.uri b/csit/variables/bgpuser/ibgp_peers.beryllium/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- a/csit/variables/bgpuser/ibgp_peers.beryllium/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME diff --git a/csit/variables/bgpuser/ibgp_peers.boron/data.xml b/csit/variables/bgpuser/ibgp_peers.boron/data.xml deleted file mode 100644 index a7e01bc0aa..0000000000 --- a/csit/variables/bgpuser/ibgp_peers.boron/data.xml +++ /dev/null @@ -1,29 +0,0 @@ - - prefix:bgp-peer - $NAME - $IP - $PEER_PORT - $PEER_ROLE - $HOLDTIME - $INITIATE - - prefix:rib-instance - example-bgp-rib - - - prefix:bgp-peer-registry - global-bgp-peer-registry - - - prefix:bgp-table-type - ipv4-unicast - - - prefix:bgp-table-type - ipv6-unicast - - - prefix:bgp-table-type - linkstate - - diff --git a/csit/variables/bgpuser/ibgp_peers.boron/location.uri b/csit/variables/bgpuser/ibgp_peers.boron/location.uri deleted file mode 100644 index b367efd4e2..0000000000 --- a/csit/variables/bgpuser/ibgp_peers.boron/location.uri +++ /dev/null @@ -1 +0,0 @@ -restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$NAME -- 2.36.6