summaryrefslogtreecommitdiff
path: root/smoketest/scripts/cli
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-04 12:11:23 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-04 12:11:23 +0200
commitf4e9248d2a24fc4fd0cdc7089aed0193d7a2884f (patch)
tree4069629e4ff2fb88e44bedde3d6754e80f53a457 /smoketest/scripts/cli
parentfe6326c96e6e481fc4498c10c493dfd393c3956c (diff)
downloadvyos-1x-f4e9248d2a24fc4fd0cdc7089aed0193d7a2884f.tar.gz
vyos-1x-f4e9248d2a24fc4fd0cdc7089aed0193d7a2884f.zip
pppoe-server: T2953: rename CLI local-ip to gateway-address
Required to get a common CLI for all services provided by Accel-PPP. Once the CLI for each service is consitent - Jinja2 templates can be reused together with get_config_dict().
Diffstat (limited to 'smoketest/scripts/cli')
-rw-r--r--smoketest/scripts/cli/base_accel_ppp_test.py4
-rwxr-xr-xsmoketest/scripts/cli/test_service_pppoe-server.py6
-rwxr-xr-xsmoketest/scripts/cli/test_vpn_sstp.py2
3 files changed, 5 insertions, 7 deletions
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index 94834ad4c..cf401b0d8 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -30,6 +30,8 @@ class BasicAccelPPPTest:
def setUp(self):
self.session = ConfigSession(os.getpid())
+ self._gateway = '192.0.2.1'
+
# ensure we can also run this test on a live system - so lets clean
# out the current configuration :)
self.session.delete(self._base_path)
@@ -46,7 +48,7 @@ class BasicAccelPPPTest:
# PPPoE local auth mode requires local users to be configured!
self.set(['authentication', 'local-users', 'username', 'vyos', 'password', 'vyos'])
self.set(['authentication', 'mode', 'local'])
-
+ self.set(['gateway-address', self._gateway])
def verify(self, conf):
self.assertEqual(conf['core']['thread-count'], str(get_half_cpus()))
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index dea8d838e..8db002b57 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -27,7 +27,6 @@ from vyos.util import cmd
local_if = ['interfaces', 'dummy', 'dum667']
ac_name = 'ACN'
-gateway = '192.0.2.1'
interface = 'eth0'
@@ -74,7 +73,6 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
self.set(['access-concentrator', ac_name])
self.set(['interface', interface])
- self.set(['local-ip', gateway])
super().basic_config()
@@ -106,7 +104,7 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
# basic verification
self.verify(conf)
- self.assertEqual(conf['chap-secrets']['gw-ip-address'], gateway)
+ self.assertEqual(conf['chap-secrets']['gw-ip-address'], self._gateway)
# check ppp
self.assertEqual(conf['ppp']['mppe'], mppe)
@@ -163,7 +161,7 @@ class TestServicePPPoEServer(BasicAccelPPPTest.BaseTest):
# check configured subnet
self.assertEqual(conf['ip-pool'][subnet], None)
self.assertEqual(conf['ip-pool'][start_stop], None)
- self.assertEqual(conf['ip-pool']['gw-ip-address'], gateway)
+ self.assertEqual(conf['ip-pool']['gw-ip-address'], self._gateway)
# Check for running process
self.assertTrue(process_named_running(self._process_name))
diff --git a/smoketest/scripts/cli/test_vpn_sstp.py b/smoketest/scripts/cli/test_vpn_sstp.py
index 03ed23495..83be4c248 100755
--- a/smoketest/scripts/cli/test_vpn_sstp.py
+++ b/smoketest/scripts/cli/test_vpn_sstp.py
@@ -41,9 +41,7 @@ class TestVPNSSTPServer(BasicAccelPPPTest.BaseTest):
self.set(['ssl', 'ca-cert-file', ca_cert])
self.set(['ssl', 'cert-file', ssl_cert])
self.set(['ssl', 'key-file', ssl_key])
-
self.set(['client-ip-pool', 'subnet', '192.0.2.0/24'])
- self.set(['gateway-address', '1.1.1.1'])
super().basic_config()