From 8ad8b0d51bf21c583e6d687576cb1a61195e7215 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 25 Aug 2021 14:44:21 +0200
Subject: op-mode: T3776: drop "frr" level from "restart frr
 ospfd|bgpd|staticd" commands

The current command to restart any of the FRR processes is:

vyos@vyos:~$ restart frr
Possible completions:
  <Enter>       Execute the current command
  bfdd          Restart Bidirectional Forwarding Detection daemon
  bgpd          Restart Border Gateway Protocol daemon
  ospf6d        Restart OSPFv3 daemon
  ospfd         Restart OSPFv2 daemon
  ripd          Restart Routing Information Protocol daemon
  ripngd        Restart RIPng daemon
  staticd       Restart Static Route daemon
  zebra         Restart IP routing manager daemon

From a real-life example: Two engineers needed 5 minutes to figure it is under
"restart frr" - that is why this commit drops the artificial "frr" level on the
op-mode commands to restart routing protocol daemons.

It's less intuitive to have "restart frr ospfd" or "restart frr bgpd" compared
to "restart ospf" and "restart bgp" - we have the same for "restart ssh" or
"restart snmp" and not "restart openssh sshd".

This commit also drops the d (daemon) suffix of the op-mode comamands so the
commands align with the VyOS CLI, else there would be a miss-understanding from
ospf6d to ospfv3.
---
 op-mode-definitions/restart-frr.xml.in | 104 ++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/op-mode-definitions/restart-frr.xml.in b/op-mode-definitions/restart-frr.xml.in
index 96ad1a650..a5ba5b11f 100644
--- a/op-mode-definitions/restart-frr.xml.in
+++ b/op-mode-definitions/restart-frr.xml.in
@@ -2,62 +2,60 @@
 <interfaceDefinition>
   <node name="restart">
     <children>
-      <node name="frr">
+      <leafNode name="all">
         <properties>
-          <help>Restart FRRouting daemons</help>
+          <help>Restart all routing daemons</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart</command>
-        <children>
-          <leafNode name="bfdd">
-            <properties>
-              <help>Restart Bidirectional Forwarding Detection daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bfdd</command>
-          </leafNode>
-          <leafNode name="bgpd">
-            <properties>
-              <help>Restart Border Gateway Protocol daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bgpd</command>
-          </leafNode>
-          <leafNode name="ospfd">
-            <properties>
-              <help>Restart OSPFv2 daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospfd</command>
-          </leafNode>
-          <leafNode name="ospf6d">
-            <properties>
-              <help>Restart OSPFv3 daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospf6d</command>
-          </leafNode>
-          <leafNode name="ripd">
-            <properties>
-              <help>Restart Routing Information Protocol daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripd</command>
-          </leafNode>
-          <leafNode name="ripngd">
-            <properties>
-              <help>Restart RIPng daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripngd</command>
-          </leafNode>
-          <leafNode name="staticd">
-            <properties>
-              <help>Restart Static Route daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon staticd</command>
-          </leafNode>
-          <leafNode name="zebra">
-            <properties>
-              <help>Restart IP routing manager daemon</help>
-            </properties>
-            <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon zebra</command>
-          </leafNode>
-        </children>
-      </node>
+      </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">
+        <properties>
+          <help>Restart Border Gateway Protocol (BGP) routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon bgpd</command>
+      </leafNode>
+      <leafNode name="ospf">
+        <properties>
+          <help>Restart Open Shortest Path First (OSPF) routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospfd</command>
+      </leafNode>
+      <leafNode name="ospfv3">
+        <properties>
+          <help>Restart IPv6 Open Shortest Path First (OSPFv3) routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ospf6d</command>
+      </leafNode>
+      <leafNode name="rip">
+        <properties>
+          <help>Restart Routing Information Protocol (RIP) routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripd</command>
+      </leafNode>
+      <leafNode name="ripng">
+        <properties>
+          <help>Restart Routing Information Protocol NG (RIPng) routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon ripngd</command>
+      </leafNode>
+      <leafNode name="static">
+        <properties>
+          <help>Restart static routing daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon staticd</command>
+      </leafNode>
+      <leafNode name="zebra">
+        <properties>
+          <help>Restart Routing Information Base (RIB) manager daemon</help>
+        </properties>
+        <command>sudo ${vyos_op_scripts_dir}/restart_frr.py --action restart --daemon zebra</command>
+      </leafNode>
     </children>
   </node>
 </interfaceDefinition>
-- 
cgit v1.2.3