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, 18 deletions

diff --git a/smoketest/scripts/cli/test_vpn_openconnect.py b/smoketest/scripts/cli/test_vpn_openconnect.py
index e27216e09..bf528c8b7 100755
--- a/smoketest/scripts/cli/test_vpn_openconnect.py
+++ b/smoketest/scripts/cli/test_vpn_openconnect.py
@@ -14,9 +14,10 @@
 # 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_vyostest_shim import VyOSUnitTestSHIM
+
 from vyos.configsession import ConfigSession
 from vyos.util import process_named_running
 
@@ -25,29 +26,24 @@ base_path = ['vpn', 'openconnect']
 cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
 cert_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
 
-class TestVpnOpenconnect(unittest.TestCase):
-    def setUp(self):
-        self.session = ConfigSession(os.getpid())
-
+class TestVpnOpenconnect(VyOSUnitTestSHIM.TestCase):
     def tearDown(self):
         # Delete vpn openconnect configuration
-        self.session.delete(base_path)
-        self.session.commit()
-
-        del self.session
+        self.cli_delete(base_path)
+        self.cli_commit()
 
     def test_vpn(self):
         user = 'vyos_user'
         password = 'vyos_pass'
-        self.session.delete(base_path)
-        self.session.set(base_path + ["authentication", "local-users", "username", user, "password", password])
-        self.session.set(base_path + ["authentication", "mode", "local"])
-        self.session.set(base_path + ["network-settings", "client-ip-settings", "subnet", "192.0.2.0/24"])
-        self.session.set(base_path + ["ssl", "ca-cert-file", cert])
-        self.session.set(base_path + ["ssl", "cert-file", cert])
-        self.session.set(base_path + ["ssl", "key-file", cert_key])
-
-        self.session.commit()
+        self.cli_delete(base_path)
+        self.cli_set(base_path + ["authentication", "local-users", "username", user, "password", password])
+        self.cli_set(base_path + ["authentication", "mode", "local"])
+        self.cli_set(base_path + ["network-settings", "client-ip-settings", "subnet", "192.0.2.0/24"])
+        self.cli_set(base_path + ["ssl", "ca-cert-file", cert])
+        self.cli_set(base_path + ["ssl", "cert-file", cert])
+        self.cli_set(base_path + ["ssl", "key-file", cert_key])
+
+        self.cli_commit()
 
         # Check for running process
         self.assertTrue(process_named_running('ocserv-main'))