etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor cleanup logic

This commit is contained in:
Daman Arora 2026-01-22 08:46:29 -05:00
parent bbeb4e0e8d
commit 3bb4d02f67
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/component/test_kubernetes_cluster_affinity_groups.py
View File

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