smoketest: add shim for every test to re-use common tasts

Currently every smoketest does the setup and destruction of the configsession
on its own durin setUp(). This creates a lot of overhead and one configsession
should be re-used during execution of every smoketest script.

In addiion a test that failed will leaf the system in an unconsistent state.
For this reason before the test is executed we will save the running config
to /tmp and the will re-load the config after the test has passed, always
ensuring a clean environment for the next test.

1 files changed, 8 insertions, 5 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
index b65d97d30..03cdafb8d 100755
--- a/smoketest/scripts/cli/test_interfaces_bonding.py
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -24,7 +24,7 @@ from vyos.ifconfig.interface import Interface
 from vyos.configsession import ConfigSessionError
 from vyos.util import read_file
 
-class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
+class BondingInterfaceTest(BasicInterfaceTest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls._test_ip = True
@@ -52,6 +52,9 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
         for member in cls._members:
             cls._options['bond0'].append(f'member interface {member}')
 
+        # call base-classes classmethod
+        super(cls, cls).setUpClass()
+
     def test_add_single_ip_address(self):
         super().test_add_single_ip_address()
 
@@ -74,16 +77,16 @@ class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
         # configure member interfaces
         for interface in self._interfaces:
             for option in self._options.get(interface, []):
-                self.session.set(self._base_path + [interface] + option.split())
+                self.cli_set(self._base_path + [interface] + option.split())
 
-        self.session.commit()
+        self.cli_commit()
 
         # remove single bond member port
         for interface in self._interfaces:
             remove_member = self._members[0]
-            self.session.delete(self._base_path + [interface, 'member', 'interface', remove_member])
+            self.cli_delete(self._base_path + [interface, 'member', 'interface', remove_member])
 
-        self.session.commit()
+        self.cli_commit()
 
         # removed member port must be admin-up
         for interface in self._interfaces: