From 316cdd5294f6de3dd5aef3a062e9877dd28d6773 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Wed, 14 Aug 2024 13:20:46 +0300
Subject: op_mode: T6651: Add a top level op mode word "execute"

(cherry picked from commit 69ab44309d56d73d92c2f8a7b0b4ca3016e61ff6)

# Conflicts:
#	src/opt/vyatta/etc/shell/level/users/allowed-op
#	src/opt/vyatta/etc/shell/level/users/allowed-op.in
---
 op-mode-definitions/execute.xml.in                 |  8 ++++++++
 python/vyos/opmode.py                              |  2 +-
 src/opt/vyatta/etc/shell/level/users/allowed-op    | 21 +++++++++++++++++++++
 src/opt/vyatta/etc/shell/level/users/allowed-op.in | 17 +++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 op-mode-definitions/execute.xml.in
 create mode 100644 src/opt/vyatta/etc/shell/level/users/allowed-op
 create mode 100644 src/opt/vyatta/etc/shell/level/users/allowed-op.in

diff --git a/op-mode-definitions/execute.xml.in b/op-mode-definitions/execute.xml.in
new file mode 100644
index 000000000..66069c927
--- /dev/null
+++ b/op-mode-definitions/execute.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="execute">
+    <properties>
+      <help>Initiate an operation</help>
+    </properties>
+  </node>
+</interfaceDefinition>
\ No newline at end of file
diff --git a/python/vyos/opmode.py b/python/vyos/opmode.py
index b52da9d4e..55213c453 100644
--- a/python/vyos/opmode.py
+++ b/python/vyos/opmode.py
@@ -81,7 +81,7 @@ class InternalError(Error):
 
 
 def _is_op_mode_function_name(name):
-    if re.match(r"^(show|clear|reset|restart|add|update|delete|generate|set|renew|release)", name):
+    if re.match(r"^(show|clear|reset|restart|add|update|delete|generate|set|renew|release|execute)", name):
         return True
     else:
         return False
diff --git a/src/opt/vyatta/etc/shell/level/users/allowed-op b/src/opt/vyatta/etc/shell/level/users/allowed-op
new file mode 100644
index 000000000..381fd26e5
--- /dev/null
+++ b/src/opt/vyatta/etc/shell/level/users/allowed-op
@@ -0,0 +1,21 @@
+c
+cl
+cle
+clea
+clear
+connect
+delete
+disconnect
+execute
+exit
+force
+monitor
+ping
+reset
+release
+renew
+set
+show
+telnet
+traceroute
+update
diff --git a/src/opt/vyatta/etc/shell/level/users/allowed-op.in b/src/opt/vyatta/etc/shell/level/users/allowed-op.in
new file mode 100644
index 000000000..9752f99a2
--- /dev/null
+++ b/src/opt/vyatta/etc/shell/level/users/allowed-op.in
@@ -0,0 +1,17 @@
+clear
+connect
+delete
+disconnect
+execute
+exit
+force
+monitor
+ping
+reset
+release
+renew
+set
+show
+telnet
+traceroute
+update
-- 
cgit v1.2.3