1 files changed, 14 insertions, 26 deletions
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 552e85aa4..2b22bac7d 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -93,6 +93,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -114,7 +117,9 @@
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -478,6 +483,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -490,22 +498,13 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -661,18 +660,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>