smoketest: accel-ppp: revise base class to reduce amout of redundant code

3 files changed, 63 insertions, 42 deletions

diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index b2acb03cc..471bdaffb 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -27,6 +27,17 @@ from vyos.util import process_named_running
 
 class BasicAccelPPPTest:
     class TestCase(VyOSUnitTestSHIM.TestCase):
+
+        @classmethod
+        def setUpClass(cls):
+            cls._process_name = 'accel-pppd'
+
+            super(BasicAccelPPPTest.TestCase, cls).setUpClass()
+
+            # ensure we can also run this test on a live system - so lets clean
+            # out the current configuration :)
+            cls.cli_delete(cls, cls._base_path)
+
         def setUp(self):
             self._gateway = '192.0.2.1'
             # ensure we can also run this test on a live system - so lets clean
@@ -34,9 +45,15 @@ class BasicAccelPPPTest:
             self.cli_delete(self._base_path)
 
         def tearDown(self):
+            # Check for running process
+            self.assertTrue(process_named_running(self._process_name))
+
             self.cli_delete(self._base_path)
             self.cli_commit()
 
+            # Check for running process
+            self.assertFalse(process_named_running(self._process_name))
+
         def set(self, path):
             self.cli_set(self._base_path + path)
 
@@ -113,9 +130,6 @@ class BasicAccelPPPTest:
             tmp = re.findall(regex, tmp)
             self.assertTrue(tmp)
 
-            # Check for running process
-            self.assertTrue(process_named_running(self._process_name))
-
             # Check local-users default value(s)
             self.delete(['authentication', 'local-users', 'username', user, 'static-ip'])
             # commit changes
@@ -127,9 +141,6 @@ class BasicAccelPPPTest:
             tmp = re.findall(regex, tmp)
             self.assertTrue(tmp)
 
-            # Check for running process
-            self.assertTrue(process_named_running(self._process_name))
-
         def test_accel_radius_authentication(self):
             # Test configuration of RADIUS authentication for PPPoE server
             self.basic_config()
@@ -186,9 +197,6 @@ class BasicAccelPPPTest:
             self.assertEqual(f'req-limit=0', server[4])
             self.assertEqual(f'fail-time=0', server[5])
 
-            # Check for running process
-            self.assertTrue(process_named_running(self._process_name))
-
             #
             # Disable Radius Accounting
             #
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index fae16d3b3..17687a26b 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 020 VyOS maintainers and contributors
+# Copyright (C) 2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -14,14 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import unittest
 
 from base_accel_ppp_test import BasicAccelPPPTest
 
 from configparser import ConfigParser
 from vyos.configsession import ConfigSessionError
-from vyos.util import process_named_running
 from vyos.util import read_file
 from vyos.template import range_to_regex
 
@@ -30,24 +28,19 @@ ac_name = 'ACN'
 interface = 'eth0'
 
 class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
-    def setUp(self):
-        self._base_path = ['service', 'pppoe-server']
-        self._process_name = 'accel-pppd'
-        self._config_file = '/run/accel-pppd/pppoe.conf'
-        self._chap_secrets = '/run/accel-pppd/pppoe.chap-secrets'
+    @classmethod
+    def setUpClass(cls):
+        cls._base_path = ['service', 'pppoe-server']
+        cls._config_file = '/run/accel-pppd/pppoe.conf'
+        cls._chap_secrets = '/run/accel-pppd/pppoe.chap-secrets'
 
-        super().setUp()
+        # call base-classes classmethod
+        super(TestServicePPPoEServer, cls).setUpClass()
 
     def tearDown(self):
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
-
         self.cli_delete(local_if)
         super().tearDown()
 
-        # Check for running process
-        self.assertFalse(process_named_running(self._process_name))
-
     def verify(self, conf):
         mtu = '1492'
 
diff --git a/smoketest/scripts/cli/test_vpn_sstp.py b/smoketest/scripts/cli/test_vpn_sstp.py
index f58920b5b..434e3aa05 100755
--- a/smoketest/scripts/cli/test_vpn_sstp.py
+++ b/smoketest/scripts/cli/test_vpn_sstp.py
@@ -19,29 +19,49 @@ import unittest
 from base_accel_ppp_test import BasicAccelPPPTest
 from vyos.util import read_file
 
-
 pki_path = ['pki']
-cert_data = 'MIICFDCCAbugAwIBAgIUfMbIsB/ozMXijYgUYG80T1ry+mcwCgYIKoZIzj0EAwIwWTELMAkGA1UEBhMCR0IxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAcMCVNvbWUtQ2l0eTENMAsGA1UECgwEVnlPUzESMBAGA1UEAwwJVnlPUyBUZXN0MB4XDTIxMDcyMDEyNDUxMloXDTI2MDcxOTEyNDUxMlowWTELMAkGA1UEBhMCR0IxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAcMCVNvbWUtQ2l0eTENMAsGA1UECgwEVnlPUzESMBAGA1UEAwwJVnlPUyBUZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE01HrLcNttqq4/PtoMua8rMWEkOdBu7vP94xzDO7A8C92ls1v86eePy4QllKCzIw3QxBIoCuH2peGRfWgPRdFsKNhMF8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSu+JnU5ZC4mkuEpqg2+Mk4K79oeDAKBggqhkjOPQQDAgNHADBEAiBEFdzQ/Bc3LftzngrY605UhA6UprHhAogKgROv7iR4QgIgEFUxTtW3xXJcnUPWhhUFhyZoqfn8dE93+dm/LDnp7C0='
-key_data = 'MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgPLpD0Ohhoq0g4nhx2KMIuze7ucKUt/lBEB2wc03IxXyhRANCAATTUestw222qrj8+2gy5rysxYSQ50G7u8/3jHMM7sDwL3aWzW/zp54/LhCWUoLMjDdDEEigK4fal4ZF9aA9F0Ww'
+
+cert_data = """
+MIICFDCCAbugAwIBAgIUfMbIsB/ozMXijYgUYG80T1ry+mcwCgYIKoZIzj0EAwIw
+WTELMAkGA1UEBhMCR0IxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAcMCVNv
+bWUtQ2l0eTENMAsGA1UECgwEVnlPUzESMBAGA1UEAwwJVnlPUyBUZXN0MB4XDTIx
+MDcyMDEyNDUxMloXDTI2MDcxOTEyNDUxMlowWTELMAkGA1UEBhMCR0IxEzARBgNV
+BAgMClNvbWUtU3RhdGUxEjAQBgNVBAcMCVNvbWUtQ2l0eTENMAsGA1UECgwEVnlP
+UzESMBAGA1UEAwwJVnlPUyBUZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+01HrLcNttqq4/PtoMua8rMWEkOdBu7vP94xzDO7A8C92ls1v86eePy4QllKCzIw3
+QxBIoCuH2peGRfWgPRdFsKNhMF8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSu
++JnU5ZC4mkuEpqg2+Mk4K79oeDAKBggqhkjOPQQDAgNHADBEAiBEFdzQ/Bc3Lftz
+ngrY605UhA6UprHhAogKgROv7iR4QgIgEFUxTtW3xXJcnUPWhhUFhyZoqfn8dE93
++dm/LDnp7C0="""
+
+key_data = """
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgPLpD0Ohhoq0g4nhx
+2KMIuze7ucKUt/lBEB2wc03IxXyhRANCAATTUestw222qrj8+2gy5rysxYSQ50G7
+u8/3jHMM7sDwL3aWzW/zp54/LhCWUoLMjDdDEEigK4fal4ZF9aA9F0Ww
+"""
 
 class TestVPNSSTPServer(BasicAccelPPPTest.TestCase):
-    def setUp(self):
-        self._base_path = ['vpn', 'sstp']
-        self._process_name = 'accel-pppd'
-        self._config_file = '/run/accel-pppd/sstp.conf'
-        self._chap_secrets = '/run/accel-pppd/sstp.chap-secrets'
-        super().setUp()
+    @classmethod
+    def setUpClass(cls):
+        cls._base_path = ['vpn', 'sstp']
+        cls._config_file = '/run/accel-pppd/sstp.conf'
+        cls._chap_secrets = '/run/accel-pppd/sstp.chap-secrets'
 
-    def tearDown(self):
-        self.cli_delete(pki_path)
-        super().tearDown()
+        # call base-classes classmethod
+        super(TestVPNSSTPServer, cls).setUpClass()
 
-    def basic_config(self):
-        self.cli_delete(pki_path)
-        self.cli_set(pki_path + ['ca', 'sstp', 'certificate', cert_data])
-        self.cli_set(pki_path + ['certificate', 'sstp', 'certificate', cert_data])
-        self.cli_set(pki_path + ['certificate', 'sstp', 'private', 'key', key_data])
+        cls.cli_set(cls, pki_path + ['ca', 'sstp', 'certificate', cert_data.replace('\n','')])
+        cls.cli_set(cls, pki_path + ['certificate', 'sstp', 'certificate', cert_data.replace('\n','')])
+        cls.cli_set(cls, pki_path + ['certificate', 'sstp', 'private', 'key', key_data.replace('\n','')])
 
+    @classmethod
+    def tearDownClass(cls):
+        cls.cli_delete(cls, pki_path)
+
+        super(TestVPNSSTPServer, cls).tearDownClass()
+
+    def basic_config(self):
         # SSL is mandatory
         self.set(['ssl', 'ca-certificate', 'sstp'])
         self.set(['ssl', 'certificate', 'sstp'])