From 373132a899cd53eaebedd23bd44702d245ce8165 Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Wed, 29 Dec 2021 17:57:38 +0200
Subject: FRR: T4020: Updated CLI options processing for FRR daemons

- Reverted changes from `python/vyos/util.py`. This may lead to
unnecessary FRR restart during each boot, depending on a default file
content and template, but makes this changeset cleaner.
- Fixed typos in node names (extra `>` characters).
- Added SNMP module for `isisd` and `ldpd`, since they have it compiled
now.
---
 interface-definitions/system-frr.xml.in | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/system-frr.xml.in')

diff --git a/interface-definitions/system-frr.xml.in b/interface-definitions/system-frr.xml.in
index e8b447f58..9fe23ed75 100644
--- a/interface-definitions/system-frr.xml.in
+++ b/interface-definitions/system-frr.xml.in
@@ -11,13 +11,13 @@
         <children>
           <leafNode name="bmp">
             <properties>
-              <help>>Enable BGP Monitoring Protocol support</help>
+              <help>Enable BGP Monitoring Protocol support</help>
               <valueless/>
             </properties>
           </leafNode>
           <leafNode name="irdp">
             <properties>
-              <help>>Enable ICMP Router Discovery Protocol support</help>
+              <help>Enable ICMP Router Discovery Protocol support</help>
               <valueless/>
             </properties>
           </leafNode>
@@ -28,31 +28,43 @@
             <children>
               <leafNode name="bgpd">
                 <properties>
-                  <help>>BGP</help>
+                  <help>BGP</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="isisd">
+                <properties>
+                  <help>IS-IS</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="ldpd">
+                <properties>
+                  <help>LDP</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="ospf6d">
                 <properties>
-                  <help>>OSPFv3</help>
+                  <help>OSPFv3</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="ospfd">
                 <properties>
-                  <help>>OSPFv2</help>
+                  <help>OSPFv2</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="ripd">
                 <properties>
-                  <help>>RIP</help>
+                  <help>RIP</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="zebra">
                 <properties>
-                  <help>>Zebra (IP routing manager)</help>
+                  <help>Zebra (IP routing manager)</help>
                   <valueless/>
                 </properties>
               </leafNode>
@@ -63,4 +75,3 @@
     </children>
   </node>
 </interfaceDefinition>
-
-- 
cgit v1.2.3