summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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-op21
-rw-r--r--src/opt/vyatta/etc/shell/level/users/allowed-op.in17
4 files changed, 47 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
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