smoketest: migrate pppoe, and wireguard to setUpClass() scheme

3 files changed, 26 insertions, 12 deletions

diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index ba5acf5d6..816ba6dcd 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -78,18 +78,25 @@ class BasicInterfaceTest:
         # choose IPv6 minimum MTU value for tests - this must always work
         _mtu = '1280'
 
-        def setUp(self):
+        @classmethod
+        def setUpClass(cls):
+            super(BasicInterfaceTest.TestCase, cls).setUpClass()
+
             # Setup mirror interfaces for SPAN (Switch Port Analyzer)
-            for span in self._mirror_interfaces:
+            for span in cls._mirror_interfaces:
                 section = Section.section(span)
-                self.cli_set(['interfaces', section, span])
+                cls.cli_set(cls, ['interfaces', section, span])
 
-        def tearDown(self):
+        @classmethod
+        def tearDownClass(cls):
             # Tear down mirror interfaces for SPAN (Switch Port Analyzer)
-            for span in self._mirror_interfaces:
+            for span in cls._mirror_interfaces:
                 section = Section.section(span)
-                self.cli_delete(['interfaces', section, span])
+                cls.cli_delete(cls, ['interfaces', section, span])
 
+            super(BasicInterfaceTest.TestCase, cls).tearDownClass()
+
+        def tearDown(self):
             self.cli_delete(self._base_path)
             self.cli_commit()
 
@@ -232,6 +239,7 @@ class BasicInterfaceTest:
             self.cli_commit()
 
             for interface in self._interfaces:
+                self.assertIn(AF_INET6, ifaddresses(interface))
                 for addr in ifaddresses(interface)[AF_INET6]:
                     self.assertTrue(is_ipv6_link_local(addr['addr']))
 
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py
index 16f6e542b..8927121a8 100755
--- a/smoketest/scripts/cli/test_interfaces_pppoe.py
+++ b/smoketest/scripts/cli/test_interfaces_pppoe.py
@@ -34,9 +34,12 @@ def get_config_value(interface, key):
 
 # add a classmethod to setup a temporaray PPPoE server for "proper" validation
 class PPPoEInterfaceTest(VyOSUnitTestSHIM.TestCase):
-    def setUp(self):
-        self._interfaces = ['pppoe10', 'pppoe20', 'pppoe30']
-        self._source_interface = 'eth0'
+    @classmethod
+    def setUpClass(cls):
+        super(PPPoEInterfaceTest, cls).setUpClass()
+
+        cls._interfaces = ['pppoe10', 'pppoe20', 'pppoe30']
+        cls._source_interface = 'eth0'
 
     def tearDown(self):
         # Validate PPPoE client process
diff --git a/smoketest/scripts/cli/test_interfaces_wireguard.py b/smoketest/scripts/cli/test_interfaces_wireguard.py
index aaf27a2c4..f3e9670f7 100755
--- a/smoketest/scripts/cli/test_interfaces_wireguard.py
+++ b/smoketest/scripts/cli/test_interfaces_wireguard.py
@@ -23,10 +23,13 @@ from vyos.configsession import ConfigSessionError
 base_path = ['interfaces', 'wireguard']
 
 class WireGuardInterfaceTest(VyOSUnitTestSHIM.TestCase):
-    def setUp(self):
-        self._test_addr = ['192.0.2.1/26', '192.0.2.255/31', '192.0.2.64/32',
+    @classmethod
+    def setUpClass(cls):
+        super(WireGuardInterfaceTest, cls).setUpClass()
+
+        cls._test_addr = ['192.0.2.1/26', '192.0.2.255/31', '192.0.2.64/32',
                           '2001:db8:1::ffff/64', '2001:db8:101::1/112']
-        self._interfaces = ['wg0', 'wg1']
+        cls._interfaces = ['wg0', 'wg1']
 
     def tearDown(self):
         self.cli_delete(base_path)