diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-08-02 08:25:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-02 08:25:21 +0200 |
| commit | eff4470d5cd6a099c42875df6f3a9cea9e9a1b3e (patch) | |
| tree | f972bb7066fd821addb181d77a665084659b8d8c | |
| parent | acd77116af06f4eaaeb3c8a1dd4fa394aadc96d2 (diff) | |
| parent | b81730cc2cb9066c66e805473731a0a2195164d6 (diff) | |
| download | vyos-1x-eff4470d5cd6a099c42875df6f3a9cea9e9a1b3e.tar.gz vyos-1x-eff4470d5cd6a099c42875df6f3a9cea9e9a1b3e.zip | |
Merge pull request #4635 from dmbaturin/T6656-op-fixes
op-mode: T6656: fix incorrect op mode command definitions
| -rw-r--r-- | op-mode-definitions/poweroff.xml.in | 2 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml.in | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bonding.xml.in | 43 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-input.xml.in | 34 |
4 files changed, 41 insertions, 40 deletions
diff --git a/op-mode-definitions/poweroff.xml.in b/op-mode-definitions/poweroff.xml.in index e023e80be..9b56cb406 100644 --- a/op-mode-definitions/poweroff.xml.in +++ b/op-mode-definitions/poweroff.xml.in @@ -25,7 +25,7 @@ <list><Minutes></list> </completionHelp> </properties> - <command>${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4</command> + <command>${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3</command> </tagNode> <tagNode name="at"> <properties> diff --git a/op-mode-definitions/reboot.xml.in b/op-mode-definitions/reboot.xml.in index 1fa79da7e..43a1882ac 100644 --- a/op-mode-definitions/reboot.xml.in +++ b/op-mode-definitions/reboot.xml.in @@ -25,7 +25,7 @@ <list><Minutes></list> </completionHelp> </properties> - <command>${vyos_op_scripts_dir}/powerctrl.py --yes --reboot-in $3 $4</command> + <command>${vyos_op_scripts_dir}/powerctrl.py --yes --reboot-in $3</command> </tagNode> <tagNode name="at"> <properties> diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in index 58f754ad6..4f562867f 100644 --- a/op-mode-definitions/show-interfaces-bonding.xml.in +++ b/op-mode-definitions/show-interfaces-bonding.xml.in @@ -8,7 +8,7 @@ <properties> <help>Show specified bonding interface information</help> </properties> - <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=bonding</command> + <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-type=bonding</command> <children> <leafNode name="detail"> <properties> @@ -16,25 +16,6 @@ </properties> <command>${vyos_op_scripts_dir}/interfaces.py show --intf-type=bonding</command> </leafNode> - <node name="lacp"> - <properties> - <help>Show LACP related info</help> - </properties> - <children> - <leafNode name="detail"> - <properties> - <help>Show LACP details</help> - </properties> - <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail</command> - </leafNode> - </children> - </node> - <leafNode name="slaves"> - <properties> - <help>Show specified bonding interface information</help> - </properties> - <command>${vyos_op_scripts_dir}/show-bond.py --slaves</command> - </leafNode> <virtualTagNode> <properties> <completionHelp> @@ -100,7 +81,27 @@ #include <include/show-interface-type-event-log.xml.i> </children> </virtualTagNode> - </children> + + <node name="lacp"> + <properties> + <help>Show LACP related info</help> + </properties> + <children> + <leafNode name="detail"> + <properties> + <help>Show LACP details</help> + </properties> + <command>${vyos_op_scripts_dir}/bonding.py show_lacp_detail</command> + </leafNode> + </children> + </node> + <leafNode name="slaves"> + <properties> + <help>Show specified bonding interface information</help> + </properties> + <command>${vyos_op_scripts_dir}/show-bond.py --slaves</command> + </leafNode> + </children> </node> </children> </node> diff --git a/op-mode-definitions/show-interfaces-input.xml.in b/op-mode-definitions/show-interfaces-input.xml.in index 705b94a1a..c4af6d8a0 100644 --- a/op-mode-definitions/show-interfaces-input.xml.in +++ b/op-mode-definitions/show-interfaces-input.xml.in @@ -16,26 +16,26 @@ </properties> <command>${vyos_op_scripts_dir}/interfaces.py show --intf-type=input</command> </leafNode> - </children> - </node> - <virtualTagNode> - <properties> - <help>Show specified input interface information</help> - <completionHelp> - <path>interfaces input</path> - </completionHelp> - </properties> - <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=input</command> - <children> - <leafNode name="brief"> + <virtualTagNode> <properties> - <help>Show summary of the specified input interface information</help> + <help>Show specified input interface information</help> + <completionHelp> + <path>interfaces input</path> + </completionHelp> </properties> - <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=input</command> - </leafNode> - #include <include/show-interface-type-event-log.xml.i> + <command>${vyos_op_scripts_dir}/interfaces.py show --intf-name="$4" --intf-type=input</command> + <children> + <leafNode name="brief"> + <properties> + <help>Show summary of the specified input interface information</help> + </properties> + <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf-name="$4" --intf-type=input</command> + </leafNode> + #include <include/show-interface-type-event-log.xml.i> + </children> + </virtualTagNode> </children> - </virtualTagNode> + </node> </children> </node> </children> |