summaryrefslogtreecommitdiff
path: root/op-mode-definitions
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-11-18 21:21:33 +0100
committerDaniil Baturin <daniil@baturin.org>2018-11-18 21:21:33 +0100
commitdcb207265472c2fed5fe13c1ba7091e5eea334a7 (patch)
tree8840e362818c5b0d6306ff5886ea3a05a4f088e0 /op-mode-definitions
parenteee479a836b5699df8105a23107bbb056541c436 (diff)
parent7115030c32f8545e8a2e3f21723952110690d32f (diff)
downloadvyos-1x-dcb207265472c2fed5fe13c1ba7091e5eea334a7.tar.gz
vyos-1x-dcb207265472c2fed5fe13c1ba7091e5eea334a7.zip
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'op-mode-definitions')
-rw-r--r--op-mode-definitions/dhcp.xml4
-rw-r--r--op-mode-definitions/dns-forwarding.xml3
-rw-r--r--op-mode-definitions/dynamic-dns.xml1
-rw-r--r--op-mode-definitions/poweroff.xml64
-rw-r--r--op-mode-definitions/pppoe-server.xml2
-rw-r--r--op-mode-definitions/reboot.xml64
-rw-r--r--op-mode-definitions/show-arp.xml35
-rw-r--r--op-mode-definitions/show-bridge.xml3
-rw-r--r--op-mode-definitions/show-configuration.xml62
-rw-r--r--op-mode-definitions/show-disk.xml33
-rw-r--r--op-mode-definitions/show-hardware.xml7
-rw-r--r--op-mode-definitions/show-host.xml55
-rw-r--r--op-mode-definitions/show-ip-multicast.xml4
-rw-r--r--op-mode-definitions/show-ntp.xml2
14 files changed, 154 insertions, 185 deletions
diff --git a/op-mode-definitions/dhcp.xml b/op-mode-definitions/dhcp.xml
index eb57f8f1f..a7d09304e 100644
--- a/op-mode-definitions/dhcp.xml
+++ b/op-mode-definitions/dhcp.xml
@@ -83,7 +83,7 @@
<properties>
<help>Restart the DHCP server process</help>
</properties>
- <command>sudo /opt/vyatta/sbin/dhcrelay-starter.pl --op-mode --init='/opt/vyatta/sbin/dhcrelay.init'</command>
+ <command>sudo ${vyos_op_scripts_dir}/restart_dhcp_relay.py --ipv4</command>
</node>
</children>
</node>
@@ -102,7 +102,7 @@
<properties>
<help>Restart the DHCP server process</help>
</properties>
- <command>sudo /opt/vyatta/sbin/dhcv6relay-starter.pl --op_mode --config_action ACTIVE</command>
+ <command>sudo ${vyos_op_scripts_dir}/restart_dhcp_relay.py --ipv6</command>
</node>
</children>
</node>
diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml
index be71302cd..ac141174f 100644
--- a/op-mode-definitions/dns-forwarding.xml
+++ b/op-mode-definitions/dns-forwarding.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<interfaceDefinition>
<node name="show">
<children>
@@ -38,7 +37,7 @@
</properties>
<command>sudo ${vyos_op_scripts_dir}/dns_forwarding_restart.sh</command>
</leafNode>
- </children>
+ </children>
</node>
</children>
</node>
diff --git a/op-mode-definitions/dynamic-dns.xml b/op-mode-definitions/dynamic-dns.xml
index 76c473fd7..6ea6482e1 100644
--- a/op-mode-definitions/dynamic-dns.xml
+++ b/op-mode-definitions/dynamic-dns.xml
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<interfaceDefinition>
<node name="show">
<children>
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml
index e2483fefc..b4163bcb9 100644
--- a/op-mode-definitions/poweroff.xml
+++ b/op-mode-definitions/poweroff.xml
@@ -5,7 +5,6 @@
<help>Poweroff the system</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff</command>
-
<children>
<leafNode name="now">
<properties>
@@ -13,46 +12,41 @@
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff</command>
</leafNode>
-
<leafNode name="cancel">
<properties>
<help>Cancel a pending poweroff</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel</command>
</leafNode>
-
- <tagNode name="in">
- <properties>
- <help>Poweroff in X minutes</help>
- <completionHelp>
- <list>&lt;Minutes&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4</command>
-
- </tagNode>
-
- <tagNode name="at">
- <properties>
- <help>Poweroff at a specific time</help>
- <completionHelp>
- <list>&lt;HH:MM&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3</command>
- <children>
- <tagNode name="date">
- <properties>
- <help>Poweroff at a specific date</help>
- <completionHelp>
- <list>&lt;DDMMYYYY&gt; &lt;DD/MM/YYYY&gt; &lt;DD.MM.YYYY&gt; &lt;DD:MM:YYYY&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $5</command>
- </tagNode>
- </children>
- </tagNode>
-
+ <tagNode name="in">
+ <properties>
+ <help>Poweroff in X minutes</help>
+ <completionHelp>
+ <list>&lt;Minutes&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4</command>
+ </tagNode>
+ <tagNode name="at">
+ <properties>
+ <help>Poweroff at a specific time</help>
+ <completionHelp>
+ <list>&lt;HH:MM&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3</command>
+ <children>
+ <tagNode name="date">
+ <properties>
+ <help>Poweroff at a specific date</help>
+ <completionHelp>
+ <list>&lt;DDMMYYYY&gt; &lt;DD/MM/YYYY&gt; &lt;DD.MM.YYYY&gt; &lt;DD:MM:YYYY&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $5</command>
+ </tagNode>
+ </children>
+ </tagNode>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/pppoe-server.xml b/op-mode-definitions/pppoe-server.xml
index 7595d6ecf..7c0b05484 100644
--- a/op-mode-definitions/pppoe-server.xml
+++ b/op-mode-definitions/pppoe-server.xml
@@ -26,7 +26,7 @@
<command>/usr/bin/accel-cmd 'pppoe interface show'</command>
</leafNode>
</children>
- </node>
+ </node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml
index affdffd98..2c8daec5d 100644
--- a/op-mode-definitions/reboot.xml
+++ b/op-mode-definitions/reboot.xml
@@ -5,7 +5,6 @@
<help>Reboot the system</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot</command>
-
<children>
<leafNode name="now">
<properties>
@@ -13,46 +12,41 @@
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot</command>
</leafNode>
-
<leafNode name="cancel">
<properties>
<help>Cancel a pending reboot</help>
</properties>
<command>sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel</command>
</leafNode>
-
- <tagNode name="in">
- <properties>
- <help>Reboot in X minutes</help>
- <completionHelp>
- <list>&lt;Minutes&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $4</command>
-
- </tagNode>
-
- <tagNode name="at">
- <properties>
- <help>Reboot at a specific time</help>
- <completionHelp>
- <list>&lt;HH:MM&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3</command>
- <children>
- <tagNode name="date">
- <properties>
- <help>Reboot at a specific date</help>
- <completionHelp>
- <list>&lt;DDMMYYYY&gt; &lt;DD/MM/YYYY&gt; &lt;DD.MM.YYYY&gt; &lt;DD:MM:YYYY&gt;</list>
- </completionHelp>
- </properties>
- <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $5</command>
- </tagNode>
- </children>
- </tagNode>
-
+ <tagNode name="in">
+ <properties>
+ <help>Reboot in X minutes</help>
+ <completionHelp>
+ <list>&lt;Minutes&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $4</command>
+ </tagNode>
+ <tagNode name="at">
+ <properties>
+ <help>Reboot at a specific time</help>
+ <completionHelp>
+ <list>&lt;HH:MM&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3</command>
+ <children>
+ <tagNode name="date">
+ <properties>
+ <help>Reboot at a specific date</help>
+ <completionHelp>
+ <list>&lt;DDMMYYYY&gt; &lt;DD/MM/YYYY&gt; &lt;DD.MM.YYYY&gt; &lt;DD:MM:YYYY&gt;</list>
+ </completionHelp>
+ </properties>
+ <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $5</command>
+ </tagNode>
+ </children>
+ </tagNode>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 92c231c6f..ef3e399f8 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -2,24 +2,23 @@
<interfaceDefinition>
<node name="show">
<children>
- <node name="arp">
- <properties>
- <help>Show Address Resolution Protocol (ARP) information</help>
- </properties>
- <command>/usr/sbin/arp -e -n</command>
- <children>
- <tagNode name="interface">
- <properties>
- <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
- <completionHelp>
- <script>${vyos_completion_dir}/list_interfaces.py -b</script>
- </completionHelp>
- </properties>
- <command>/usr/sbin/arp -e -n -i '$4'</command>
- </tagNode>
- </children>
- </node>
-
+ <node name="arp">
+ <properties>
+ <help>Show Address Resolution Protocol (ARP) information</help>
+ </properties>
+ <command>/usr/sbin/arp -e -n</command>
+ <children>
+ <tagNode name="interface">
+ <properties>
+ <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+ </completionHelp>
+ </properties>
+ <command>/usr/sbin/arp -e -n -i '$4'</command>
+ </tagNode>
+ </children>
+ </node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index b285e2288..8c1f7c398 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -30,8 +30,7 @@
<command>/sbin/brctl showstp $3</command>
</leafNode>
</children>
- </tagNode>
-
+ </tagNode>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml
index 90c1533fb..318942ab0 100644
--- a/op-mode-definitions/show-configuration.xml
+++ b/op-mode-definitions/show-configuration.xml
@@ -2,38 +2,36 @@
<interfaceDefinition>
<node name="show">
<children>
- <node name="configuration">
- <properties>
- <help>Show available saved configurations</help>
- </properties>
- <!-- no admin check -->
- <command>cli-shell-api showCfg --show-active-only --show-hide-secrets</command>
-
- <children>
- <node name="all">
- <properties>
- <help>Show running configuration (including default values)</help>
- </properties>
- <!-- no admin check -->
- <command>cli-shell-api showCfg --show-show-defaults --show-active-only --show-hide-secrets</command>
- </node>
- <node name="commands">
- <properties>
- <help> Show running configuration as set commands </help>
- </properties>
- <!-- no admin check -->
- <command>cli-shell-api showCfg --show-active-only | vyos-config-to-commands</command>
- </node>
- <node name="files">
- <properties>
- <help> Show available saved configurations </help>
- </properties>
- <!-- no admin check -->
- <command>${vyos_op_scripts_dir}/show_configuration_files.sh</command>
- </node>
- </children>
- </node>
-
+ <node name="configuration">
+ <properties>
+ <help>Show available saved configurations</help>
+ </properties>
+ <!-- no admin check -->
+ <command>cli-shell-api showCfg --show-active-only --show-hide-secrets</command>
+ <children>
+ <node name="all">
+ <properties>
+ <help>Show running configuration (including default values)</help>
+ </properties>
+ <!-- no admin check -->
+ <command>cli-shell-api showCfg --show-show-defaults --show-active-only --show-hide-secrets</command>
+ </node>
+ <node name="commands">
+ <properties>
+ <help> Show running configuration as set commands </help>
+ </properties>
+ <!-- no admin check -->
+ <command>cli-shell-api showCfg --show-active-only | vyos-config-to-commands</command>
+ </node>
+ <node name="files">
+ <properties>
+ <help> Show available saved configurations </help>
+ </properties>
+ <!-- no admin check -->
+ <command>${vyos_op_scripts_dir}/show_configuration_files.sh</command>
+ </node>
+ </children>
+ </node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml
index 8a8e35515..37da07fbe 100644
--- a/op-mode-definitions/show-disk.xml
+++ b/op-mode-definitions/show-disk.xml
@@ -2,23 +2,22 @@
<interfaceDefinition>
<node name="show">
<children>
- <tagNode name="disk">
- <properties>
- <help>Show status of disk device</help>
- <completionHelp>
- <script>${vyos_completion_dir}/list_disks.sh</script>
- </completionHelp>
- </properties>
- <children>
- <leafNode name="format">
- <properties>
- <help>Show disk drive formatting</help>
- </properties>
- <command>${vyos_op_scripts_dir}/show_disk_format.sh $3</command>
- </leafNode>
- </children>
- </tagNode>
-
+ <tagNode name="disk">
+ <properties>
+ <help>Show status of disk device</help>
+ <completionHelp>
+ <script>${vyos_completion_dir}/list_disks.sh</script>
+ </completionHelp>
+ </properties>
+ <children>
+ <leafNode name="format">
+ <properties>
+ <help>Show disk drive formatting</help>
+ </properties>
+ <command>${vyos_op_scripts_dir}/show_disk_format.sh $3</command>
+ </leafNode>
+ </children>
+ </tagNode>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml
index 6cd912aea..a49036397 100644
--- a/op-mode-definitions/show-hardware.xml
+++ b/op-mode-definitions/show-hardware.xml
@@ -27,21 +27,18 @@
</node>
</children>
</node>
-
<node name="dmi">
<properties>
<help>Show system DMI details</help>
</properties>
<command>${vyatta_bindir}/vyatta-show-dmi</command>
</node>
-
<node name="mem">
<properties>
<help>Show system RAM details</help>
</properties>
<command>cat /proc/meminfo</command>
</node>
-
<node name="pci">
<properties>
<help>Show system PCI bus details</help>
@@ -56,8 +53,6 @@
</node>
</children>
</node>
-
-
<node name="scsi">
<properties>
<help>Show SCSI device information</help>
@@ -72,7 +67,6 @@
</node>
</children>
</node>
-
<node name="usb">
<properties>
<help>Show peripherals connected to the USB bus</help>
@@ -87,7 +81,6 @@
</node>
</children>
</node>
-
</children>
</node>
</children>
diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml
index b3ea129a2..d7f8104aa 100644
--- a/op-mode-definitions/show-host.xml
+++ b/op-mode-definitions/show-host.xml
@@ -2,36 +2,31 @@
<interfaceDefinition>
<node name="show">
<children>
- <node name="host">
- <properties>
- <help>Show host information</help>
- </properties>
- <children>
- <leafNode name="domain">
- <properties>
- <help>Show domain name</help>
- </properties>
- <command>/bin/domainname -d</command>
- </leafNode>
-
- <leafNode name="name">
- <properties>
- <help>Show host name</help>
- </properties>
- <command>/bin/hostname</command>
- </leafNode>
-
- <tagNode name="lookup">
- <properties>
- <help>Lookup host information for hostname|IPv4 address</help>
- </properties>
- <command>/usr/bin/host $4</command>
- </tagNode>
-
-
- </children>
- </node>
-
+ <node name="host">
+ <properties>
+ <help>Show host information</help>
+ </properties>
+ <children>
+ <leafNode name="domain">
+ <properties>
+ <help>Show domain name</help>
+ </properties>
+ <command>/bin/domainname -d</command>
+ </leafNode>
+ <leafNode name="name">
+ <properties>
+ <help>Show host name</help>
+ </properties>
+ <command>/bin/hostname</command>
+ </leafNode>
+ <tagNode name="lookup">
+ <properties>
+ <help>Lookup host information for hostname|IPv4 address</help>
+ </properties>
+ <command>/usr/bin/host $4</command>
+ </tagNode>
+ </children>
+ </node>
</children>
</node>
</interfaceDefinition>
diff --git a/op-mode-definitions/show-ip-multicast.xml b/op-mode-definitions/show-ip-multicast.xml
index 07102bfa6..6ffe40436 100644
--- a/op-mode-definitions/show-ip-multicast.xml
+++ b/op-mode-definitions/show-ip-multicast.xml
@@ -13,13 +13,13 @@
<properties>
<help>Show multicast interfaces</help>
</properties>
- <command>if ps -C igmpproxy &amp;&gt;/dev/null; then ${vyos_op_scripts_dir}/show-igmpproxy.py --interface; else echo IGMP proxy not configured; fi</command>
+ <command>if ps -C igmpproxy &amp;&gt;/dev/null; then ${vyos_op_scripts_dir}/show_igmpproxy.py --interface; else echo IGMP proxy not configured; fi</command>
</leafNode>
<leafNode name="mfc">
<properties>
<help>Show multicast fowarding cache</help>
</properties>
- <command>if ps -C igmpproxy &amp;&gt;/dev/null; then ${vyos_op_scripts_dir}/show-igmpproxy.py --mfc; else echo IGMP proxy not configured; fi</command>
+ <command>if ps -C igmpproxy &amp;&gt;/dev/null; then ${vyos_op_scripts_dir}/show_igmpproxy.py --mfc; else echo IGMP proxy not configured; fi</command>
</leafNode>
</children>
</node>
diff --git a/op-mode-definitions/show-ntp.xml b/op-mode-definitions/show-ntp.xml
index 4f2f2192b..4db43b449 100644
--- a/op-mode-definitions/show-ntp.xml
+++ b/op-mode-definitions/show-ntp.xml
@@ -6,7 +6,7 @@
<properties>
<help>Show peer status of NTP daemon</help>
</properties>
- <command>if ps -C ntpd &amp;>/dev/null; then ntpdc -n -c peers; else echo NTP daemon disabled; fi</command>
+ <command>if ps -C ntpd &amp;&gt;/dev/null; then ntpdc -n -c peers; else echo NTP daemon disabled; fi</command>
</node>
<tagNode name="ntp">
<properties>