From 55bf54afb750cb8171b0c878699879107b4fbbe9 Mon Sep 17 00:00:00 2001
From: Viacheslav <v.gletenko@vyos.io>
Date: Tue, 4 Jan 2022 11:39:02 +0000
Subject: firewall: T4132: Fix for op-mode show firewall group After firewall
 rewriting there is impossible to show a specific firewall group, this commit
 fixes it. Add tagNode and completion help for op-mode firewall group

---
 op-mode-definitions/firewall.xml.in | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/op-mode-definitions/firewall.xml.in b/op-mode-definitions/firewall.xml.in
index 84df67b3d..b5dee7c9e 100644
--- a/op-mode-definitions/firewall.xml.in
+++ b/op-mode-definitions/firewall.xml.in
@@ -112,11 +112,24 @@
           <help>Show firewall information</help>
         </properties>
         <children>
-          <leafNode name="group">
+          <tagNode name="group">
             <properties>
               <help>Show firewall group</help>
+              <completionHelp>
+                <path>firewall group address-group</path>
+                <path>firewall group network-group</path>
+                <path>firewall group port-group</path>
+                <path>firewall group ipv6-address-group</path>
+                <path>firewall group ipv6-network-group</path>
+              </completionHelp>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/firewall.py --action show_group --name $4</command>
+          </tagNode>
+          <leafNode name="group">
+            <properties>
+              <help>Show firewall group</help>
+            </properties>
+            <command>sudo ${vyos_op_scripts_dir}/firewall.py --action show_group</command>
           </leafNode>
           <tagNode name="ipv6-name">
             <properties>
-- 
cgit v1.2.3