smoketests: T8845: missing base-class call to commit() in tearDownClass()

The smoketest framework heavily relies on deriving common code paths. The
tearDownClass() is called when a testcase finishes and testcases like protocols
BGP delete CLI nodes before calling the base class.

The base-class never calls commit() thus the deletions are discarded instead
of committed.

test_protocols_bgp.py
  @classmethod
  def tearDownClass(cls):
      cls.cli_delete(cls, ['policy', 'route-map'])
      cls.cli_delete(cls, ['policy', 'prefix-list'])
      cls.cli_delete(cls, ['policy', 'prefix-list6'])

      super(TestProtocolsBGP, cls).tearDownClass()

base class base_vyostest_shim.py

  @classmethod
  def tearDownClass(cls):
      # discard any pending changes which might caused a messed up config
      cls._session.discard()

1 files changed, 8 insertions, 5 deletions

diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py
index 502be2813..590670a06 100644
--- a/smoketest/scripts/cli/base_vyostest_shim.py
+++ b/smoketest/scripts/cli/base_vyostest_shim.py
@@ -65,16 +65,19 @@ class VyOSUnitTestSHIM:
 
         @classmethod
         def tearDownClass(cls):
-            # discard any pending changes which might caused a messed up config
-            cls._session.discard()
-            # ... and restore the initial state
-            cls._session.migrate_and_load_config(save_config)
-
             try:
+                # commit pending changes done by derived tearDownClass()
+                # implementations like CLI cleanup
                 cls._session.commit()
             except (ConfigError, ConfigSessionError):
+                # discard any pending changes which might have failed, causing a
+                # messed up config
                 cls._session.discard()
                 cls.fail(cls)
+            finally:
+                # restore previous configuration before the test
+                cls._session.migrate_and_load_config(save_config)
+                cls._session.commit()
 
         def setUp(self):
             pass