summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-16 18:05:24 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-16 18:05:24 +0200
commitb4297ec7c1ce330396e283797127c72d5818a26d (patch)
tree45fd9a78f29f40b7e0f1da7957fa4b581d6b31e1
parentd4c10902026b76a6372cf738fc98860b29b39759 (diff)
downloadvyos-1x-b4297ec7c1ce330396e283797127c72d5818a26d.tar.gz
vyos-1x-b4297ec7c1ce330396e283797127c72d5818a26d.zip
T644: update op mode and rename the test suite.
-rw-r--r--op-mode-definitions/dns-forwarding.xml4
-rw-r--r--op-mode-definitions/version.xml6
-rw-r--r--src/tests/test_task_scheduler.py (renamed from src/tests/test_vyos_update_crontab.py)0
3 files changed, 5 insertions, 5 deletions
diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml
index f3a618e31..3d7483641 100644
--- a/op-mode-definitions/dns-forwarding.xml
+++ b/op-mode-definitions/dns-forwarding.xml
@@ -14,7 +14,7 @@
<properties>
<help>Show DNS forwarding statistics</help>
</properties>
- <command>${vyos_bindir}/vyos_dns_forwarding_statistics.py</command>
+ <command>${vyos_op_scripts_dir}/dns_forwarding_statistics.py</command>
</leafNode>
</children>
</node>
@@ -30,7 +30,7 @@
<properties>
<help>Restart DNS forwarding service</help>
</properties>
- <command>${vyos_bindir}/vyos_restart_dns_forwarding.sh</command>
+ <command>${vyos_op_scripts_dir}/dns_forwarding_restart.sh</command>
</leafNode>
</children>
</node>
diff --git a/op-mode-definitions/version.xml b/op-mode-definitions/version.xml
index b77d52f9e..593785f7a 100644
--- a/op-mode-definitions/version.xml
+++ b/op-mode-definitions/version.xml
@@ -6,19 +6,19 @@
<properties>
<help>Show system version information</help>
</properties>
- <command>${vyos_bindir}/vyos_show_version.py</command>
+ <command>${vyos_op_scripts_dir}/version.py</command>
<children>
<leafNode name="funny">
<properties>
<help>Show system version and some fun stuff</help>
</properties>
- <command>${vyos_bindir}/vyos_show_version.py --funny</command>
+ <command>${vyos_op_scripts_dir}/version.py --funny</command>
</leafNode>
<leafNode name="all">
<properties>
<help>Show system version and versions of all packages</help>
</properties>
- <command>${vyos_bindir}/vyos_show_version.py --all</command>
+ <command>${vyos_op_scripts_dir}/version.py --all</command>
</leafNode>
</children>
</node>
diff --git a/src/tests/test_vyos_update_crontab.py b/src/tests/test_task_scheduler.py
index 7acbbddc5..7acbbddc5 100644
--- a/src/tests/test_vyos_update_crontab.py
+++ b/src/tests/test_task_scheduler.py