From 8d6a798a470d9f69c9d31465dfe63e8acf6b0976 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Thu, 11 Jan 2024 11:00:17 +0000
Subject: T5919: firewall: fix <show firewall ipv6 ..> command

(cherry picked from commit 089280f82349cd7b77649eb71729be1e73714b52)
---
 op-mode-definitions/firewall.xml.in | 115 ++----------------------------------
 1 file changed, 5 insertions(+), 110 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/firewall.xml.in b/op-mode-definitions/firewall.xml.in
index 4a7ffbb66..76224d99b 100644
--- a/op-mode-definitions/firewall.xml.in
+++ b/op-mode-definitions/firewall.xml.in
@@ -1,110 +1,5 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-<!--
-  <node name="clear">
-    <children>
-      <node name="firewall">
-        <properties>
-          <help>Clear firewall statistics</help>
-        </properties>
-        <children>
-          <tagNode name="ipv6-name">
-            <properties>
-              <help>Clear firewall statistics for chain</help>
-              <completionHelp>
-                <path>firewall ipv6-name</path>
-              </completionHelp>
-            </properties>
-            <children>
-              <leafNode name="counters">
-                <properties>
-                  <help>Clear counters for specified chain</help>
-                </properties>
-                <command>echo "TODO"</command>
-              </leafNode>
-              <tagNode name="rule">
-                <properties>
-                  <help>Clear firewall statistics for a rule</help>
-                  <completionHelp>
-                    <path>firewall ipv6-name ${COMP_WORDS[4]} rule</path>
-                  </completionHelp>
-                </properties>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Clear counters for specified rule</help>
-                    </properties>
-                    <command>echo "TODO"</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </tagNode>
-          <tagNode name="name">
-            <properties>
-              <help>Clear firewall statistics for chain</help>
-              <completionHelp>
-                <path>firewall name</path>
-              </completionHelp>
-            </properties>
-            <children>
-              <leafNode name="counters">
-                <properties>
-                  <help>Clear counters for specified chain</help>
-                </properties>
-                <command>echo "TODO"</command>
-              </leafNode>
-              <tagNode name="rule">
-                <properties>
-                  <help>Clear firewall statistics for a rule</help>
-                  <completionHelp>
-                    <path>firewall name ${COMP_WORDS[4]} rule</path>
-                  </completionHelp>
-                </properties>
-                <children>
-                  <leafNode name="counters">
-                    <properties>
-                      <help>Clear counters for specified rule</help>
-                    </properties>
-                    <command>echo "TODO"</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
--->
-<!--
-  <node name="reset">
-    <children>
-      <node name="firewall">
-        <properties>
-          <help>Reset a firewall group</help>
-        </properties>
-        <children>
-          <tagNode name="address-group">
-            <properties>
-              <help>Reset a firewall address group</help>
-            </properties>
-          </tagNode>
-          <tagNode name="network-group">
-            <properties>
-              <help>Reset a firewall network group</help>
-            </properties>
-          </tagNode>
-          <tagNode name="port-group">
-            <properties>
-              <help>Reset a firewall port group</help>
-            </properties>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
--->
   <node name="show">
     <children>
       <node name="firewall">
@@ -173,7 +68,7 @@
                     <properties>
                       <help>Show summary of bridge custom firewall ruleset</help>
                       <completionHelp>
-                        <path>firewall bridge name ${COMP_WORDS[6]} rule</path>
+                        <path>firewall bridge name ${COMP_WORDS[5]} rule</path>
                       </completionHelp>
                     </properties>
                     <command>sudo ${vyos_op_scripts_dir}/firewall.py --action show --family $3 --hook $4 --priority $5 --rule $7</command>
@@ -261,11 +156,11 @@
                   </node>
                 </children>
               </node>
-              <tagNode name="ipv6-name">
+              <tagNode name="name">
                 <properties>
                   <help>Show IPv6 custom firewall chains</help>
                   <completionHelp>
-                    <path>firewall ipv6 ipv6-name</path>
+                    <path>firewall ipv6 name</path>
                   </completionHelp>
                 </properties>
                 <children>
@@ -273,7 +168,7 @@
                     <properties>
                       <help>Show summary of IPv6 custom firewall ruleset</help>
                       <completionHelp>
-                        <path>firewall ipv6 ipv6-name ${COMP_WORDS[6]} rule</path>
+                        <path>firewall ipv6 name ${COMP_WORDS[5]} rule</path>
                       </completionHelp>
                     </properties>
                     <command>sudo ${vyos_op_scripts_dir}/firewall.py --action show --family $3 --hook $4 --priority $5 --rule $7</command>
@@ -373,7 +268,7 @@
                     <properties>
                       <help>Show summary of IPv4 custom firewall ruleset</help>
                       <completionHelp>
-                        <path>firewall ipv4 name ${COMP_WORDS[6]} rule</path>
+                        <path>firewall ipv4 name ${COMP_WORDS[5]} rule</path>
                       </completionHelp>
                     </properties>
                     <command>sudo ${vyos_op_scripts_dir}/firewall.py --action show --family $3 --hook $4 --priority $5 --rule $7</command>
-- 
cgit v1.2.3