Merge branch 'vyos:current' into current

15 files changed, 130 insertions, 18 deletions

diff --git a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
index 8deb189ab..d586635c8 100644
--- a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
@@ -25,7 +25,7 @@
           <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
         </valueHelp>
         <constraint>
-          <validator name="bgp-route-target" argument="--single"/>
+          <validator name="bgp-rd-rt" argument="--route-target"/>
         </constraint>
       </properties>
     </leafNode>
@@ -37,7 +37,7 @@
           <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
         </valueHelp>
         <constraint>
-          <validator name="bgp-route-target" argument="--single"/>
+          <validator name="bgp-rd-rt" argument="--route-target"/>
         </constraint>
       </properties>
     </leafNode>
@@ -49,7 +49,7 @@
           <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
         </valueHelp>
         <constraint>
-          <validator name="bgp-route-target" argument="--single"/>
+          <validator name="bgp-rd-rt" argument="--route-target"/>
         </constraint>
       </properties>
     </leafNode>
diff --git a/interface-definitions/include/bgp/afi-route-target-vpn.xml.i b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
index 0cd0fdd76..5784f9eac 100644
--- a/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
+++ b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
@@ -17,7 +17,7 @@
               <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
             </valueHelp>
             <constraint>
-              <validator name="bgp-route-target" argument="--multi"/>
+              <validator name="bgp-rd-rt" argument="--route-target-multi"/>
             </constraint>
           </properties>
         </leafNode>
@@ -29,7 +29,7 @@
               <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
             </valueHelp>
             <constraint>
-              <validator name="bgp-route-target" argument="--multi"/>
+              <validator name="bgp-rd-rt" argument="--route-target-multi"/>
             </constraint>
           </properties>
         </leafNode>
@@ -41,7 +41,7 @@
               <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
             </valueHelp>
             <constraint>
-              <validator name="bgp-route-target" argument="--multi"/>
+              <validator name="bgp-rd-rt" argument="--route-target-multi"/>
             </constraint>
           </properties>
         </leafNode>
diff --git a/interface-definitions/include/bgp/afi-common.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i
index 62beff40c..f3fc4444c 100644
--- a/interface-definitions/include/bgp/afi-common.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from bgp/afi-common.xml.i -->
+<!-- include start from bgp/neighbor-afi-ipv4-ipv6-common.xml.i -->
 <leafNode name="addpath-tx-all">
   <properties>
     <help>Use addpath to advertise all paths to a neighbor</help>
@@ -11,6 +11,61 @@
     <valueless/>
   </properties>
 </leafNode>
+<node name="conditionally-advertise">
+  <properties>
+    <help>Use route-map to conditionally advertise routes</help>
+  </properties>
+  <children>
+    <leafNode name="advertise-map">
+      <properties>
+        <help>Route-map to conditionally advertise routes</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route map name</description>
+        </valueHelp>
+        <constraint>
+          <regex>^[-_a-zA-Z0-9.]+$</regex>
+        </constraint>
+        <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <leafNode name="exist-map">
+      <properties>
+        <help>Advertise routes only if prefixes in exist-map are installed in BGP table</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route map name</description>
+        </valueHelp>
+        <constraint>
+          <regex>^[-_a-zA-Z0-9.]+$</regex>
+        </constraint>
+        <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+      </properties>
+    </leafNode>
+    <leafNode name="non-exist-map">
+      <properties>
+        <help>Advertise routes only if prefixes in non-exist-map are not installed in BGP table</help>
+        <completionHelp>
+          <path>policy route-map</path>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route map name</description>
+        </valueHelp>
+        <constraint>
+          <regex>^[-_a-zA-Z0-9.]+$</regex>
+        </constraint>
+        <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+      </properties>
+    </leafNode>
+  </children>
+</node>
 #include <include/bgp/afi-allowas-in.xml.i>
 <leafNode name="as-override">
   <properties>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i
index 45a440fd8..0eae29f5e 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-labeled-unicast.xml.i
@@ -13,7 +13,7 @@
       </children>
     </node>
     #include <include/bgp/afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i
index 6526169ca..4bb6df7c3 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-multicast.xml.i
@@ -13,7 +13,7 @@
       </children>
     </node>
     #include <include/bgp/afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
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 b7b7ca5b5..0094ce874 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-unicast.xml.i
@@ -13,7 +13,7 @@
       </children>
     </node>
     #include <include/bgp/afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i
index 838327bc9..220f22fe3 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-vpn.xml.i
@@ -5,7 +5,7 @@
   </properties>
   <children>
     #include <include/bgp/afi-ipv4-prefix-list.xml.i>
-    #include <include/bgp/afi-common.xml.i>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i
index f680b7357..995183571 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-labeled-unicast.xml.i
@@ -14,7 +14,7 @@
     </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>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i
index 1f8db8361..bb713c313 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-multicast.xml.i
@@ -6,7 +6,7 @@
   <children>
     #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>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
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 f6b812c28..26a5e7090 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-unicast.xml.i
@@ -14,7 +14,7 @@
     </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>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
     #include <include/bgp/afi-default-originate.xml.i>
   </children>
 </node>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i
index c0df71cf3..5c6811986 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv6-vpn.xml.i
@@ -6,7 +6,7 @@
   <children>
     #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>
+    #include <include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-bfd.xml.i b/interface-definitions/include/bgp/neighbor-bfd.xml.i
index d486bdd8a..fac2a1166 100644
--- a/interface-definitions/include/bgp/neighbor-bfd.xml.i
+++ b/interface-definitions/include/bgp/neighbor-bfd.xml.i
@@ -4,6 +4,7 @@
     <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
   </properties>
   <children>
+    #include <include/bfd/profile.xml.i>
     <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>
diff --git a/interface-definitions/include/bgp/neighbor-shutdown.xml.i b/interface-definitions/include/bgp/neighbor-shutdown.xml.i
index 6d15899a6..acc7bc5a9 100644
--- a/interface-definitions/include/bgp/neighbor-shutdown.xml.i
+++ b/interface-definitions/include/bgp/neighbor-shutdown.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from bgp/neighbor-shutdown.xml.i -->
 <leafNode name="shutdown">
   <properties>
-    <help>Administratively shut down this neighbor</help>
+    <help>Administratively shutdown this neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 2dfae517e..8214d0779 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1181,6 +1181,26 @@
         </leafNode>
       </children>
     </node>
+    <node name="conditional-advertisement">
+      <properties>
+        <help>Conditional advertisement settings</help>
+      </properties>
+      <children>
+        <leafNode name="timer">
+          <properties>
+            <help>Set period to rescan BGP table to check if condition is met</help>
+            <valueHelp>
+              <format>u32:5-240</format>
+              <description>Period to rerun the conditional advertisement scanner process (default: 60)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 5-240"/>
+            </constraint>
+          </properties>
+          <defaultValue>60</defaultValue>
+        </leafNode>
+      </children>
+    </node>
     <node name="dampening">
       <properties>
         <help>Enable route-flap dampening</help>
@@ -1343,6 +1363,12 @@
         <valueless/>
       </properties>
     </leafNode>
+    <leafNode name="fast-convergence">
+      <properties>
+        <help>Teardown sessions immediately whenever peer becomes unreachable</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <node name="graceful-restart">
       <properties>
         <help>Graceful restart capability parameters</help>
@@ -1374,6 +1400,18 @@
         <valueless/>
       </properties>
     </leafNode>
+    <leafNode name="minimum-holdtime">
+      <properties>
+        <help>BGP minimum holdtime</help>
+        <valueHelp>
+          <format>u32:1-65535</format>
+          <description>Minimum holdtime in seconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
     <leafNode name="network-import-check">
       <properties>
         <help>Enable IGP route check for network statements</help>
@@ -1392,6 +1430,24 @@
         <valueless/>
       </properties>
     </leafNode>
+    <leafNode name="reject-as-sets">
+      <properties>
+        <help>Reject routes with AS_SET or AS_CONFED_SET flag</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="shutdown">
+      <properties>
+        <help>Administrative shutdown of the BGP instance</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="suppress-fib-pending">
+      <properties>
+        <help>Advertise only routes that are programmed in kernel to peers</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     #include <include/router-id.xml.i>
   </children>
 </node>
@@ -1441,4 +1497,4 @@
     #include <include/bgp/timers-keepalive.xml.i>
   </children>
 </node>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-distinguisher.xml.i b/interface-definitions/include/bgp/route-distinguisher.xml.i
index 6d0aa3ef1..8bc5b452e 100644
--- a/interface-definitions/include/bgp/route-distinguisher.xml.i
+++ b/interface-definitions/include/bgp/route-distinguisher.xml.i
@@ -7,7 +7,7 @@
       <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
     </valueHelp>
     <constraint>
-      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+      <validator name="bgp-rd-rt" argument="--route-distinguisher"/>
     </constraint>
   </properties>
 </leafNode>