1 files changed, 32 insertions, 24 deletions
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index e6b81ceb1..552e85aa4 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -372,18 +372,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -772,18 +761,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -1038,6 +1016,12 @@
     </leafNode>
     #include <include/bgp/remote-as.xml.i>
     #include <include/bgp/neighbor-shutdown.xml.i>
+    <leafNode name="solo">
+      <properties>
+        <help>Do not send back prefixes learned from the neighbor</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <leafNode name="strict-capability-match">
       <properties>
         <help>Enable strict capability negotiation</help>
@@ -1114,6 +1098,29 @@
             </leafNode>
           </children>
         </node>
+        <leafNode name="bandwidth">
+          <properties>
+            <help>Link Bandwidth attribute</help>
+            <completionHelp>
+              <list>default-weight-for-missing ignore skip-missing</list>
+            </completionHelp>
+            <valueHelp>
+              <format>default-weight-for-missing</format>
+              <description>Assign low default weight (1) to paths not having link bandwidth</description>
+            </valueHelp>
+            <valueHelp>
+              <format>ignore</format>
+              <description>Ignore link bandwidth (do regular ECMP, not weighted)</description>
+            </valueHelp>
+            <valueHelp>
+              <format>skip-missing</format>
+              <description>Ignore paths without link bandwidth for ECMP (if other paths have it)</description>
+            </valueHelp>
+            <constraint>
+              <regex>^(default-weight-for-missing|ignore|skip-missing)$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
         <leafNode name="compare-routerid">
           <properties>
             <help>Compare the router-id for identical EBGP paths</help>
@@ -1180,6 +1187,7 @@
             <constraint>
               <validator name="numeric" argument="--range 1-4294967294"/>
             </constraint>
+            <multi/>
           </properties>
         </leafNode>
       </children>