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, 14 insertions, 15 deletions

diff --git a/smoketest/scripts/cli/test_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py
index edb6ad94d..2b86ebd7c 100755
--- a/smoketest/scripts/cli/test_system_ntp.py
+++ b/smoketest/scripts/cli/test_system_ntp.py
@@ -15,9 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
-import os
 import unittest
 
+from base_vyostest_shim import VyOSUnitTestSHIM
+
 from vyos.configsession import ConfigSession
 from vyos.configsession import ConfigSessionError
 from vyos.template import address_from_cidr
@@ -35,17 +36,15 @@ def get_config_value(key):
     # remove possible trailing whitespaces
     return [item.strip() for item in tmp]
 
-class TestSystemNTP(unittest.TestCase):
+class TestSystemNTP(VyOSUnitTestSHIM.TestCase):
     def setUp(self):
-        self.session = ConfigSession(os.getpid())
         # ensure we can also run this test on a live system - so lets clean
         # out the current configuration :)
-        self.session.delete(base_path)
+        self.cli_delete(base_path)
 
     def tearDown(self):
-        self.session.delete(base_path)
-        self.session.commit()
-        del self.session
+        self.cli_delete(base_path)
+        self.cli_commit()
 
         self.assertFalse(process_named_running(PROCESS_NAME))
 
@@ -57,13 +56,13 @@ class TestSystemNTP(unittest.TestCase):
 
         for server in servers:
             for option in options:
-                self.session.set(base_path + ['server', server, option])
+                self.cli_set(base_path + ['server', server, option])
 
         # Test NTP pool
-        self.session.set(base_path + ['server', ntp_pool, 'pool'])
+        self.cli_set(base_path + ['server', ntp_pool, 'pool'])
 
         # commit changes
-        self.session.commit()
+        self.cli_commit()
 
         # Check generated configuration
         tmp = get_config_value('server')
@@ -81,21 +80,21 @@ class TestSystemNTP(unittest.TestCase):
         # Test the allowed-networks statement
         listen_address = ['127.0.0.1', '::1']
         for listen in listen_address:
-            self.session.set(base_path + ['listen-address', listen])
+            self.cli_set(base_path + ['listen-address', listen])
 
         networks = ['192.0.2.0/24', '2001:db8:1000::/64']
         for network in networks:
-            self.session.set(base_path + ['allow-clients', 'address', network])
+            self.cli_set(base_path + ['allow-clients', 'address', network])
 
         # Verify "NTP server not configured" verify() statement
         with self.assertRaises(ConfigSessionError):
-            self.session.commit()
+            self.cli_commit()
 
         servers = ['192.0.2.1', '192.0.2.2']
         for server in servers:
-            self.session.set(base_path + ['server', server])
+            self.cli_set(base_path + ['server', server])
 
-        self.session.commit()
+        self.cli_commit()
 
         # Check generated client address configuration
         for network in networks: