From d9d2b2b96b372b678af33ce0e0b9d26dfb732934 Mon Sep 17 00:00:00 2001
From: Apachez <Apachez-@users.noreply.github.com>
Date: Thu, 21 Sep 2023 07:31:51 +0200
Subject: frr: T5591: cleanup of daemons file

---
 op-mode-definitions/restart-frr.xml.in | 50 +++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/restart-frr.xml.in b/op-mode-definitions/restart-frr.xml.in
index 4572858b5..2c9d4b1cc 100644
--- a/op-mode-definitions/restart-frr.xml.in
+++ b/op-mode-definitions/restart-frr.xml.in
@@ -8,29 +8,23 @@
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart</command>
       </leafNode>
-      <leafNode name="bfd">
-        <properties>
-          <help>Restart Bidirectional Forwarding Detection (BFD) daemon</help>
-        </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bfdd</command>
-      </leafNode>
-      <leafNode name="bgp">
+      <leafNode name="zebra">
         <properties>
-          <help>Restart Border Gateway Protocol (BGP) routing daemon</help>
+          <help>Restart Routing Information Base (RIB) IP manager daemon</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bgpd</command>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon zebra</command>
       </leafNode>
-      <leafNode name="isis">
+      <leafNode name="static">
         <properties>
-          <help>Restart Intermediate System to Intermediate System (IS-IS) routing daemon</help>
+          <help>Restart static routing daemon</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon isisd</command>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon staticd</command>
       </leafNode>
-      <leafNode name="ldp">
+      <leafNode name="bgp">
         <properties>
-          <help>Restart the Label Distribution Protocol (LDP) daemon</help>
+          <help>Restart Border Gateway Protocol (BGP) routing daemon</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ldpd</command>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bgpd</command>
       </leafNode>
       <leafNode name="ospf">
         <properties>
@@ -52,21 +46,27 @@
       </leafNode>
       <leafNode name="ripng">
         <properties>
-          <help>Restart Routing Information Protocol NG (RIPng) routing daemon</help>
+          <help>Restart IPv6 Routing Information Protocol (RIPng) routing daemon</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripngd</command>
       </leafNode>
-      <leafNode name="static">
+      <leafNode name="isis">
         <properties>
-          <help>Restart static routing daemon</help>
+          <help>Restart Intermediate System to Intermediate System (IS-IS) routing daemon</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon staticd</command>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon isisd</command>
       </leafNode>
-      <leafNode name="zebra">
+      <leafNode name="pim6">
         <properties>
-          <help>Restart Routing Information Base (RIB) manager daemon</help>
+          <help>Restart IPv6 Protocol Independent Multicast (PIM) daemon</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon zebra</command>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon pim6d</command>
+      </leafNode>
+      <leafNode name="ldp">
+        <properties>
+          <help>Restart Label Distribution Protocol (LDP) daemon used by MPLS</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ldpd</command>
       </leafNode>
       <leafNode name="babel">
         <properties>
@@ -74,6 +74,12 @@
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon babeld</command>
       </leafNode>
+      <leafNode name="bfd">
+        <properties>
+          <help>Restart Bidirectional Forwarding Detection (BFD) daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bfdd</command>
+      </leafNode>
     </children>
   </node>
 </interfaceDefinition>
-- 
cgit v1.2.3