diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-20 11:59:32 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-20 11:59:32 +0200 |
| commit | 45b30adfaaec7065f768d04085138a75a76ed376 (patch) | |
| tree | a9cd47236468077141eee56068ba23027b0d4c7d /op-mode-definitions | |
| parent | 46fb580fa0131f6815bbcfc95631654f6fe999a8 (diff) | |
| parent | e0797331774a02ca23e8363fbcfe5a49fb3ca2bd (diff) | |
| download | vyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.tar.gz vyos-1x-45b30adfaaec7065f768d04085138a75a76ed376.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/force-mtu-host.xml | 34 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth-test.xml | 4 | ||||
| -rw-r--r-- | op-mode-definitions/openconnect.xml (renamed from op-mode-definitions/anyconnect.xml) | 8 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bonding.xml | 6 | ||||
| -rw-r--r-- | op-mode-definitions/show-log.xml | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-version.xml | 2 |
6 files changed, 48 insertions, 8 deletions
diff --git a/op-mode-definitions/force-mtu-host.xml b/op-mode-definitions/force-mtu-host.xml new file mode 100644 index 000000000..b92179f11 --- /dev/null +++ b/op-mode-definitions/force-mtu-host.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="force"> + <children> + <node name="mtu"> + <properties> + <help>Show MTU max value for remote host protocol TCP</help> + </properties> + <children> + <tagNode name="host"> + <properties> + <help>IP address of the remote host</help> + <completionHelp> + <list><hostname> <x.x.x.x> <h:h:h:h:h:h:h:h></list> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/force_mtu_host.sh $4</command> + <children> + <tagNode name="interface"> + <properties> + <help>Source interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + </properties> + <command>${vyos_op_scripts_dir}/force_mtu_host.sh $4 $6</command> + </tagNode> + </children> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/monitor-bandwidth-test.xml b/op-mode-definitions/monitor-bandwidth-test.xml index d1e459b17..5b36b1da5 100644 --- a/op-mode-definitions/monitor-bandwidth-test.xml +++ b/op-mode-definitions/monitor-bandwidth-test.xml @@ -11,7 +11,7 @@ <properties> <help>Wait for bandwidth test connections (port TCP/5001)</help> </properties> - <command>iperf -s</command> + <command>/usr/bin/iperf -V -s</command> </leafNode> <tagNode name="initiate"> <properties> @@ -20,7 +20,7 @@ <list><hostname> <x.x.x.x> <h:h:h:h:h:h:h:h></list> </completionHelp> </properties> - <command>iperf -c $4</command> + <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$4"</command> </tagNode> </children> </node> diff --git a/op-mode-definitions/anyconnect.xml b/op-mode-definitions/openconnect.xml index 7e8cdd35b..9b82b114e 100644 --- a/op-mode-definitions/anyconnect.xml +++ b/op-mode-definitions/openconnect.xml @@ -2,16 +2,16 @@ <interfaceDefinition> <node name="show"> <children> - <node name="anyconnect-server"> + <node name="openconnect-server"> <properties> - <help>show anyconnect-server information</help> + <help>show openconnect-server information</help> </properties> <children> <leafNode name="sessions"> <properties> - <help>Show active anyconnect server sessions</help> + <help>Show active openconnect server sessions</help> </properties> - <command>${vyos_op_scripts_dir}/anyconnect-control.py --action="show_sessions"</command> + <command>${vyos_op_scripts_dir}/openconnect-control.py --action="show_sessions"</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-interfaces-bonding.xml b/op-mode-definitions/show-interfaces-bonding.xml index 568b215af..c1c76b059 100644 --- a/op-mode-definitions/show-interfaces-bonding.xml +++ b/op-mode-definitions/show-interfaces-bonding.xml @@ -19,6 +19,12 @@ </properties> <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command> </leafNode> + <leafNode name="detail"> + <properties> + <help>Show detailed interface information</help> + </properties> + <command>if [ -f "/proc/net/bonding/$4" ]; then cat "/proc/net/bonding/$4"; else echo "Interface $4 does not exist!"; fi</command> + </leafNode> <tagNode name="vif"> <properties> <help>Show specified virtual network interface (vif) information</help> diff --git a/op-mode-definitions/show-log.xml b/op-mode-definitions/show-log.xml index 0c4da647b..b00e4cfec 100644 --- a/op-mode-definitions/show-log.xml +++ b/op-mode-definitions/show-log.xml @@ -135,7 +135,7 @@ </properties> <command>egrep -i "kernel:.*\[NAT-[A-Z]{3,}-[0-9]+(-MASQ)?\]" $(find /var/log -maxdepth 1 -type f -name messages\* | sort -t. -k2nr)</command> </leafNode> - <leafNode name="nat"> + <leafNode name="openvpn"> <properties> <help>Show log for OpenVPN</help> </properties> diff --git a/op-mode-definitions/show-version.xml b/op-mode-definitions/show-version.xml index aae5bb008..905a4865c 100644 --- a/op-mode-definitions/show-version.xml +++ b/op-mode-definitions/show-version.xml @@ -18,7 +18,7 @@ <properties> <help>Show system version and versions of all packages</help> </properties> - <command>${vyos_op_scripts_dir}/show_version.py --all</command> + <command>echo "Package versions:"; dpkg -l | awk '$0~/>/{exit}1'</command> </leafNode> <leafNode name="quagga"> <properties> |