diff options
Diffstat (limited to 'op-mode-definitions')
-rw-r--r-- | op-mode-definitions/clear-interfaces.xml.in (renamed from op-mode-definitions/counters.xml.in) | 18 | ||||
-rw-r--r-- | op-mode-definitions/configure.xml.in | 6 | ||||
-rw-r--r-- | op-mode-definitions/connect.xml.in | 2 | ||||
-rw-r--r-- | op-mode-definitions/dhcp.xml.in | 39 | ||||
-rw-r--r-- | op-mode-definitions/disconnect.xml.in | 2 | ||||
-rw-r--r-- | op-mode-definitions/show-qos.xml.in | 80 |
6 files changed, 141 insertions, 6 deletions
diff --git a/op-mode-definitions/counters.xml.in b/op-mode-definitions/clear-interfaces.xml.in index f563cb9a0..de2c3443e 100644 --- a/op-mode-definitions/counters.xml.in +++ b/op-mode-definitions/clear-interfaces.xml.in @@ -1,8 +1,14 @@ <?xml version="1.0"?> <interfaceDefinition> <node name="clear"> + <properties> + <help>Clear system information</help> + </properties> <children> <node name="interfaces"> + <properties> + <help>Clear interface information</help> + </properties> <children> <node name="counters"> <properties> @@ -10,6 +16,17 @@ </properties> <command>sudo ${vyos_op_scripts_dir}/interfaces.py clear_counters</command> </node> + <tagNode name="connection"> + <properties> + <help>Bring connection-oriented network interface down and up</help> + <completionHelp> + <path>interfaces pppoe</path> + <path>interfaces sstpc</path> + <path>interfaces wwan</path> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect --disconnect --interface "$3"</command> + </tagNode> <node name="bonding"> <properties> <help>Clear Bonding interface information</help> @@ -595,4 +612,3 @@ </children> </node> </interfaceDefinition> - diff --git a/op-mode-definitions/configure.xml.in b/op-mode-definitions/configure.xml.in index a711fa4a9..d7657289b 100644 --- a/op-mode-definitions/configure.xml.in +++ b/op-mode-definitions/configure.xml.in @@ -11,11 +11,11 @@ echo "Please do it as an administrator level VyOS user instead." else if grep -q -e '^overlay.*/filesystem.squashfs' /proc/mounts; then - echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed" + echo "WARNING: You are currently configuring a live-ISO environment, changes will not persist until installed" else if grep -q -s '1' /tmp/vyos-config-status; then - echo "WARNING: There was a config error on boot: saving the configuration now could overwrite data." - echo "You may want to check and reload the boot config" + echo "WARNING: There was a config error on boot: saving the configuration now could overwrite data." + echo "You may want to check and reload the boot config" fi fi history -w diff --git a/op-mode-definitions/connect.xml.in b/op-mode-definitions/connect.xml.in index 116cd6231..9027056a6 100644 --- a/op-mode-definitions/connect.xml.in +++ b/op-mode-definitions/connect.xml.in @@ -24,7 +24,7 @@ <path>interfaces wwan</path> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command> + <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect --interface "$3"</command> </tagNode> </children> </node> diff --git a/op-mode-definitions/dhcp.xml.in b/op-mode-definitions/dhcp.xml.in index 0b4a05ffe..eee6937d6 100644 --- a/op-mode-definitions/dhcp.xml.in +++ b/op-mode-definitions/dhcp.xml.in @@ -315,4 +315,43 @@ </node> </children> </node> + <node name="release"> + <properties> + <help>Release specified variable</help> + </properties> + <children> + <node name="dhcp"> + <properties> + <help>Release DHCP client lease</help> + </properties> + <children> + <tagNode name="interface"> + <properties> + <help>Release DHCP client lease for specified interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces</script> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/dhcp.py release_client_lease --family inet --interface "$4"</command> + </tagNode> + </children> + </node> + <node name="dhcpv6"> + <properties> + <help>Release DHCPv6 client lease</help> + </properties> + <children> + <tagNode name="interface"> + <properties> + <help>Release DHCPv6 client lease for specified interface</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces</script> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/dhcp.py release_client_lease --family inet6 --interface "$4"</command> + </tagNode> + </children> + </node> + </children> + </node> </interfaceDefinition> diff --git a/op-mode-definitions/disconnect.xml.in b/op-mode-definitions/disconnect.xml.in index 843998c4f..f0523d9b9 100644 --- a/op-mode-definitions/disconnect.xml.in +++ b/op-mode-definitions/disconnect.xml.in @@ -14,7 +14,7 @@ <path>interfaces wwan</path> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect "$3"</command> + <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --disconnect --interface "$3"</command> </tagNode> </children> </node> diff --git a/op-mode-definitions/show-qos.xml.in b/op-mode-definitions/show-qos.xml.in new file mode 100644 index 000000000..8974e9541 --- /dev/null +++ b/op-mode-definitions/show-qos.xml.in @@ -0,0 +1,80 @@ +<?xml version="1.0" ?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="qos"> + <properties> + <help>Show Quality of Service (QoS) information</help> + </properties> + <children> + <node name="cake"> + <properties> + <help>Show QoS CAKE information</help> + </properties> + <children> + <tagNode name="interface"> + <properties> + <help>Show QoS CAKE for given interface</help> + <completionHelp> + <path>qos interface</path> + <list><interface></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_cake --ifname $5</command> + </tagNode> + </children> + </node> + <node name="shaper"> + <properties> + <help>Show QoS shaping information</help> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper</command> + <children> + <leafNode name="detail"> + <properties> + <help>Show QoS detailed information</help> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper --detail</command> + </leafNode> + <tagNode name="interface"> + <properties> + <help>Show QoS shaping for given interface</help> + <completionHelp> + <path>qos interface</path> + <list><interface></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper --ifname $5</command> + <children> + <tagNode name="class"> + <properties> + <help>Show QoS shaping for given class</help> + <completionHelp> + <list><class></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper --ifname $5 --classn $7</command> + <children> + <leafNode name="detail"> + <properties> + <help>Show QoS detailed information for given class</help> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper --ifname $5 --classn $7 --detail</command> + </leafNode> + </children> + </tagNode> + <leafNode name="detail"> + <properties> + <help>Show QoS detailed information for given interface</help> + </properties> + <command>sudo ${vyos_op_scripts_dir}/qos.py show_shaper --ifname $5 --detail</command> + </leafNode> + </children> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> |