From 891f9b6db1db148adfc70ea1f6250cf1e7899f0d Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Wed, 16 Nov 2016 15:12:20 +0100 Subject: [PATCH] updating source folder for bgp peer configuration in bgp HA suite Change-Id: I0da13d4adec3e6d1a4fb1f829cfdbb714365fa5e Signed-off-by: Peter Gubka --- .../bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot | 9 ++++----- .../bgpclustering/050_bgp_ha_karaf_isolation.robot | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot index dfe0611bb4..2dc7251335 100644 --- a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot +++ b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot @@ -26,11 +26,10 @@ Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot *** Variables *** ${BGP_VAR_FOLDER} ${CURDIR}/../../../variables/bgpclustering -${BGP_PEER_FOLDER} ${CURDIR}/../../../variables/bgpfunctional/openconfig_bgp_peer +${BGP_PEER_FOLDER} ${CURDIR}/../../../variables/bgpclustering/bgp_peer_openconf ${DEFAUTL_EXA_CFG} exa.cfg ${EXA_CMD} env exabgp.tcp.port=1790 exabgp ${PEER_CHECK_URL} /restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F -${DEVICE_NAME} peer-controller-config ${HOLDTIME} 180 ${RIB_INSTANCE} example-bgp-rib @@ -48,8 +47,8 @@ Get Example Bgp Rib Owner Reconfigure_ODL_To_Accept_Connection [Documentation] Configure BGP peer module with initiate-connection set to false. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} Create Dictionary IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} PASSIVE_MODE=true BGP_RIB=${RIB_INSTANCE} - TemplatedRequests.Post_As_Xml_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} + &{mapping} Create Dictionary IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${RIB_INSTANCE} + TemplatedRequests.Put_As_Xml_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed Start_ExaBgp_Peer @@ -96,7 +95,7 @@ Stop_ExaBgp_Peer Delete_Bgp_Peer_Configuration [Documentation] Revert the BGP configuration to the original state: without any configured peers - &{mapping} Create Dictionary BGP_RIB=${RIB_INSTANCE} + &{mapping} Create Dictionary BGP_RIB_OPENCONFIG=${RIB_INSTANCE} IP=${TOOLS_SYSTEM_IP} TemplatedRequests.Delete_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} *** Keywords *** diff --git a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot index 718b81a815..c949664e04 100644 --- a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot +++ b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_isolation.robot @@ -26,11 +26,10 @@ Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot *** Variables *** ${BGP_VAR_FOLDER} ${CURDIR}/../../../variables/bgpclustering -${BGP_PEER_FOLDER} ${CURDIR}/../../../variables/bgpfunctional/openconfig_bgp_peer +${BGP_PEER_FOLDER} ${CURDIR}/../../../variables/bgpclustering/bgp_peer_openconf ${DEFAUTL_EXA_CFG} exa.cfg ${EXA_CMD} env exabgp.tcp.port=1790 exabgp ${PEER_CHECK_URL} /restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F -${DEVICE_NAME} peer-controller-config ${HOLDTIME} 180 ${RIB_INSTANCE} example-bgp-rib @@ -48,8 +47,8 @@ Get Example Bgp Rib Owner Reconfigure_ODL_To_Accept_Connection [Documentation] Configure BGP peer module with initiate-connection set to false. [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing - &{mapping} Create Dictionary IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} PASSIVE_MODE=true BGP_RIB=${RIB_INSTANCE} - TemplatedRequests.Post_As_Xml_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} + &{mapping} Create Dictionary IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${RIB_INSTANCE} + TemplatedRequests.Put_As_Xml_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed Start_ExaBgp_Peer @@ -96,7 +95,7 @@ Stop_ExaBgp_Peer Delete_Bgp_Peer_Configuration [Documentation] Revert the BGP configuration to the original state: without any configured peers - &{mapping} Create Dictionary BGP_RIB=${RIB_INSTANCE} + &{mapping} Create Dictionary BGP_RIB_OPENCONFIG=${RIB_INSTANCE} IP=${TOOLS_SYSTEM_IP} TemplatedRequests.Delete_Templated ${BGP_PEER_FOLDER} mapping=${mapping} session=${living_session} *** Keywords *** -- 2.36.6