bgp: T2387: single-source xml templates to improve reusability

29 files changed, 619 insertions, 1185 deletions

diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i
index 7ee483056..6bd089823 100644
--- a/interface-definitions/include/accel-mtu-128-16384.xml.i
+++ b/interface-definitions/include/accel-mtu-128-16384.xml.i
@@ -1,9 +1,11 @@
-          <leafNode name="mtu">
-            <properties>
-              <help>Maximum Transmission Unit (MTU) - default 1492</help>
-              <constraint>
-                <validator name="numeric" argument="--range 128-16384"/>
-              </constraint>
-            </properties>
-            <defaultValue>1492</defaultValue>
-          </leafNode>
+<!-- included start from accel-mtu-128-16384.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU) - default 1492</help>
+    <constraint>
+      <validator name="numeric" argument="--range 128-16384"/>
+    </constraint>
+  </properties>
+  <defaultValue>1492</defaultValue>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-capability-orf.xml.i b/interface-definitions/include/bgp-afi-capability-orf.xml.i
new file mode 100644
index 000000000..9bd265f93
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-capability-orf.xml.i
@@ -0,0 +1,28 @@
+<!-- included start from bgp-afi-capability-orf.xml.i -->
+<node name="orf">
+  <properties>
+    <help>Advertise ORF capability to this peer</help>
+  </properties>
+  <children>
+    <node name="prefix-list">
+      <properties>
+        <help>Advertise prefix-list ORF capability to this peer</help>
+      </properties>
+      <children>
+        <leafNode name="receive">
+          <properties>
+            <help>Capability to receive the ORF</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="send">
+          <properties>
+            <help>Capability to send the ORF</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-common.xml.i b/interface-definitions/include/bgp-afi-common.xml.i
new file mode 100644
index 000000000..ea4eea591
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-common.xml.i
@@ -0,0 +1,243 @@
+<!-- included start from bgp-afi-common.xml.i -->
+<node name="allowas-in">
+  <properties>
+    <help>Accept route that contains the local-as in the as-path</help>
+  </properties>
+  <children>
+    <leafNode name="number">
+      <properties>
+        <help>Number of occurrences of AS number</help>
+        <valueHelp>
+          <format>u32:1-10</format>
+          <description>Number of times AS is allowed in path</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-10"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="as-override">
+  <properties>
+    <help>AS for routes sent to this peer to be the local AS</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="attribute-unchanged">
+  <properties>
+    <help>BGP attributes are sent unchanged</help>
+  </properties>
+  <children>
+    <leafNode name="as-path">
+      <properties>
+        <help>Send AS path unchanged</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="med">
+      <properties>
+        <help>Send multi-exit discriminator unchanged</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="next-hop">
+      <properties>
+        <help>Send nexthop unchanged</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="disable-send-community">
+  <properties>
+    <help>Disable sending community attributes to this peer</help>
+  </properties>
+  <children>
+    <leafNode name="extended">
+      <properties>
+        <help>Disable sending extended community attributes to this peer</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="standard">
+      <properties>
+        <help>Disable sending standard community attributes to this peer</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="default-originate">
+  <properties>
+    <help>Originate default route to this peer</help>
+  </properties>
+  <children>
+    <leafNode name="route-map">
+      <properties>
+        <help>route-map to specify criteria of the default route</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="distribute-list">
+  <properties>
+    <help>Access-list to filter route updates to/from this peer-group</help>
+  </properties>
+  <children>
+    <leafNode name="export">
+      <properties>
+        <help>Access-list to filter outgoing route updates to this peer-group</help>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Access-list to filter outgoing route updates to this peer-group</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>Access-list to filter incoming route updates from this peer-group</help>
+        <completionHelp>
+          <path>policy access-list</path>
+        </completionHelp>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Access-list to filter incoming route updates from this peer-group</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="filter-list">
+  <properties>
+    <help>as-path-list to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <leafNode name="export">
+      <properties>
+        <help>As-path-list to filter outgoing route updates to this peer</help>
+        <completionHelp>
+          <path>policy as-path-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>As-path-list to filter incoming route updates from this peer</help>
+        <completionHelp>
+          <path>policy as-path-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="maximum-prefix">
+  <properties>
+    <help>Maximum number of prefixes to accept from this peer</help>
+    <valueHelp>
+      <format>u32:1-4294967295</format>
+      <description>Prefix limit</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967295"/>
+    </constraint>
+  </properties>
+</leafNode>
+<node name="nexthop-self">
+  <properties>
+    <help>Disable the next hop calculation for this peer</help>
+  </properties>
+  <children>
+    <leafNode name="force">
+      <properties>
+        <help>Set the next hop to self for reflected routes</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="remove-private-as">
+  <properties>
+    <help>Remove private AS numbers from AS path in outbound route updates</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="route-map">
+  <properties>
+    <help>Route-map to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <leafNode name="export">
+      <properties>
+        <help>Route-map to filter outgoing route updates</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>Route-map to filter incoming route updates</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="route-reflector-client">
+  <properties>
+    <help>Peer is a route reflector client</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="route-server-client">
+  <properties>
+    <help>Peer is a route server client</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="soft-reconfiguration">
+  <properties>
+    <help>Soft reconfiguration for peer</help>
+  </properties>
+  <children>
+    <leafNode name="inbound">
+      <properties>
+        <help>Enable inbound soft reconfiguration</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="unsuppress-map">
+  <properties>
+    <help>Route-map to selectively unsuppress suppressed routes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="weight">
+  <properties>
+    <help>Default weight for routes from this peer</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Default weight</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp-afi-ipv4-prefix-list.xml.i
new file mode 100644
index 000000000..bbbada6bd
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-ipv4-prefix-list.xml.i
@@ -0,0 +1,25 @@
+<!-- included start from bgp-afi-ipv4-prefix-list.xml.i -->
+<node name="prefix-list">
+  <properties>
+    <help>IPv4-Prefix-list to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <leafNode name="export">
+      <properties>
+        <help>IPv4-Prefix-list to filter outgoing route updates to this peer</help>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>IPv4-Prefix-list to filter incoming route updates from this peer</help>
+        <completionHelp>
+          <path>policy prefix-list</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i b/interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i
new file mode 100644
index 000000000..4bb5fa626
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-ipv6-capability-dynamic.xml.i
@@ -0,0 +1,9 @@
+<!-- included start from bgp-afi-ipv6-capability-dynamic.xml.i -->
+<!-- Capability dynamic in the afi ipv6 does nothing T3037 -->
+<leafNode name="dynamic">
+  <properties>
+    <help>Advertise dynamic capability to this neighbor</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-ipv6-nexthop-local.xml.i b/interface-definitions/include/bgp-afi-ipv6-nexthop-local.xml.i
new file mode 100644
index 000000000..4778b392f
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-ipv6-nexthop-local.xml.i
@@ -0,0 +1,15 @@
+<!-- included start from bgp-afi-ipv6-nexthop-local.xml.i -->
+    <node name="nexthop-local">
+      <properties>
+        <help>Nexthop attributes</help>
+      </properties>
+      <children>
+        <leafNode name="unchanged">
+          <properties>
+            <help>Leave link-local nexthop unchanged for this peer</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp-afi-ipv6-prefix-list.xml.i
new file mode 100644
index 000000000..8ae7837e9
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-ipv6-prefix-list.xml.i
@@ -0,0 +1,25 @@
+<!-- included start from bgp-afi-ipv6-prefix-list.xml.i -->
+<node name="prefix-list">
+  <properties>
+    <help>Prefix-list to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <leafNode name="export">
+      <properties>
+        <help>Prefix-list to filter outgoing route updates to this peer</help>
+        <completionHelp>
+          <path>policy prefix-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>Prefix-list to filter incoming route updates from this peer</help>
+        <completionHelp>
+          <path>policy prefix-list6</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-afi-peer-group.xml.i b/interface-definitions/include/bgp-afi-peer-group.xml.i
new file mode 100644
index 000000000..c98a91030
--- /dev/null
+++ b/interface-definitions/include/bgp-afi-peer-group.xml.i
@@ -0,0 +1,7 @@
+<!-- included start from bgp-afi-peer-group.xml.i -->
+<leafNode name="peer-group">
+  <properties>
+    <help>Peer group used for this neighbor</help>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-capability.xml.i b/interface-definitions/include/bgp-capability.xml.i
new file mode 100644
index 000000000..fbec4988b
--- /dev/null
+++ b/interface-definitions/include/bgp-capability.xml.i
@@ -0,0 +1,21 @@
+<!-- included start from bgp-capability.xml.i -->
+<node name="capability">
+  <properties>
+    <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>
+    <leafNode name="extended-nexthop">
+      <properties>
+        <help>Advertise extended-nexthop capability to this neighbor</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-description.xml.i b/interface-definitions/include/bgp-description.xml.i
new file mode 100644
index 000000000..81be8fb97
--- /dev/null
+++ b/interface-definitions/include/bgp-description.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Description for this peer-group</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-disable-capability-negotiation.xml.i b/interface-definitions/include/bgp-disable-capability-negotiation.xml.i
new file mode 100644
index 000000000..a43c6e8b9
--- /dev/null
+++ b/interface-definitions/include/bgp-disable-capability-negotiation.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-disable-capability-negotiation.xml.i -->
+<leafNode name="disable-capability-negotiation">
+  <properties>
+    <help>Disable capability negotiation with this neighbor</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-disable-connected-check.xml.i b/interface-definitions/include/bgp-disable-connected-check.xml.i
new file mode 100644
index 000000000..bb9098bf6
--- /dev/null
+++ b/interface-definitions/include/bgp-disable-connected-check.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-disable-connected-check.xml.i -->
+<leafNode name="disable-connected-check">
+  <properties>
+    <help>Disable check to see if eBGP peer address is a connected route</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-ebgp-multihop.xml.i b/interface-definitions/include/bgp-ebgp-multihop.xml.i
new file mode 100644
index 000000000..6459fcf47
--- /dev/null
+++ b/interface-definitions/include/bgp-ebgp-multihop.xml.i
@@ -0,0 +1,14 @@
+<!-- included start from bgp-ebgp-multihop.xml.i -->
+<leafNode name="ebgp-multihop">
+  <properties>
+    <help>Allow this EBGP neighbor to not be on a directly connected network</help>
+    <valueHelp>
+      <format>u32:1-255</format>
+      <description>Number of hops</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-local-as.xml.i b/interface-definitions/include/bgp-local-as.xml.i
new file mode 100644
index 000000000..cf55ce476
--- /dev/null
+++ b/interface-definitions/include/bgp-local-as.xml.i
@@ -0,0 +1,22 @@
+<!-- included start from bgp-local-as.xml.i -->
+<tagNode name="local-as">
+  <properties>
+    <help>Local AS number [REQUIRED]</help>
+    <valueHelp>
+      <format>u32:1-4294967294</format>
+      <description>Local AS number</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967294"/>
+    </constraint>
+  </properties>
+  <children>
+    <leafNode name="no-prepend">
+      <properties>
+        <help>Disable prepending local-as to updates from EBGP peers</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- included end -->
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 c5a83f045..8f6cf06b1 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -4,283 +4,17 @@
     <help>IPv4 BGP neighbor parameters</help>
   </properties>
   <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv4-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="as-override">
-      <properties>
-        <help>AS for routes sent to this neighbor to be the local AS</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged (IPv4)</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged (IPv4)</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
     <node name="capability">
       <properties>
         <help>Advertise capabilities to this neighbor (IPv4)</help>
       </properties>
       <children>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this neighbor</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this neighbor</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default IPv4-route to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>IPv4-Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing IPv4-route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing IPv4-route updates to this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming IPv4-route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming IPv4-route updates from this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
+        #include <include/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing IPv4-route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming IPv4-route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of IPv4-prefixes to accept from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for IPv4-routes sent to this neighbor to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>IPv4-Prefix-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>IPv4-Prefix-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>IPv4-Prefix-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound IPv4-route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter IPv4-route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>IPv4-Route-map to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>IPv4-Route-map to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Neighbor as a IPv4-route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Neighbor is IPv4-route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for neighbor (IPv4)</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this neighbor [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed IPv4-routes</help>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this neighbor</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/bgp-afi-peer-group.xml.i>
+    #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-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
index 61cdc6a1c..c7a6f8035 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -4,328 +4,19 @@
     <help>IPv6 BGP neighbor parameters</help>
   </properties>
   <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv6-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="as-override">
-      <properties>
-        <help>AS for routes sent to this neighbor to be the local AS</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
     <node name="capability">
       <properties>
         <help>Advertise capabilities to this neighbor (IPv6)</help>
       </properties>
       <children>
-        <!-- Capability dynamic in the afi ipv6 does nothing T3037 -->
-        <leafNode name="dynamic">
-          <properties>
-            <help>Advertise dynamic capability to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this neighbor</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this neighbor</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default IPv6-route to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this neighbor</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this neighbor</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
+        #include <include/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp-afi-ipv6-capability-dynamic.xml.i>
       </children>
     </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-local">
-      <properties>
-        <help>Nexthop attributes</help>
-      </properties>
-      <children>
-        <leafNode name="unchanged">
-          <properties>
-            <help>Leave link-local nexthop unchanged for this peer</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for IPv6-routes sent to this neighbor to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="peer-group">
-      <properties>
-        <help>IPv6 peer group for this peer</help>
-      </properties>
-    </leafNode>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this neighbor</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this neighbor</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Neighbor as a IPv6-route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Neighbor is IPv6-route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for neighbor (IPv6)</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this neighbor [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed IPv6-routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this neighbor</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this neighbor</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/bgp-afi-peer-group.xml.i>
+    #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/include/bgp-override-capability.xml.i b/interface-definitions/include/bgp-override-capability.xml.i
new file mode 100644
index 000000000..88c277c8b
--- /dev/null
+++ b/interface-definitions/include/bgp-override-capability.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-override-capability.xml.i -->
+<leafNode name="override-capability">
+  <properties>
+    <help>Ignore capability negotiation with specified neighbor</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-passive.xml.i b/interface-definitions/include/bgp-passive.xml.i
new file mode 100644
index 000000000..ada961866
--- /dev/null
+++ b/interface-definitions/include/bgp-passive.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-passive.xml.i -->
+<leafNode name="passive">
+  <properties>
+    <help>Do not initiate a session with this neighbor</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-password.xml.i b/interface-definitions/include/bgp-password.xml.i
new file mode 100644
index 000000000..5b68a2d71
--- /dev/null
+++ b/interface-definitions/include/bgp-password.xml.i
@@ -0,0 +1,7 @@
+<!-- included start from bgp-password.xml.i -->
+<leafNode name="password">
+  <properties>
+    <help>BGP MD5 password</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
index e34d9f774..cfa68e5f0 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv4-unicast.xml.i
@@ -4,300 +4,16 @@
     <help>IPv4 BGP peer group parameters</help>
   </properties>
   <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
     <node name="capability">
       <properties>
         <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>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this peer-group</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this peer-group</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default route to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy access-list</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for routes sent to this peer-group to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
+        #include <include/bgp-afi-capability-orf.xml.i>
       </children>
     </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Peer-group as a route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Peer-group as route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this peer-group [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this peer-group</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #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
index 400193b7b..a062820ea 100644
--- a/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-peer-group-afi-ipv6-unicast.xml.i
@@ -1,319 +1,21 @@
 <!-- included start from bgp-peer-group-afi-ipv6-unicast.xml.i -->
 <node name="ipv6-unicast">
   <properties>
-    <help>IPv6 BGP neighbor parameters</help>
+    <help>IPv6 BGP peer group parameters</help>
   </properties>
   <children>
-    <node name="allowas-in">
-      <properties>
-        <help>Accept a IPv6-route that contains the local-AS in the as-path</help>
-      </properties>
-      <children>
-        <leafNode name="number">
-          <properties>
-            <help>Number of occurrences of AS number</help>
-            <valueHelp>
-              <format>u32:1-10</format>
-              <description>Number of times AS is allowed in path</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-10"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="attribute-unchanged">
-      <properties>
-        <help>BGP attributes are sent unchanged</help>
-      </properties>
-      <children>
-        <leafNode name="as-path">
-          <properties>
-            <help>Send AS path unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="med">
-          <properties>
-            <help>Send multi-exit discriminator unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="next-hop">
-          <properties>
-            <help>Send nexthop unchanged</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
     <node name="capability">
       <properties>
         <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>
-        <node name="orf">
-          <properties>
-            <help>Advertise ORF capability to this peer-group</help>
-          </properties>
-          <children>
-            <node name="prefix-list">
-              <properties>
-                <help>Advertise prefix-list ORF capability to this peer-group</help>
-              </properties>
-              <children>
-                <leafNode name="receive">
-                  <properties>
-                    <help>Capability to receive the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-                <leafNode name="send">
-                  <properties>
-                    <help>Capability to send the ORF</help>
-                    <valueless/>
-                  </properties>
-                </leafNode>
-              </children>
-            </node>
-          </children>
-        </node>
-      </children>
-    </node>
-    <node name="default-originate">
-      <properties>
-        <help>Send default route to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="route-map">
-          <properties>
-            <help>Route-map to specify criteria of the default</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="disable-send-community">
-      <properties>
-        <help>Disable sending community attributes to this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="extended">
-          <properties>
-            <help>Disable sending extended community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-        <leafNode name="standard">
-          <properties>
-            <help>Disable sending standard community attributes to this peer-group</help>
-            <valueless/>
-          </properties>
-        </leafNode>
+        #include <include/bgp-afi-capability-orf.xml.i>
+        #include <include/bgp-afi-ipv6-capability-dynamic.xml.i>
       </children>
     </node>
-    <node name="distribute-list">
-      <properties>
-        <help>Access-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Access-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter outgoing route updates to this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Access-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy access-list6</path>
-            </completionHelp>
-            <valueHelp>
-              <format>u32:1-65535</format>
-              <description>Access-list to filter incoming route updates from this peer-group</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-65535"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="filter-list">
-      <properties>
-        <help>As-path-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>As-path-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>As-path-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy as-path-list</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="maximum-prefix">
-      <properties>
-        <help>Maximum number of prefixes to accept from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-4294967295</format>
-          <description>Prefix limit</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-4294967295"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <node name="nexthop-local">
-      <properties>
-        <help>Nexthop attributes</help>
-      </properties>
-      <children>
-        <leafNode name="unchanged">
-          <properties>
-            <help>Leave link-local nexthop unchanged for this peer</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="nexthop-self">
-      <properties>
-        <help>Nexthop for routes sent to this peer-group to be the local router</help>
-      </properties>
-      <children>
-        <leafNode name="force">
-          <properties>
-            <help>Set the next hop to self for reflected routes</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <node name="prefix-list">
-      <properties>
-        <help>Prefix-list to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Prefix-list to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Prefix-list to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy prefix-list6</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="remove-private-as">
-      <properties>
-        <help>Remove private AS numbers from AS path in outbound route updates</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="route-map">
-      <properties>
-        <help>Route-map to filter route updates to/from this peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="export">
-          <properties>
-            <help>Route-map to filter outgoing route updates to this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-        <leafNode name="import">
-          <properties>
-            <help>Route-map to filter incoming route updates from this peer-group</help>
-            <completionHelp>
-              <path>policy route-map</path>
-            </completionHelp>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="route-reflector-client">
-      <properties>
-        <help>Peer-group as a route reflector client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="route-server-client">
-      <properties>
-        <help>Peer-group as route server client</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <node name="soft-reconfiguration">
-      <properties>
-        <help>Soft reconfiguration for peer-group</help>
-      </properties>
-      <children>
-        <leafNode name="inbound">
-          <properties>
-            <help>Inbound soft reconfiguration for this peer-group [REQUIRED]</help>
-            <valueless/>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
-    <leafNode name="unsuppress-map">
-      <properties>
-        <help>Route-map to selectively unsuppress suppressed routes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="weight">
-      <properties>
-        <help>Default weight for routes from this peer-group</help>
-        <valueHelp>
-          <format>u32:1-65535</format>
-          <description>Weight for routes from this peer-group</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 1-65535"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #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/include/bgp-peer-group.xml.i b/interface-definitions/include/bgp-peer-group.xml.i
new file mode 100644
index 000000000..24585c1ce
--- /dev/null
+++ b/interface-definitions/include/bgp-peer-group.xml.i
@@ -0,0 +1,7 @@
+<!-- included start from bgp-peer-group.xml.i -->
+<leafNode name="peer-group">
+  <properties>
+    <help>Peer group for this peer</help>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-remote-as.xml.i b/interface-definitions/include/bgp-remote-as.xml.i
new file mode 100644
index 000000000..de3f4d2ad
--- /dev/null
+++ b/interface-definitions/include/bgp-remote-as.xml.i
@@ -0,0 +1,27 @@
+<!-- included start from bgp-remote-as.xml.i -->
+<leafNode name="remote-as">
+  <properties>
+    <help>Neighbor BGP AS number [REQUIRED]</help>
+    <completionHelp>
+      <list>external internal</list>
+    </completionHelp>
+    <valueHelp>
+      <format>u32:1-4294967294</format>
+      <description>Neighbor AS number</description>
+    </valueHelp>
+    <valueHelp>
+      <format>external</format>
+      <description>Any AS different from the local AS</description>
+    </valueHelp>
+    <valueHelp>
+      <format>internal</format>
+      <description>Neighbor AS number</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967294"/>
+      <regex>^(external|internal)$</regex>
+    </constraint>
+    <constraintErrorMessage>Invalid AS number</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-route-map.xml.i b/interface-definitions/include/bgp-route-map.xml.i
new file mode 100644
index 000000000..18b092354
--- /dev/null
+++ b/interface-definitions/include/bgp-route-map.xml.i
@@ -0,0 +1,10 @@
+<!-- included start from bgp-route-map.xml.i -->
+<leafNode name="route-map">
+  <properties>
+    <help>Route-map to modify route attributes</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-shutdown.xml.i b/interface-definitions/include/bgp-shutdown.xml.i
new file mode 100644
index 000000000..330120bba
--- /dev/null
+++ b/interface-definitions/include/bgp-shutdown.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-shutdown.xml.i -->
+<leafNode name="shutdown">
+  <properties>
+    <help>Administratively shut down peer-group</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-timers-holdtime.xml.i b/interface-definitions/include/bgp-timers-holdtime.xml.i
new file mode 100644
index 000000000..09924574b
--- /dev/null
+++ b/interface-definitions/include/bgp-timers-holdtime.xml.i
@@ -0,0 +1,18 @@
+<!-- included start from bgp-timers-holdtime.xml.i -->
+<leafNode name="holdtime">
+  <properties>
+    <help>BGP hold timer for this neighbor</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Hold timer in seconds</description>
+    </valueHelp>
+    <valueHelp>
+      <format>0</format>
+      <description>Hold timer disabled</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-timers-keepalive.xml.i b/interface-definitions/include/bgp-timers-keepalive.xml.i
new file mode 100644
index 000000000..7d294c9d6
--- /dev/null
+++ b/interface-definitions/include/bgp-timers-keepalive.xml.i
@@ -0,0 +1,14 @@
+<!-- included start from bgp-timers-keepalive.xml.i -->
+<leafNode name="keepalive">
+  <properties>
+    <help>BGP keepalive interval for this neighbor</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Keepalive interval in seconds (default 60)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-ttl-security.xml.i b/interface-definitions/include/bgp-ttl-security.xml.i
new file mode 100644
index 000000000..3f4d1786d
--- /dev/null
+++ b/interface-definitions/include/bgp-ttl-security.xml.i
@@ -0,0 +1,21 @@
+<!-- included start from bgp-ttl-security.xml.i -->
+<node name="ttl-security">
+  <properties>
+    <help>Ttl security mechanism</help>
+  </properties>
+  <children>
+    <leafNode name="hops">
+      <properties>
+        <help>Number of the maximum number of hops to the BGP peer</help>
+        <valueHelp>
+          <format>u32:1-254</format>
+          <description>Number of hops</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-254"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/interface-definitions/include/bgp-update-source.xml.i b/interface-definitions/include/bgp-update-source.xml.i
new file mode 100644
index 000000000..c1db2e2c1
--- /dev/null
+++ b/interface-definitions/include/bgp-update-source.xml.i
@@ -0,0 +1,28 @@
+<!-- included start from bgp-update-source.xml.i -->
+<leafNode name="update-source">
+  <!-- Need to check format interfaces -->
+  <properties>
+    <help>Source IP of routing updates</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 address of route source</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 address of route source</description>
+    </valueHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface as route source</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+      <validator name="ipv6-address"/>
+      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->