summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-definitions/include/bgp-bfd.xml.i15
-rw-r--r--interface-definitions/include/bgp-capability-dynamic.xml.i (renamed from interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i)2
-rw-r--r--interface-definitions/include/bgp-capability.xml.i7
-rw-r--r--interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i1
-rw-r--r--interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i2
-rw-r--r--interface-definitions/protocols-bgp.xml.in60
6 files changed, 23 insertions, 64 deletions
diff --git a/interface-definitions/include/bgp-bfd.xml.i b/interface-definitions/include/bgp-bfd.xml.i
new file mode 100644
index 000000000..fe52b12f2
--- /dev/null
+++ b/interface-definitions/include/bgp-bfd.xml.i
@@ -0,0 +1,15 @@
+<!-- included start from bgp-bfd.xml.i -->
+<node name="bfd">
+ <properties>
+ <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
+ </properties>
+ <children>
+ <leafNode name="check-control-plane-failure">
+ <properties>
+ <help>Allow to write CBIT independence in BFD outgoing packets and read both C-BIT value of BFD and lookup BGP peer status</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i b/interface-definitions/include/bgp-capability-dynamic.xml.i
index 4bb5fa626..3cf300156 100644
--- a/interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i
+++ b/interface-definitions/include/bgp-capability-dynamic.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-ipv6-capability-dynamic.xml.i -->
+<!-- included start from bgp-capability-dynamic.xml.i -->
<!-- Capability dynamic in the afi ipv6 does nothing T3037 -->
<leafNode name="dynamic">
<properties>
diff --git a/interface-definitions/include/bgp-capability.xml.i b/interface-definitions/include/bgp-capability.xml.i
index fbec4988b..5940e46e4 100644
--- a/interface-definitions/include/bgp-capability.xml.i
+++ b/interface-definitions/include/bgp-capability.xml.i
@@ -4,12 +4,7 @@
<help>Advertise capabilities to this peer-group</help>
</properties>
<children>
- <leafNode name="dynamic">
- <properties>
- <help>Advertise dynamic capability to this peer-group</help>
- <valueless/>
- </properties>
- </leafNode>
+ #include <include/bgp-capability-dynamic.xml.i>
<leafNode name="extended-nexthop">
<properties>
<help>Advertise extended-nexthop capability to this neighbor</help>
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
index 8f6cf06b1..03a859271 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -10,6 +10,7 @@
</properties>
<children>
#include <include/bgp-afi-capability-orf.xml.i>
+ #include <include/bgp-capability-dynamic.xml.i>
</children>
</node>
#include <include/bgp-afi-peer-group.xml.i>
diff --git a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
index c7a6f8035..e9ba23408 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -10,7 +10,7 @@
</properties>
<children>
#include <include/bgp-afi-capability-orf.xml.i>
- #include <include/bgp-afi-ipv6-capability-dynamic.xml.i>
+ #include <include/bgp-capability-dynamic.xml.i>
</children>
</node>
#include <include/bgp-afi-peer-group.xml.i>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index e461fde29..f152021fb 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -293,19 +293,7 @@
</constraint>
</properties>
</leafNode>
- <node name="bfd">
- <properties>
- <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
- </properties>
- <children>
- <leafNode name="check-control-plane-failure">
- <properties>
- <help>Allow to write CBIT independence in BFD outgoing packets and read both C-BIT value of BFD and lookup BGP peer status</help>
- <valueless/>
- </properties>
- </leafNode>
- </children>
- </node>
+ #include <include/bgp-bfd.xml.i>
#include <include/bgp-capability.xml.i>
#include <include/bgp-description.xml.i>
#include <include/bgp-disable-capability-negotiation.xml.i>
@@ -742,51 +730,11 @@
<help>BGP peer-group address-family parameters</help>
</properties>
<children>
- <node name="ipv4-unicast">
- <properties>
- <help>IPv4 BGP peer group parameters</help>
- </properties>
- <children>
- <node name="capability">
- <properties>
- <help>Advertise capabilities to this peer-group</help>
- </properties>
- <children>
- #include <include/bgp-afi-capability-orf.xml.i>
- #include <include/bgp-afi-ipv6-capability-dynamic.xml.i>
- </children>
- </node>
- #include <include/bgp-afi-ipv4-prefix-list.xml.i>
- #include <include/bgp-afi-common.xml.i>
- </children>
- </node>
- <node name="ipv6-unicast">
- <properties>
- <help>IPv6 BGP peer group parameters</help>
- </properties>
- <children>
- <node name="capability">
- <properties>
- <help>Advertise capabilities to this peer-group</help>
- </properties>
- <children>
- #include <include/bgp-afi-capability-orf.xml.i>
- #include <include/bgp-afi-ipv6-capability-dynamic.xml.i>
- </children>
- </node>
- #include <include/bgp-afi-ipv6-nexthop-local.xml.i>
- #include <include/bgp-afi-ipv6-prefix-list.xml.i>
- #include <include/bgp-afi-common.xml.i>
- </children>
- </node>
+ #include <include/bgp-neighbor-afi-ipv4-unicast.xml.i>
+ #include <include/bgp-neighbor-afi-ipv6-unicast.xml.i>
</children>
</node>
- <leafNode name="bfd">
- <properties>
- <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
- <valueless/>
- </properties>
- </leafNode>
+ #include <include/bgp-bfd.xml.i>
#include <include/bgp-capability.xml.i>
#include <include/bgp-description.xml.i>
#include <include/bgp-disable-capability-negotiation.xml.i>