From 397b04115ff522f2240059cdb08bdf1561ea8bde Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 24 May 2021 11:03:38 +0200
Subject: op-mode: T3571: add missing "show protocol" help strings

---
 op-mode-definitions/show-arp.xml.in              | 24 +++++++
 op-mode-definitions/show-protocols-bfd.xml.in    | 55 ----------------
 op-mode-definitions/show-protocols-static.xml.in | 49 --------------
 op-mode-definitions/show-protocols.xml.in        | 82 ++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 104 deletions(-)
 create mode 100644 op-mode-definitions/show-arp.xml.in
 delete mode 100644 op-mode-definitions/show-protocols-bfd.xml.in
 delete mode 100644 op-mode-definitions/show-protocols-static.xml.in
 create mode 100644 op-mode-definitions/show-protocols.xml.in

diff --git a/op-mode-definitions/show-arp.xml.in b/op-mode-definitions/show-arp.xml.in
new file mode 100644
index 000000000..12e7d3aa2
--- /dev/null
+++ b/op-mode-definitions/show-arp.xml.in
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="arp">
+        <properties>
+          <help>Show Address Resolution Protocol (ARP) information</help>
+        </properties>
+        <command>/usr/sbin/arp -e -n</command>
+        <children>
+          <tagNode name="interface">
+            <properties>
+              <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+              </completionHelp>
+            </properties>
+            <command>/usr/sbin/arp -e -n -i "$4"</command>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-protocols-bfd.xml.in b/op-mode-definitions/show-protocols-bfd.xml.in
deleted file mode 100644
index 886b01e51..000000000
--- a/op-mode-definitions/show-protocols-bfd.xml.in
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="protocols">
-        <properties>
-          <help>Show protocol specific information</help>
-        </properties>
-        <children>
-          <node name="bfd">
-            <children>
-              <node name="peer">
-                <properties>
-                  <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
-                </properties>
-                <command>vtysh -c "show bfd peers"</command>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
-                    </properties>
-                    <command>vtysh -c "show bfd peers counters"</command>
-                  </leafNode>
-                </children>
-              </node>
-              <tagNode name="peer">
-                <properties>
-                  <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
-                  <completionHelp>
-                    <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
-                  </completionHelp>
-                </properties>
-                <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
-                    </properties>
-                    <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-              <leafNode name="peers">
-                <properties>
-                  <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
-                </properties>
-                <command>vtysh -c "show bfd peers brief"</command>
-              </leafNode>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/show-protocols-static.xml.in b/op-mode-definitions/show-protocols-static.xml.in
deleted file mode 100644
index aaf875072..000000000
--- a/op-mode-definitions/show-protocols-static.xml.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="show">
-    <children>
-      <node name="arp">
-        <properties>
-          <help>Show Address Resolution Protocol (ARP) information</help>
-        </properties>
-        <command>/usr/sbin/arp -e -n</command>
-        <children>
-          <tagNode name="interface">
-            <properties>
-              <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py -b</script>
-              </completionHelp>
-            </properties>
-            <command>/usr/sbin/arp -e -n -i "$4"</command>
-          </tagNode>
-        </children>
-      </node>
-      <node name="protocols">
-        <children>
-          <node name="static">
-            <children>
-              <node name="arp">
-                <properties>
-                  <help>Show Address Resolution Protocol (ARP) information</help>
-                </properties>
-                <command>/usr/sbin/arp -e -n</command>
-                <children>
-                  <tagNode name="interface">
-                    <properties>
-                      <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces.py -b</script>
-                      </completionHelp>
-                    </properties>
-                    <command>/usr/sbin/arp -e -n -i "$6"</command>
-                  </tagNode>
-                </children>
-              </node>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/show-protocols.xml.in b/op-mode-definitions/show-protocols.xml.in
new file mode 100644
index 000000000..d595e2c3c
--- /dev/null
+++ b/op-mode-definitions/show-protocols.xml.in
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="protocols">
+        <properties>
+          <help>Show protocol specific information</help>
+        </properties>
+        <children>
+          <node name="bfd">
+            <properties>
+              <help>Show Bidirectional Forwarding Detection (BFD)</help>
+            </properties>
+            <children>
+              <node name="peer">
+                <properties>
+                  <help>Show all Bidirectional Forwarding Detection (BFD) peer status</help>
+                </properties>
+                <command>vtysh -c "show bfd peers"</command>
+                <children>
+                  <leafNode name="counters">
+                    <properties>
+                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+                    </properties>
+                    <command>vtysh -c "show bfd peers counters"</command>
+                  </leafNode>
+                </children>
+              </node>
+              <tagNode name="peer">
+                <properties>
+                  <help>Show Bidirectional Forwarding Detection (BFD) peer status</help>
+                  <completionHelp>
+                    <script>vtysh -c "show bfd peers" | awk '/[:blank:]*peer/ { printf "%s\n", $2 }'</script>
+                  </completionHelp>
+                </properties>
+                <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer "\"") }'</command>
+                <children>
+                  <leafNode name="counters">
+                    <properties>
+                      <help>Show Bidirectional Forwarding Detection (BFD) peer counters</help>
+                    </properties>
+                    <command>vtysh -c "show bfd peers" | awk -v BFD_PEER=$5 'BEGIN { regex = sprintf("(peer %s.*)vrf", BFD_PEER) } { if (match($0, regex, bfd_peer_value)) peer=bfd_peer_value[1] } END { if (peer) system("vtysh -c \"show bfd " peer " counters\"") }'</command>
+                  </leafNode>
+                </children>
+              </tagNode>
+              <leafNode name="peers">
+                <properties>
+                  <help>Show Bidirectional Forwarding Detection (BFD) peers brief</help>
+                </properties>
+                <command>vtysh -c "show bfd peers brief"</command>
+              </leafNode>
+            </children>
+          </node>
+          <node name="static">
+            <properties>
+              <help>Show static protocol parameters</help>
+            </properties>
+            <children>
+              <node name="arp">
+                <properties>
+                  <help>Show Address Resolution Protocol (ARP) information</help>
+                </properties>
+                <command>/usr/sbin/arp -e -n</command>
+                <children>
+                  <tagNode name="interface">
+                    <properties>
+                      <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+                      </completionHelp>
+                    </properties>
+                    <command>/usr/sbin/arp -e -n -i "$6"</command>
+                  </tagNode>
+                </children>
+              </node>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3