diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-08-15 11:14:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 11:14:56 +0100 |
| commit | 1ffdf48642e454d7f9ddead8d79f19b96dea00d4 (patch) | |
| tree | 28997c9c1c5eb755fae9e4f45e819904127043af | |
| parent | 2aa26f836caf777255a06083208ee7bb9dab4726 (diff) | |
| parent | 01d8406b9ad127c7a450731430744816c297f5cf (diff) | |
| download | vyos-1x-1ffdf48642e454d7f9ddead8d79f19b96dea00d4.tar.gz vyos-1x-1ffdf48642e454d7f9ddead8d79f19b96dea00d4.zip | |
Merge pull request #3985 from vyos/mergify/bp/circinus/pr-3980
op_mode: T6651: Add a top level op mode word "execute" (backport #3980)
| -rw-r--r-- | op-mode-definitions/execute.xml.in | 8 | ||||
| -rw-r--r-- | python/vyos/opmode.py | 2 | ||||
| -rw-r--r-- | src/opt/vyatta/etc/shell/level/users/allowed-op | 1 | ||||
| -rw-r--r-- | src/opt/vyatta/etc/shell/level/users/allowed-op.in | 1 |
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 |