From edc64e7fb63757a3779df12945ecefca9c462952 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 25 Jun 2025 17:35:01 +0100
Subject: op-mode: T7560: add support for virtual tag nodes for cases when
 commands need both fixed and variable arguments

---
 op-mode-definitions/show-interfaces-bonding.xml.in | 117 ++++++++++-----------
 1 file changed, 58 insertions(+), 59 deletions(-)

(limited to 'op-mode-definitions/show-interfaces-bonding.xml.in')

diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in
index 839a4cd91..58f754ad6 100644
--- a/op-mode-definitions/show-interfaces-bonding.xml.in
+++ b/op-mode-definitions/show-interfaces-bonding.xml.in
@@ -4,26 +4,17 @@
     <children>
       <node name="interfaces">
         <children>
-          <tagNode name="bonding">
+          <node name="bonding">
             <properties>
-              <help>Show specified Bonding interface information</help>
-              <completionHelp>
-                <path>interfaces bonding</path>
-              </completionHelp>
+              <help>Show specified bonding interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bonding</command>
             <children>
-              <leafNode name="brief">
-                <properties>
-                  <help>Show summary of the specified bonding interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bonding</command>
-              </leafNode>
               <leafNode name="detail">
                 <properties>
-                  <help>Show detailed interface information</help>
+                  <help>Show detailed bonding interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_bonding_detail.sh "$4"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf-type=bonding</command>
               </leafNode>
               <node name="lacp">
                 <properties>
@@ -34,13 +25,7 @@
                     <properties>
                       <help>Show LACP details</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail --interface="$4" </command>
-                  </leafNode>
-                  <leafNode name="neighbors">
-                    <properties>
-                      <help>Show LACP Neighbors</help>
-                    </properties>
-                    <command>${vyos_op_scripts_dir}/bonding.py show_lacp_neighbors --interface="$4"</command>
+                    <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail</command>
                   </leafNode>
                 </children>
               </node>
@@ -48,59 +33,73 @@
                 <properties>
                   <help>Show specified bonding interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show-bond.py --interface "$4"</command>
+                <command>${vyos_op_scripts_dir}/show-bond.py --slaves</command>
               </leafNode>
-              <tagNode name="vif">
+              <virtualTagNode>
                 <properties>
-                  <help>Show specified virtual network interface (vif) information</help>
                   <completionHelp>
-                    <path>interfaces bonding ${COMP_WORDS[3]} vif</path>
+                    <path>interfaces bonding</path>
                   </completionHelp>
-                </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=bonding</command>
+	        </properties>
+	        <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bonding</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
-                      <help>Show summary of specified virtual network interface (vif) information</help>
+                      <help>Show summary of the specified bonding interface information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=bonding</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=bonding</command>
                   </leafNode>
-                </children>
-              </tagNode>
-              #include <include/show-interface-type-event-log.xml.i>
-            </children>
-          </tagNode>
-          <node name="bonding">
-            <properties>
-              <help>Show Bonding interface information</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=bonding</command>
-            <children>
-              <leafNode name="detail">
-                <properties>
-                  <help>Show detailed bonding interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/interfaces.py show --intf-type=bonding</command>
-              </leafNode>
-              <node name="lacp">
-                <properties>
-                  <help>Show LACP related info</help>
-                </properties>
-                <children>
                   <leafNode name="detail">
                     <properties>
-                      <help>Show LACP details</help>
+                      <help>Show detailed interface information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail</command>
+                    <command>${vyos_op_scripts_dir}/show_bonding_detail.sh "$4"</command>
+                  </leafNode>
+                  <node name="lacp">
+                    <properties>
+                      <help>Show LACP related info</help>
+                    </properties>
+                    <children>
+                      <leafNode name="detail">
+                        <properties>
+                          <help>Show LACP details</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail --interface="$4" </command>
+                      </leafNode>
+                      <leafNode name="neighbors">
+                        <properties>
+                          <help>Show LACP Neighbors</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/bonding.py show_lacp_neighbors --interface="$4"</command>
+                      </leafNode>
+                    </children>
+                  </node>
+                  <leafNode name="slaves">
+                    <properties>
+                      <help>Show specified bonding interface information</help>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/show-bond.py --interface "$4"</command>
                   </leafNode>
+                  <tagNode name="vif">
+                    <properties>
+                      <help>Show specified virtual network interface (vif) information</help>
+                      <completionHelp>
+                        <path>interfaces bonding ${COMP_WORDS[3]} vif</path>
+                      </completionHelp>
+                    </properties>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4.$6" --intf-type=bonding</command>
+                    <children>
+                      <leafNode name="brief">
+                        <properties>
+                          <help>Show summary of specified virtual network interface (vif) information</help>
+                        </properties>
+                        <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4.$6" --intf-type=bonding</command>
+                      </leafNode>
+                    </children>
+                  </tagNode>
+                  #include <include/show-interface-type-event-log.xml.i>
                 </children>
-              </node>
-              <leafNode name="slaves">
-                <properties>
-                  <help>Show specified bonding interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/show-bond.py --slaves</command>
-              </leafNode>
+              </virtualTagNode>
             </children>
           </node>
         </children>
-- 
cgit v1.2.3