Merge pull request #589 from sever-sever/T2387

bgp-xml: T2387: Fix validators and add capability for new format bgp

3 files changed, 30 insertions, 15 deletions

diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index 36a426c9c..6fb126f8d 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -250,11 +250,13 @@ router bgp {{ asn }}
 {#- END attribute-unchanged #}
 
 {%- if 'capability' in conf_peer_group.address_family.ipv4_unicast %}
-{%-   if 'receive' in conf_peer_group.address_family.ipv4_unicast.capability.orf.prefix_list %}
+{%-   if 'orf' in conf_peer_group.address_family.ipv4_unicast.capability %}
+{%-     if 'receive' in conf_peer_group.address_family.ipv4_unicast.capability.orf.prefix_list %}
   neighbor {{ pr_group }} capability orf prefix-list receive
-{%-   endif %}
-{%-   if 'send' in conf_peer_group.address_family.ipv4_unicast.capability.orf.prefix_list %}
+{%-     endif %}
+{%-     if 'send' in conf_peer_group.address_family.ipv4_unicast.capability.orf.prefix_list %}
   neighbor {{ pr_group }} capability orf prefix-list send 
+{%-     endif %}
 {%-   endif %}
 {%- endif %}
 
@@ -379,11 +381,13 @@ router bgp {{ asn }}
 {#- END attribute-unchanged ipv6 #}
 
 {%- if 'capability' in conf_peer_group.address_family.ipv6_unicast %}
-{%-   if 'receive' in conf_peer_group.address_family.ipv6_unicast.capability.orf.prefix_list %}
+{%-   if 'orf' in conf_peer_group.address_family.ipv6_unicast.capability %}
+{%-     if 'receive' in conf_peer_group.address_family.ipv6_unicast.capability.orf.prefix_list %}
   neighbor {{ pr_group }} capability orf prefix-list receive
 {%-   endif %}
-{%-   if 'send' in conf_peer_group.address_family.ipv6_unicast.capability.orf.prefix_list %}
+{%-     if 'send' in conf_peer_group.address_family.ipv6_unicast.capability.orf.prefix_list %}
   neighbor {{ pr_group }} capability orf prefix-list send 
+{%-     endif %}
 {%-   endif %}
 {%- endif %}
 
@@ -650,11 +654,13 @@ router bgp {{ asn }}
 {#- END attribute-unchanged #}
 
 {%- if 'capability' in conf_peer.address_family.ipv4_unicast %}
-{%-   if 'receive' in conf_peer.address_family.ipv4_unicast.capability.orf.prefix_list %}
+{%-   if 'orf' in conf_peer.address_family.ipv4_unicast.capability %}
+{%-     if 'receive' in conf_peer.address_family.ipv4_unicast.capability.orf.prefix_list %}
   neighbor {{ peer }} capability orf prefix-list receive
-{%-   endif %}
-{%-   if 'send' in conf_peer.address_family.ipv4_unicast.capability.orf.prefix_list %}
+{%-     endif %}
+{%-     if 'send' in conf_peer.address_family.ipv4_unicast.capability.orf.prefix_list %}
   neighbor {{ peer }} capability orf prefix-list send 
+{%-     endif %}
 {%-   endif %}
 {%- endif %}
 
@@ -783,11 +789,13 @@ router bgp {{ asn }}
 {#- END attribute-unchanged #}
 
 {%- if 'capability' in conf_peer.address_family.ipv6_unicast %}
-{%-   if 'receive' in conf_peer.address_family.ipv6_unicast.capability.orf.prefix_list %}
+{%-   if 'orf' in conf_peer.address_family.ipv6_unicast.capability %}
+{%-     if 'receive' in conf_peer.address_family.ipv6_unicast.capability.orf.prefix_list %}
   neighbor {{ peer }} capability orf prefix-list receive
-{%-   endif %}
-{%-   if 'send' in conf_peer.address_family.ipv6_unicast.capability.orf.prefix_list %}
-  neighbor {{ peer }} capability orf prefix-list send 
+{%-     endif %}
+{%-     if 'send' in conf_peer.address_family.ipv6_unicast.capability.orf.prefix_list %}
+  neighbor {{ peer }} capability orf prefix-list send
+{%-     endif %}
 {%-   endif %}
 {%- endif %}
 
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 dcdc0eb66..63bf582db 100644
--- a/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -59,6 +59,13 @@
         <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>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index e1469d6ad..f2cc01301 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -282,7 +282,7 @@
               <constraint>
                 <validator name="ipv4-address"/>
                 <validator name="ipv6-address"/>
-                <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex>
+                <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
               </constraint>
             </properties>
             <children>
@@ -636,7 +636,7 @@
                   </valueHelp>
                   <constraint>
                     <validator name="ipv4-address"/>
-                    <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex>
+                    <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
                   </constraint>
                 </properties>
               </leafNode>
@@ -1142,7 +1142,7 @@
                   </valueHelp>
                   <constraint>
                     <validator name="ipv4-address"/>
-                    <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex>
+                    <regex>(br|bond|dum|en|eth|gnv|lo|peth|tun|vti|tun|vxlan|wg|wlan)[0-9]+</regex>
                   </constraint>
                 </properties>
               </leafNode>