summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNataliia Solomko <natalirs1985@gmail.com>2024-08-14 13:20:46 +0300
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-08-15 07:22:59 +0000
commit01d8406b9ad127c7a450731430744816c297f5cf (patch)
tree28997c9c1c5eb755fae9e4f45e819904127043af
parent2aa26f836caf777255a06083208ee7bb9dab4726 (diff)
downloadvyos-1x-01d8406b9ad127c7a450731430744816c297f5cf.tar.gz
vyos-1x-01d8406b9ad127c7a450731430744816c297f5cf.zip
op_mode: T6651: Add a top level op mode word "execute"mergify/bp/circinus/pr-3980
(cherry picked from commit 69ab44309d56d73d92c2f8a7b0b4ca3016e61ff6)
-rw-r--r--op-mode-definitions/execute.xml.in8
-rw-r--r--python/vyos/opmode.py2
-rw-r--r--src/opt/vyatta/etc/shell/level/users/allowed-op1
-rw-r--r--src/opt/vyatta/etc/shell/level/users/allowed-op.in1
4 files changed, 11 insertions, 1 deletions
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
index 74c45af37..381fd26e5 100644
--- a/src/opt/vyatta/etc/shell/level/users/allowed-op
+++ b/src/opt/vyatta/etc/shell/level/users/allowed-op
@@ -6,6 +6,7 @@ clear
connect
delete
disconnect
+execute
exit
force
monitor
diff --git a/src/opt/vyatta/etc/shell/level/users/allowed-op.in b/src/opt/vyatta/etc/shell/level/users/allowed-op.in
index 1976904e4..9752f99a2 100644
--- a/src/opt/vyatta/etc/shell/level/users/allowed-op.in
+++ b/src/opt/vyatta/etc/shell/level/users/allowed-op.in
@@ -2,6 +2,7 @@ clear
connect
delete
disconnect
+execute
exit
force
monitor