summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-16 16:01:38 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-16 16:02:33 +0200
commitd4c10902026b76a6372cf738fc98860b29b39759 (patch)
treec8d3958d564f876b74e80f68727bbe5f02a57aed /src
parentbe6f809581ccbcd6411713128a63711eaa2ce6b7 (diff)
downloadvyos-1x-d4c10902026b76a6372cf738fc98860b29b39759.tar.gz
vyos-1x-d4c10902026b76a6372cf738fc98860b29b39759.zip
T644: remove prefixing from all scripts and update environment variables with VyOS paths.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/completion/list_dumpable_interfaces.py (renamed from src/op_mode/vyos_list_dumpable_interfaces.py)0
-rwxr-xr-xsrc/completion/list_interfaces.py (renamed from src/op_mode/vyos_list_interfaces.py)0
-rwxr-xr-xsrc/conf_mode/bcast_relay.py (renamed from src/conf_mode/vyos_config_bcast_relay.py)0
-rwxr-xr-xsrc/conf_mode/dns_forwarding.py (renamed from src/conf_mode/vyos_config_dns_forwarding.py)0
-rwxr-xr-xsrc/conf_mode/host_name.py (renamed from src/conf_mode/vyos_config_host_name.py)0
-rw-r--r--src/conf_mode/lldp.py (renamed from src/conf_mode/vyos_config_lldp.py)0
-rwxr-xr-xsrc/conf_mode/mdns_repeater.py (renamed from src/conf_mode/vyos_config_mdns_repeater.py)0
-rwxr-xr-xsrc/conf_mode/ntp.py (renamed from src/conf_mode/vyos_config_ntp.py)0
-rwxr-xr-xsrc/conf_mode/ssh.py (renamed from src/conf_mode/vyos_config_ssh.py)0
-rwxr-xr-xsrc/conf_mode/task_scheduler.py (renamed from src/conf_mode/vyos_update_crontab.py)0
-rwxr-xr-xsrc/op_mode/dns_forwarding_restart.sh (renamed from src/op_mode/vyos_restart_dns_forwarding.sh)0
-rwxr-xr-xsrc/op_mode/dns_forwarding_statistics.py (renamed from src/op_mode/vyos_dns_forwarding_statistics.py)0
-rwxr-xr-xsrc/op_mode/version.py (renamed from src/op_mode/vyos_show_version.py)0
-rw-r--r--src/tests/test_vyos_update_crontab.py20
14 files changed, 10 insertions, 10 deletions
diff --git a/src/op_mode/vyos_list_dumpable_interfaces.py b/src/completion/list_dumpable_interfaces.py
index 53ee89633..53ee89633 100755
--- a/src/op_mode/vyos_list_dumpable_interfaces.py
+++ b/src/completion/list_dumpable_interfaces.py
diff --git a/src/op_mode/vyos_list_interfaces.py b/src/completion/list_interfaces.py
index 59c9dffad..59c9dffad 100755
--- a/src/op_mode/vyos_list_interfaces.py
+++ b/src/completion/list_interfaces.py
diff --git a/src/conf_mode/vyos_config_bcast_relay.py b/src/conf_mode/bcast_relay.py
index 785690d9c..785690d9c 100755
--- a/src/conf_mode/vyos_config_bcast_relay.py
+++ b/src/conf_mode/bcast_relay.py
diff --git a/src/conf_mode/vyos_config_dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index be48cde60..be48cde60 100755
--- a/src/conf_mode/vyos_config_dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
diff --git a/src/conf_mode/vyos_config_host_name.py b/src/conf_mode/host_name.py
index 2a245b211..2a245b211 100755
--- a/src/conf_mode/vyos_config_host_name.py
+++ b/src/conf_mode/host_name.py
diff --git a/src/conf_mode/vyos_config_lldp.py b/src/conf_mode/lldp.py
index ba7e9cb13..ba7e9cb13 100644
--- a/src/conf_mode/vyos_config_lldp.py
+++ b/src/conf_mode/lldp.py
diff --git a/src/conf_mode/vyos_config_mdns_repeater.py b/src/conf_mode/mdns_repeater.py
index e648fd64f..e648fd64f 100755
--- a/src/conf_mode/vyos_config_mdns_repeater.py
+++ b/src/conf_mode/mdns_repeater.py
diff --git a/src/conf_mode/vyos_config_ntp.py b/src/conf_mode/ntp.py
index 8be12e44e..8be12e44e 100755
--- a/src/conf_mode/vyos_config_ntp.py
+++ b/src/conf_mode/ntp.py
diff --git a/src/conf_mode/vyos_config_ssh.py b/src/conf_mode/ssh.py
index a4857bba9..a4857bba9 100755
--- a/src/conf_mode/vyos_config_ssh.py
+++ b/src/conf_mode/ssh.py
diff --git a/src/conf_mode/vyos_update_crontab.py b/src/conf_mode/task_scheduler.py
index c19b88007..c19b88007 100755
--- a/src/conf_mode/vyos_update_crontab.py
+++ b/src/conf_mode/task_scheduler.py
diff --git a/src/op_mode/vyos_restart_dns_forwarding.sh b/src/op_mode/dns_forwarding_restart.sh
index 12106fcc1..12106fcc1 100755
--- a/src/op_mode/vyos_restart_dns_forwarding.sh
+++ b/src/op_mode/dns_forwarding_restart.sh
diff --git a/src/op_mode/vyos_dns_forwarding_statistics.py b/src/op_mode/dns_forwarding_statistics.py
index 3d1e30aee..3d1e30aee 100755
--- a/src/op_mode/vyos_dns_forwarding_statistics.py
+++ b/src/op_mode/dns_forwarding_statistics.py
diff --git a/src/op_mode/vyos_show_version.py b/src/op_mode/version.py
index ce3b3b54f..ce3b3b54f 100755
--- a/src/op_mode/vyos_show_version.py
+++ b/src/op_mode/version.py
diff --git a/src/tests/test_vyos_update_crontab.py b/src/tests/test_vyos_update_crontab.py
index 180871300..7acbbddc5 100644
--- a/src/tests/test_vyos_update_crontab.py
+++ b/src/tests/test_vyos_update_crontab.py
@@ -22,11 +22,11 @@ import unittest
from vyos import ConfigError
try:
- from src.conf_mode import vyos_update_crontab
+ from src.conf_mode import task_scheduler
except ModuleNotFoundError: # for unittest.main()
import sys
sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
- from src.conf_mode import vyos_update_crontab
+ from src.conf_mode import task_scheduler
class TestUpdateCrontab(unittest.TestCase):
@@ -74,9 +74,9 @@ class TestUpdateCrontab(unittest.TestCase):
with self.subTest(msg=t['name'], tasks=t['tasks'], expected=t['expected']):
if t['expected'] is not None:
with self.assertRaises(t['expected']):
- vyos_update_crontab.verify(t['tasks'])
+ task_scheduler.verify(t['tasks'])
else:
- vyos_update_crontab.verify(t['tasks'])
+ task_scheduler.verify(t['tasks'])
def test_generate(self):
tests = [
@@ -114,16 +114,16 @@ class TestUpdateCrontab(unittest.TestCase):
]
for t in tests:
with self.subTest(msg=t['name'], tasks=t['tasks'], expected=t['expected']):
- vyos_update_crontab.crontab_file = tempfile.mkstemp()[1]
- vyos_update_crontab.generate(t['tasks'])
+ task_scheduler.crontab_file = tempfile.mkstemp()[1]
+ task_scheduler.generate(t['tasks'])
if len(t['expected']) > 0:
- self.assertTrue(os.path.isfile(vyos_update_crontab.crontab_file))
- with open(vyos_update_crontab.crontab_file) as f:
+ self.assertTrue(os.path.isfile(task_scheduler.crontab_file))
+ with open(task_scheduler.crontab_file) as f:
actual = f.read()
self.assertEqual(t['expected'], actual.splitlines())
- os.remove(vyos_update_crontab.crontab_file)
+ os.remove(task_scheduler.crontab_file)
else:
- self.assertFalse(os.path.isfile(vyos_update_crontab.crontab_file))
+ self.assertFalse(os.path.isfile(task_scheduler.crontab_file))
if __name__ == "__main__":