summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/bgp-description.xml.i3
-rw-r--r--interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i19
-rw-r--r--interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i21
-rw-r--r--interface-definitions/protocols-bgp.xml.in43
4 files changed, 40 insertions, 46 deletions
diff --git a/interface-definitions/include/bgp-description.xml.i b/interface-definitions/include/bgp-description.xml.i
index 81be8fb97..e1766cb9f 100644
--- a/interface-definitions/include/bgp-description.xml.i
+++ b/interface-definitions/include/bgp-description.xml.i
@@ -1,8 +1,7 @@
<!-- included start from bgp-description.xml.i -->
<leafNode name="description">
<properties>
- <help>Description for this peer-group</help>
- <valueless/>
+ <help>Neighbor specific description</help>
</properties>
</leafNode>
<!-- included end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
deleted file mode 100644
index cfa68e5f0..000000000
--- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- included start from bgp-peer-group-afi-ipv4-unicast.xml.i -->
-<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>
- </children>
- </node>
- #include <include/bgp-afi-ipv4-prefix-list.xml.i>
- #include <include/bgp-afi-common.xml.i>
- </children>
-</node>
-<!-- included end -->
diff --git a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
deleted file mode 100644
index a062820ea..000000000
--- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- included start from bgp-peer-group-afi-ipv6-unicast.xml.i -->
-<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>
-<!-- included end -->
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index b9f67f188..e461fde29 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -192,9 +192,9 @@
#include <include/bgp-afi-redistribute-metric-route-map.xml.i>
</children>
</node>
- <node name="rip">
+ <node name="ripng">
<properties>
- <help>Redistribute RIP routes into BGP</help>
+ <help>Redistribute RIPng routes into BGP</help>
</properties>
<children>
#include <include/bgp-afi-redistribute-metric-route-map.xml.i>
@@ -742,8 +742,43 @@
<help>BGP peer-group address-family parameters</help>
</properties>
<children>
- #include <include/bgp-peer-group-afi-ipv4-unicast.xml.i>
- #include <include/bgp-peer-group-afi-ipv6-unicast.xml.i>
+ <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>
</children>
</node>
<leafNode name="bfd">