From af73f2456f0419bb6982a6c47eae70efe9c4762f Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Mon, 7 Nov 2016 14:03:17 +0100 Subject: [PATCH] reworking bgp clustering (prefixcount) suite to support openconfig in carbon Change-Id: I353c14d58095fb329e9a9006b5429f7f6ab7d8ee Signed-off-by: Peter Gubka --- .../010_singlepeer_prefixcount_1route.robot | 8 ++- ...20_singlepeer_prefixcount_100kroutes.robot | 8 ++- .../030_singlepeer_prefixcount_1Mroutes.robot | 8 ++- .../bgpclustering/PrefixcountKeywords.robot | 1 + csit/testplans/bgpcep-bgpclustering.txt | 1 - .../bgp_peer.beryllium/data.json | 34 ++++++++++ .../bgpclustering/bgp_peer.beryllium/data.xml | 28 +++++++++ .../bgp_peer.beryllium/location.uri | 1 + .../bgpclustering/bgp_peer.boron/data.json | 34 ++++++++++ .../bgpclustering/bgp_peer.boron/data.xml | 28 +++++++++ .../bgpclustering/bgp_peer.boron/location.uri | 1 + .../bgpclustering/bgp_peer/data.json | 53 ++++++++-------- .../variables/bgpclustering/bgp_peer/data.xml | 62 ++++++++++--------- .../bgpclustering/bgp_peer/location.uri | 2 +- 14 files changed, 207 insertions(+), 62 deletions(-) create mode 100644 csit/variables/bgpclustering/bgp_peer.beryllium/data.json create mode 100644 csit/variables/bgpclustering/bgp_peer.beryllium/data.xml create mode 100644 csit/variables/bgpclustering/bgp_peer.beryllium/location.uri create mode 100644 csit/variables/bgpclustering/bgp_peer.boron/data.json create mode 100644 csit/variables/bgpclustering/bgp_peer.boron/data.xml create mode 100644 csit/variables/bgpclustering/bgp_peer.boron/location.uri diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot index 6b4d2840d8..5b6bfde645 100644 --- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot +++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot @@ -30,6 +30,7 @@ Resource ${CURDIR}/../../../libraries/SetupUtils.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot Resource ${CURDIR}/../../../libraries/SSHKeywords.robot Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ${CURDIR}/../../../libraries/CompareStream.robot Resource ${CURDIR}/PrefixcountKeywords.robot *** Variables *** @@ -63,6 +64,8 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3 Configure_Netconf_Device [Documentation] Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt. + # No need for configuring netconf device in carbon and above, openconfig is used + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience. : FOR ${index} IN RANGE 0 3 @@ -75,7 +78,7 @@ 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} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Put_As_Json_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -157,11 +160,12 @@ 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 &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} Delete_Netconf_Device_Configuration [Documentation] Revert the netconf configuration to the original stat [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin TemplatedRequests.Delete_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot index 1e77f8bf13..542a9a0f3b 100644 --- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot +++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot @@ -30,6 +30,7 @@ Resource ${CURDIR}/../../../libraries/SetupUtils.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot Resource ${CURDIR}/../../../libraries/SSHKeywords.robot Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ${CURDIR}/../../../libraries/CompareStream.robot Resource ${CURDIR}/PrefixcountKeywords.robot *** Variables *** @@ -63,6 +64,8 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3 Configure_Netconf_Device [Documentation] Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt. + # No need for configuring netconf device in carbon and above, openconfig is used + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience. : FOR ${index} IN RANGE 0 3 @@ -75,7 +78,7 @@ 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} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Put_As_Json_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -157,11 +160,12 @@ 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 &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} Delete_Netconf_Device_Configuration [Documentation] Revert the netconf configuration to the original stat [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin TemplatedRequests.Delete_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot index 278b6f913f..6f5c711f7b 100644 --- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot +++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes.robot @@ -30,6 +30,7 @@ Resource ${CURDIR}/../../../libraries/SetupUtils.robot Resource ${CURDIR}/../../../libraries/ClusterManagement.robot Resource ${CURDIR}/../../../libraries/SSHKeywords.robot Resource ${CURDIR}/../../../libraries/TemplatedRequests.robot +Resource ${CURDIR}/../../../libraries/CompareStream.robot Resource ${CURDIR}/PrefixcountKeywords.robot *** Variables *** @@ -63,6 +64,8 @@ Check_For_Empty_Ipv4_Topology_Before_Talking_3 Configure_Netconf_Device [Documentation] Configures and verifies netconf device configuration. If configuration is not successful, it de-configures the device before the next attempt. + # No need for configuring netconf device in carbon and above, openconfig is used + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin # After the netconf device is configured, odl starts downloading schemas. If the downloading will not finish within akka timeout, more tries are needed, 3 is based on a user experience. : FOR ${index} IN RANGE 0 3 @@ -75,7 +78,7 @@ 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} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} PASSIVE_MODE=true BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Put_As_Json_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} [Teardown] SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed @@ -157,11 +160,12 @@ 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 &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} BGP_NAME=${BGP_PEER_NAME} IP=${TOOLS_SYSTEM_IP} HOLDTIME=${HOLDTIME} PEER_PORT=${BGP_TOOL_PORT} - ... INITIATE=false BGP_RIB=${RIB_INSTANCE} + ... INITIATE=false BGP_RIB=${RIB_INSTANCE} BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG} TemplatedRequests.Delete_Templated ${BGP_VARIABLES_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} Delete_Netconf_Device_Configuration [Documentation] Revert the netconf configuration to the original stat [Setup] SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing + CompareStream.Run_Keyword_If_At_Least_Carbon BuiltIn.Pass_Execution Openconfig usage does not need netconf connector &{mapping} BuiltIn.Create_Dictionary DEVICE_NAME=${DEVICE_NAME} DEVICE_PORT=1830 DEVICE_IP=${rib_owner_node_id} DEVICE_USER=admin DEVICE_PASSWORD=admin TemplatedRequests.Delete_Templated ${NETCONF_DEV_FOLDER} mapping=${mapping} session=${CONFIG_SESSION} diff --git a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot index 00601af316..7ea987729d 100644 --- a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot +++ b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot @@ -50,6 +50,7 @@ ${EXAMPLE_IPV4_TOPOLOGY} example-ipv4-topology ${DEVICE_NAME} peer-controller-config ${DEVICE_CHECK_TIMEOUT} 60s ${RIB_INSTANCE} example-bgp-rib +${PROTOCOL_OPENCONFIG} ${RIB_INSTANCE} ${BGP_PEER_NAME} example-bgp-peer ${PEER_CHECK_URL} /restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F diff --git a/csit/testplans/bgpcep-bgpclustering.txt b/csit/testplans/bgpcep-bgpclustering.txt index 5fa767284f..080d62fb83 100644 --- a/csit/testplans/bgpcep-bgpclustering.txt +++ b/csit/testplans/bgpcep-bgpclustering.txt @@ -14,4 +14,3 @@ integration/test/csit/suites/netconf/ready/netconfready.robot integration/test/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot integration/test/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot integration/test/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot - diff --git a/csit/variables/bgpclustering/bgp_peer.beryllium/data.json b/csit/variables/bgpclustering/bgp_peer.beryllium/data.json new file mode 100644 index 0000000000..d7f9df9172 --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.beryllium/data.json @@ -0,0 +1,34 @@ +{ + "module": [ + { + "type": "odl-bgp-rib-impl-cfg:bgp-peer", + "name": "$BGP_NAME", + "odl-bgp-rib-impl-cfg:rib": { + "type": "odl-bgp-rib-impl-cfg:rib-instance", + "name": "$BGP_RIB" + }, + "odl-bgp-rib-impl-cfg:holdtimer": $HOLDTIME, + "odl-bgp-rib-impl-cfg:port": $PEER_PORT, + "odl-bgp-rib-impl-cfg:advertized-table": [ + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "ipv4-unicast" + }, + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "linkstate" + }, + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "ipv6-unicast" + } + ], + "odl-bgp-rib-impl-cfg:host": "$IP", + "odl-bgp-rib-impl-cfg:initiate-connection": $INITIATE, + "odl-bgp-rib-impl-cfg:peer-registry": { + "type": "odl-bgp-rib-impl-cfg:bgp-peer-registry", + "name": "global-bgp-peer-registry" + } + } + ] +} diff --git a/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml b/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml new file mode 100644 index 0000000000..79329d2673 --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.beryllium/data.xml @@ -0,0 +1,28 @@ + + prefix:bgp-peer + $BGP_NAME + $IP + $PEER_PORT + $HOLDTIME + $INITIATE + + prefix:rib-instance + $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/bgpclustering/bgp_peer.beryllium/location.uri b/csit/variables/bgpclustering/bgp_peer.beryllium/location.uri new file mode 100644 index 0000000000..b88d6eb86c --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.beryllium/location.uri @@ -0,0 +1 @@ +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/bgpclustering/bgp_peer.boron/data.json b/csit/variables/bgpclustering/bgp_peer.boron/data.json new file mode 100644 index 0000000000..d7f9df9172 --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.boron/data.json @@ -0,0 +1,34 @@ +{ + "module": [ + { + "type": "odl-bgp-rib-impl-cfg:bgp-peer", + "name": "$BGP_NAME", + "odl-bgp-rib-impl-cfg:rib": { + "type": "odl-bgp-rib-impl-cfg:rib-instance", + "name": "$BGP_RIB" + }, + "odl-bgp-rib-impl-cfg:holdtimer": $HOLDTIME, + "odl-bgp-rib-impl-cfg:port": $PEER_PORT, + "odl-bgp-rib-impl-cfg:advertized-table": [ + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "ipv4-unicast" + }, + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "linkstate" + }, + { + "type": "odl-bgp-rib-impl-cfg:bgp-table-type", + "name": "ipv6-unicast" + } + ], + "odl-bgp-rib-impl-cfg:host": "$IP", + "odl-bgp-rib-impl-cfg:initiate-connection": $INITIATE, + "odl-bgp-rib-impl-cfg:peer-registry": { + "type": "odl-bgp-rib-impl-cfg:bgp-peer-registry", + "name": "global-bgp-peer-registry" + } + } + ] +} diff --git a/csit/variables/bgpclustering/bgp_peer.boron/data.xml b/csit/variables/bgpclustering/bgp_peer.boron/data.xml new file mode 100644 index 0000000000..79329d2673 --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.boron/data.xml @@ -0,0 +1,28 @@ + + prefix:bgp-peer + $BGP_NAME + $IP + $PEER_PORT + $HOLDTIME + $INITIATE + + prefix:rib-instance + $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/bgpclustering/bgp_peer.boron/location.uri b/csit/variables/bgpclustering/bgp_peer.boron/location.uri new file mode 100644 index 0000000000..b88d6eb86c --- /dev/null +++ b/csit/variables/bgpclustering/bgp_peer.boron/location.uri @@ -0,0 +1 @@ +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/bgpclustering/bgp_peer/data.json b/csit/variables/bgpclustering/bgp_peer/data.json index d7f9df9172..7e7af33232 100644 --- a/csit/variables/bgpclustering/bgp_peer/data.json +++ b/csit/variables/bgpclustering/bgp_peer/data.json @@ -1,33 +1,34 @@ { - "module": [ + "bgp-openconfig-extensions:neighbor": [ { - "type": "odl-bgp-rib-impl-cfg:bgp-peer", - "name": "$BGP_NAME", - "odl-bgp-rib-impl-cfg:rib": { - "type": "odl-bgp-rib-impl-cfg:rib-instance", - "name": "$BGP_RIB" + "neighbor-address": "$IP", + "timers": { + "config": { + "hold-time": $HOLDTIME, + "connect-retry": 10 + } + }, + "afi-safis": { + "afi-safi": [ + { + "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST" + }, + { + "afi-safi-name": "openconfig-bgp-types:L3VPN-IPV4-UNICAST" + }, + { + "afi-safi-name": "openconfig-bgp-types:L2VPN-EVPN" + } + ] }, - "odl-bgp-rib-impl-cfg:holdtimer": $HOLDTIME, - "odl-bgp-rib-impl-cfg:port": $PEER_PORT, - "odl-bgp-rib-impl-cfg:advertized-table": [ - { - "type": "odl-bgp-rib-impl-cfg:bgp-table-type", - "name": "ipv4-unicast" - }, - { - "type": "odl-bgp-rib-impl-cfg:bgp-table-type", - "name": "linkstate" - }, - { - "type": "odl-bgp-rib-impl-cfg:bgp-table-type", - "name": "ipv6-unicast" + "transport": { + "config": { + "remote-port": $PEER_PORT, + "passive-mode": $PASSIVE_MODE } - ], - "odl-bgp-rib-impl-cfg:host": "$IP", - "odl-bgp-rib-impl-cfg:initiate-connection": $INITIATE, - "odl-bgp-rib-impl-cfg:peer-registry": { - "type": "odl-bgp-rib-impl-cfg:bgp-peer-registry", - "name": "global-bgp-peer-registry" + }, + "config": { + "peer-type": "INTERNAL" } } ] diff --git a/csit/variables/bgpclustering/bgp_peer/data.xml b/csit/variables/bgpclustering/bgp_peer/data.xml index 79329d2673..5fac2d2e52 100644 --- a/csit/variables/bgpclustering/bgp_peer/data.xml +++ b/csit/variables/bgpclustering/bgp_peer/data.xml @@ -1,28 +1,34 @@ - - prefix:bgp-peer - $BGP_NAME - $IP - $PEER_PORT - $HOLDTIME - $INITIATE - - prefix:rib-instance - $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 - - + + $IP + + + false + + + + + $HOLDTIME + + + + + $PEER_PORT + $PASSIVE_MODE + + + + INTERNAL + + + + x:IPV4-UNICAST + + + x:L3VPN-IPV4-UNICAST + + + x:L2VPN-EVPN + + + + diff --git a/csit/variables/bgpclustering/bgp_peer/location.uri b/csit/variables/bgpclustering/bgp_peer/location.uri index b88d6eb86c..d713ddf1ec 100644 --- a/csit/variables/bgpclustering/bgp_peer/location.uri +++ b/csit/variables/bgpclustering/bgp_peer/location.uri @@ -1 +1 @@ -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 +restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP -- 2.36.6