From 65622a733df80ecee2192f3cd5758a27e4324b3b Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Tue, 10 Sep 2024 16:00:13 +0300
Subject: op-mode: T6694: Move some op-mode commands in the "execute" family
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

'force netns' — move to 'execute shell netns'.
'force vrf'— move to 'execute shell vrf'.
'force owping' — move to 'execute owping'.
'force twping' — move to 'execute twping'.
'monitor bandwidth-test' — move to 'execute bandwidth-test`.
'telnet' — move to 'execute telnet'
---
 op-mode-definitions/execute-bandwidth-test.xml.in | 59 +++++++++++++++++++++++
 op-mode-definitions/execute-shell.xml.in          | 32 ++++++++++++
 op-mode-definitions/execute-wamp.xml.in           | 25 ++++++++++
 op-mode-definitions/force-netns.xml.in            | 16 ------
 op-mode-definitions/force-vrf.xml.in              | 16 ------
 op-mode-definitions/force-wamp.xml.in             | 25 ----------
 op-mode-definitions/monitor-bandwidth-test.xml.in | 59 -----------------------
 op-mode-definitions/telnet.xml.in                 | 35 ++++++++------
 op-mode-definitions/wake-on-lan.xml.in            |  2 +-
 9 files changed, 137 insertions(+), 132 deletions(-)
 create mode 100644 op-mode-definitions/execute-bandwidth-test.xml.in
 create mode 100644 op-mode-definitions/execute-shell.xml.in
 create mode 100644 op-mode-definitions/execute-wamp.xml.in
 delete mode 100644 op-mode-definitions/force-netns.xml.in
 delete mode 100644 op-mode-definitions/force-vrf.xml.in
 delete mode 100644 op-mode-definitions/force-wamp.xml.in
 delete mode 100644 op-mode-definitions/monitor-bandwidth-test.xml.in

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/execute-bandwidth-test.xml.in b/op-mode-definitions/execute-bandwidth-test.xml.in
new file mode 100644
index 000000000..1581d5c25
--- /dev/null
+++ b/op-mode-definitions/execute-bandwidth-test.xml.in
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="execute">
+    <children>
+      <node name="bandwidth-test">
+        <properties>
+          <help>Initiate or wait for bandwidth test</help>
+        </properties>
+        <children>
+          <node name="accept">
+            <properties>
+              <help>Wait for bandwidth test connections (port TCP/5001)</help>
+            </properties>
+            <command>/usr/bin/iperf -V -s</command>
+            <children>
+              <leafNode name="tcp">
+                <properties>
+                  <help>Wait for bandwidth test connections (port TCP/5001)</help>
+                </properties>
+                <command>/usr/bin/iperf -V -s</command>
+              </leafNode>
+              <leafNode name="udp">
+                <properties>
+                  <help>Wait for bandwidth test connections (port UDP/5001)</help>
+                </properties>
+                <command>/usr/bin/iperf -V -s -u</command>
+              </leafNode>
+            </children>
+          </node>
+          <node name="initiate">
+            <properties>
+              <help>Initiate a bandwidth test to specified host</help>
+            </properties>
+            <children>
+              <tagNode name="tcp">
+                <properties>
+                  <help>Initiate a bandwidth test to specified host (port TCP/5001)</help>
+                  <completionHelp>
+                    <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/execute_bandwidth_test.sh "$5"</command>
+              </tagNode>
+              <tagNode name="udp">
+                <properties>
+                  <help>Initiate a bandwidth test to specified host (port UDP/5001)</help>
+                  <completionHelp>
+                    <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/execute_bandwidth_test.sh "$5" "-u"</command>
+              </tagNode>
+            </children>
+          </node>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/execute-shell.xml.in b/op-mode-definitions/execute-shell.xml.in
new file mode 100644
index 000000000..dfdc1e371
--- /dev/null
+++ b/op-mode-definitions/execute-shell.xml.in
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="execute">
+    <children>
+      <node name="shell">
+        <properties>
+          <help>Execute shell</help>
+        </properties>
+        <children>
+          <tagNode name="netns">
+            <properties>
+              <help>Execute shell in given Network Namespace</help>
+              <completionHelp>
+                <path>netns name</path>
+              </completionHelp>
+            </properties>
+            <command>sudo ip netns exec $4 su - $(whoami)</command>
+          </tagNode>
+          <tagNode name="vrf">
+            <properties>
+              <help>Execute shell in given VRF instance</help>
+              <completionHelp>
+                <path>vrf name</path>
+              </completionHelp>
+            </properties>
+            <command>sudo ip vrf exec $4 su - $(whoami)</command>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/execute-wamp.xml.in b/op-mode-definitions/execute-wamp.xml.in
new file mode 100644
index 000000000..bcceedc53
--- /dev/null
+++ b/op-mode-definitions/execute-wamp.xml.in
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="execute">
+    <children>
+      <tagNode name="owping">
+        <properties>
+          <help>IP address of the remote OWAMP server</help>
+          <completionHelp>
+            <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+          </completionHelp>
+        </properties>
+        <command>owping $3</command>
+      </tagNode>
+      <tagNode name="twping">
+        <properties>
+          <help>IP address of the remote TWAMP server</help>
+          <completionHelp>
+            <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
+          </completionHelp>
+        </properties>
+        <command>twping $3</command>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/force-netns.xml.in b/op-mode-definitions/force-netns.xml.in
deleted file mode 100644
index b9dc2c1e8..000000000
--- a/op-mode-definitions/force-netns.xml.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="force">
-    <children>
-      <tagNode name="netns">
-        <properties>
-          <help>Execute shell in given Network Namespace</help>
-          <completionHelp>
-            <path>netns name</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ip netns exec $3 su - $(whoami)</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/force-vrf.xml.in b/op-mode-definitions/force-vrf.xml.in
deleted file mode 100644
index 71f50b0d2..000000000
--- a/op-mode-definitions/force-vrf.xml.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="force">
-    <children>
-      <tagNode name="vrf">
-        <properties>
-          <help>Execute shell in given VRF instance</help>
-          <completionHelp>
-            <path>vrf name</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ip vrf exec $3 su - $(whoami)</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/force-wamp.xml.in b/op-mode-definitions/force-wamp.xml.in
deleted file mode 100644
index dbb205c6b..000000000
--- a/op-mode-definitions/force-wamp.xml.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="force">
-    <children>
-      <tagNode name="owping">
-        <properties>
-          <help>IP address of the remote OWAMP server</help>
-          <completionHelp>
-            <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-          </completionHelp>
-        </properties>
-        <command>owping $3</command>
-      </tagNode>
-      <tagNode name="twping">
-        <properties>
-          <help>IP address of the remote TWAMP server</help>
-          <completionHelp>
-            <list>&lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-          </completionHelp>
-        </properties>
-        <command>twping $3</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/monitor-bandwidth-test.xml.in b/op-mode-definitions/monitor-bandwidth-test.xml.in
deleted file mode 100644
index 965591280..000000000
--- a/op-mode-definitions/monitor-bandwidth-test.xml.in
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="monitor">
-    <children>
-      <node name="bandwidth-test">
-        <properties>
-          <help>Initiate or wait for bandwidth test</help>
-        </properties>
-        <children>
-          <node name="accept">
-            <properties>
-              <help>Wait for bandwidth test connections (port TCP/5001)</help>
-            </properties>
-            <command>/usr/bin/iperf -V -s</command>
-            <children>
-              <leafNode name="tcp">
-                <properties>
-                  <help>Wait for bandwidth test connections (port TCP/5001)</help>
-                </properties>
-                <command>/usr/bin/iperf -V -s</command>
-              </leafNode>
-              <leafNode name="udp">
-                <properties>
-                  <help>Wait for bandwidth test connections (port UDP/5001)</help>
-                </properties>
-                <command>/usr/bin/iperf -V -s -u</command>
-              </leafNode>
-            </children>
-          </node>
-          <node name="initiate">
-            <properties>
-              <help>Initiate a bandwidth test to specified host</help>
-            </properties>
-            <children>
-              <tagNode name="tcp">
-                <properties>
-                  <help>Initiate a bandwidth test to specified host (port TCP/5001)</help>
-                  <completionHelp>
-                    <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                  </completionHelp>
-                </properties>
-                <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5"</command>
-              </tagNode>
-              <tagNode name="udp">
-                <properties>
-                  <help>Initiate a bandwidth test to specified host (port UDP/5001)</help>
-                  <completionHelp>
-                    <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-                  </completionHelp>
-                </properties>
-                <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5" "-u"</command>
-              </tagNode>
-            </children>
-          </node>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/telnet.xml.in b/op-mode-definitions/telnet.xml.in
index c5bb6d283..2cacc6a26 100644
--- a/op-mode-definitions/telnet.xml.in
+++ b/op-mode-definitions/telnet.xml.in
@@ -1,30 +1,35 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="telnet">
-    <properties>
-      <help>Telnet to a node</help>
-    </properties>
+  <node name="execute">
     <children>
-      <tagNode name="to">
+      <node name="telnet">
         <properties>
-          <help>Telnet to a host</help>
-          <completionHelp>
-            <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-          </completionHelp>
+          <help>Telnet to a node</help>
         </properties>
-        <command>/usr/bin/telnet $3</command>
         <children>
-          <tagNode name="port">
+          <tagNode name="to">
             <properties>
-              <help>Telnet to a host:port</help>
+              <help>Telnet to a host</help>
               <completionHelp>
-                <list>&lt;0-65535&gt;</list>
+                <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
               </completionHelp>
             </properties>
-            <command>/usr/bin/telnet $3 $5</command>
+            <command>/usr/bin/telnet $4</command>
+            <children>
+              <tagNode name="port">
+                <properties>
+                  <help>Telnet to a host:port</help>
+                  <completionHelp>
+                    <list>&lt;0-65535&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>/usr/bin/telnet $4 $6</command>
+              </tagNode>
+            </children>
           </tagNode>
         </children>
-      </tagNode>
+      </node>
     </children>
   </node>
 </interfaceDefinition>
+
diff --git a/op-mode-definitions/wake-on-lan.xml.in b/op-mode-definitions/wake-on-lan.xml.in
index 625cf4056..d4589c868 100644
--- a/op-mode-definitions/wake-on-lan.xml.in
+++ b/op-mode-definitions/wake-on-lan.xml.in
@@ -19,7 +19,7 @@
                 <properties>
                   <help>Station (MAC) address to wake up</help>
                 </properties>
-                <command>sudo /usr/sbin/etherwake -i "$3" "$5"</command>
+                <command>sudo /usr/sbin/etherwake -i "$4" "$6"</command>
               </tagNode>
             </children>
             </tagNode>
-- 
cgit v1.2.3