Merge branch 'current' into 2fa

1 files changed, 82 insertions, 16 deletions

diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index 5a3c58fa8..cf65daf00 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -139,7 +139,7 @@
       </tagNode>
       <tagNode name="as-path-list">
         <properties>
-          <help>Border Gateway Protocol (BGP) autonomous system path filter</help>
+          <help>Add a BGP autonomous system path filter</help>
           <valueHelp>
             <format>txt</format>
             <description>AS path list name</description>
@@ -176,10 +176,10 @@
       </tagNode>
       <tagNode name="community-list">
         <properties>
-          <help>Border Gateway Protocol (BGP) autonomous system path filter</help>
+          <help>Add a BGP community list entry</help>
           <valueHelp>
             <format>txt</format>
-            <description>Border Gateway Protocol (BGP) community-list filter</description>
+            <description>BGP community-list name</description>
           </valueHelp>
         </properties>
         <children>
@@ -236,11 +236,15 @@
       </tagNode>
       <tagNode name="extcommunity-list">
         <properties>
-          <help>Border Gateway Protocol (BGP) extended community-list filter</help>
+          <help>Add a BGP extended community list entry</help>
           <valueHelp>
             <format>txt</format>
-            <description>Border Gateway Protocol (BGP) extended community-list filter</description>
+            <description>BGP extended community-list name</description>
           </valueHelp>
+          <constraint>
+            <regex>^[-_a-zA-Z0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
         <children>
           #include <include/generic-description.xml.i>
@@ -281,11 +285,15 @@
       </tagNode>
       <tagNode name="large-community-list">
         <properties>
-          <help>Border Gateway Protocol (BGP) large-community-list filter</help>
+          <help>Add a BGP large community list entry</help>
           <valueHelp>
             <format>txt</format>
-            <description>Border Gateway Protocol (BGP) large-community-list filter</description>
+            <description>BGP large-community-list name</description>
           </valueHelp>
+          <constraint>
+            <regex>^[-_a-zA-Z0-9]+$</regex>
+          </constraint>
+          <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
         <children>
           #include <include/generic-description.xml.i>
@@ -307,9 +315,17 @@
                 <properties>
                   <help>Regular expression to match against a large community list</help>
                   <valueHelp>
-                    <format>&lt;aa:nn:nn&gt;</format>
-                    <description>Large Community value</description>
+                    <format>ASN:NN:NN</format>
+                    <description>BGP large-community-list filter</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>IP:NN:NN</format>
+                    <description>BGP large-community-list filter (IPv4 address format)</description>
                   </valueHelp>
+                  <constraint>
+                    <validator name="bgp-large-community-list"/>
+                  </constraint>
+                  <constraintErrorMessage>Malformed large-community-list</constraintErrorMessage>
                 </properties>
               </leafNode>
             </children>
@@ -535,6 +551,44 @@
                       </leafNode>
                     </children>
                   </node>
+                  <node name="evpn">
+                    <properties>
+                      <help>Ethernet Virtual Private Network</help>
+                    </properties>
+                    <children>
+                      <leafNode name="default-route">
+                        <properties>
+                          <help>Default EVPN type-5 route</help>
+                          <valueless/>
+                        </properties>
+                      </leafNode>
+                      #include <include/bgp/route-distinguisher.xml.i>
+                      <leafNode name="route-type">
+                        <properties>
+                          <help>Match route-type</help>
+                          <completionHelp>
+                            <list>macip multicast prefix</list>
+                          </completionHelp>
+                          <valueHelp>
+                            <format>macip</format>
+                            <description>mac-ip route</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>multicast</format>
+                            <description>IMET route</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>prefix</format>
+                            <description>Prefix route</description>
+                          </valueHelp>
+                          <constraint>
+                            <regex>^(macip|multicast|prefix)$</regex>
+                          </constraint>
+                        </properties>
+                      </leafNode>
+                      #include <include/vni.xml.i>
+                    </children>
+                  </node>
                   <leafNode name="extcommunity">
                     <properties>
                       <help>BGP extended community to match</help>
@@ -770,7 +824,7 @@
                   </leafNode>
                   <leafNode name="origin">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) origin code to match</help>
+                      <help>BGP origin code to match</help>
                       <completionHelp>
                         <list>egp igp incomplete</list>
                       </completionHelp>
@@ -872,7 +926,7 @@
                 <children>
                   <node name="aggregator">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) aggregator attribute</help>
+                      <help>BGP aggregator attribute</help>
                     </properties>
                     <children>
                       <leafNode name="as">
@@ -921,13 +975,13 @@
                   </leafNode>
                   <leafNode name="atomic-aggregate">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) atomic aggregate attribute</help>
+                      <help>BGP atomic aggregate attribute</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <node name="comm-list">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) communities matching a community-list</help>
+                      <help>BGP communities matching a community-list</help>
                     </properties>
                     <children>
                       <leafNode name="comm-list">
@@ -1124,9 +1178,21 @@
                       </completionHelp>
                     </properties>
                   </leafNode>
+                  <leafNode name="large-comm-list-delete">
+                    <properties>
+                      <help>Delete BGP communities matching the large community-list</help>
+                      <completionHelp>
+                        <path>policy large-community-list</path>
+                      </completionHelp>
+                      <valueHelp>
+                        <format>txt</format>
+                        <description>BGP large community-list</description>
+                      </valueHelp>
+                    </properties>
+                  </leafNode>
                   <leafNode name="local-preference">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) local preference attribute</help>
+                      <help>BGP local preference attribute</help>
                       <valueHelp>
                         <format>u32:0-4294967295</format>
                         <description>Local preference value</description>
@@ -1196,7 +1262,7 @@
                   </leafNode>
                   <leafNode name="originator-id">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) originator ID attribute</help>
+                      <help>BGP originator ID attribute</help>
                       <valueHelp>
                         <format>ipv4</format>
                         <description>Orignator IP address</description>
@@ -1249,7 +1315,7 @@
                   </leafNode>
                   <leafNode name="weight">
                     <properties>
-                      <help>Border Gateway Protocol (BGP) weight attribute</help>
+                      <help>BGP weight attribute</help>
                       <valueHelp>
                         <format>u32:0-4294967295</format>
                         <description>BGP weight</description>