From 3bb4d02f67127b36abe09115ed3b3f526ffd6a2d Mon Sep 17 00:00:00 2001
From: Daman Arora <daman.arora@shapeblue.com>
Date: Thu, 22 Jan 2026 08:46:29 -0500
Subject: [PATCH] Refactor cleanup logic

---
 ...test_kubernetes_cluster_affinity_groups.py | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/test/integration/component/test_kubernetes_cluster_affinity_groups.py b/test/integration/component/test_kubernetes_cluster_affinity_groups.py
index 82f3b8496fb..80450d37bb2 100644
--- a/test/integration/component/test_kubernetes_cluster_affinity_groups.py
+++ b/test/integration/component/test_kubernetes_cluster_affinity_groups.py
@@ -136,18 +136,13 @@ class TestKubernetesClusterAffinityGroups(cloudstackTestCase):
             except Exception as e:
                 cls.debug("Error during cleanup for Kubernetes versions: %s" % e)
 
-        try:
-            # Restore CKS enabled
-            if cls.initial_configuration_cks_enabled not in ["true", True]:
-                cls.debug("Restoring Kubernetes Service enabled value")
-                Configurations.update(cls.apiclient, "cloud.kubernetes.service.enabled", "false")
-                cls.restartServer()
+        # Restore CKS enabled
+        if cls.initial_configuration_cks_enabled not in ["true", True]:
+            cls.debug("Restoring Kubernetes Service enabled value")
+            Configurations.update(cls.apiclient, "cloud.kubernetes.service.enabled", "false")
+            cls.restartServer()
 
-            cleanup_resources(cls.apiclient, cls._cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-
-        return
+        super(TestKubernetesClusterAffinityGroups, cls).tearDownClass()
 
     @classmethod
     def restartServer(cls):
@@ -262,11 +257,7 @@ class TestKubernetesClusterAffinityGroups(cloudstackTestCase):
         return
 
     def tearDown(self):
-        try:
-            cleanup_resources(self.apiclient, self.cleanup)
-        except Exception as e:
-            raise Exception("Warning: Exception during cleanup : %s" % e)
-        return
+        super(TestKubernetesClusterAffinityGroups, self).tearDown()
 
     def deleteKubernetesClusterAndVerify(self, cluster_id, verify=True, forced=False):
         """Delete Kubernetes cluster and check if it is really deleted"""