From 73557d68b1cb54714fc0c3652a9ab29559da00ee Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 29 Mar 2021 18:30:28 +0200
Subject: bgp: T1711: remove ASN tagNode and move to "local-as"

Every time when set configuration bgp, you need set AS number. There is very
less benefit in this system so the AS number is moved from a tagNode level down
to a leafNode with the name "local-as", same as on the neighbor or peer-group
level.

This changes the CLI configuration from:

set protocols bgp 100 neighbor 10.10.1.2 remote-as 200

to

set protocols bgp local-as 100
set protocols bgp neighbor 10.10.1.2 remote-as 200
---
 .../include/bgp/bgp-common-config.xml.i                  | 16 ++++++++++++++--
 interface-definitions/protocols-bgp.xml.in               | 11 ++---------
 interface-definitions/vrf.xml.in                         | 11 ++---------
 3 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i
index ae0e8b178..c89e2288e 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/bgp-common-config.xml.i
@@ -280,7 +280,7 @@
 </node>
 <node name="listen">
   <properties>
-    <help>Listen for and accept BGP dynamic neighbors from range</help>
+    <help>BGP dynamic neighbors listen commands</help>
   </properties>
   <children>
     <leafNode name="limit">
@@ -297,7 +297,7 @@
     </leafNode>
     <tagNode name="range">
       <properties>
-        <help>BGP dynamic neighbors listen range</help>
+        <help>Dynamic neighbors listen range</help>
         <valueHelp>
           <format>ipv4net</format>
           <description>IPv4 dynamic neighbors listen range</description>
@@ -317,6 +317,18 @@
     </tagNode>
   </children>
 </node>
+<leafNode name="local-as">
+  <properties>
+    <help>Autonomous System Number (ASN)</help>
+    <valueHelp>
+      <format>u32:1-4294967294</format>
+      <description>Autonomous System Number</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967294"/>
+    </constraint>
+  </properties>
+</leafNode>
 <tagNode name="neighbor">
   <properties>
     <help>BGP neighbor</help>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index cf897d04f..d610f8dff 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -2,22 +2,15 @@
 <interfaceDefinition>
   <node name="protocols">
     <children>
-      <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py">
+      <node name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py">
         <properties>
           <help>Border Gateway Protocol (BGP)</help>
           <priority>820</priority>
-          <valueHelp>
-            <format>u32:1-4294967294</format>
-            <description>Autonomous System Number</description>
-          </valueHelp>
-          <constraint>
-            <validator name="numeric" argument="--range 1-4294967294"/>
-          </constraint>
         </properties>
         <children>
           #include <include/bgp/bgp-common-config.xml.i>
         </children>
-      </tagNode>
+      </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 7e5765c54..8a56b1bc0 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -33,22 +33,15 @@
               <help>Routing protocol parameters</help>
             </properties>
             <children>
-              <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py $VAR(../../@)">
+              <node name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py $VAR(../../@)">
                 <properties>
                   <help>Border Gateway Protocol (BGP)</help>
                   <priority>821</priority>
-                  <valueHelp>
-                    <format>u32:1-4294967294</format>
-                    <description>Autonomous System Number</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967294"/>
-                  </constraint>
                 </properties>
                 <children>
                   #include <include/bgp/bgp-common-config.xml.i>
                 </children>
-              </tagNode>
+              </node>
               <node name="isis" owner="${vyos_conf_scripts_dir}/protocols_isis.py $VAR(../../@)">
                 <properties>
                   <help>Intermediate System to Intermediate System (IS-IS)</help>
-- 
cgit v1.2.3