Extend OpenShiftObject class with LifecycleObject

Kuadrant · Nov 10, 2023 · 605bfdb · 605bfdb
1 parent a29bf81
commit 605bfdb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/testsuite/objects/__init__.py b/testsuite/objects/__init__.py
@@ -151,7 +151,7 @@ def delete(self):
 
 
 class Authorino(LifecycleObject):
-    """Authorino instance"""
+    """Authorino interface"""
 
     @abc.abstractmethod
     def wait_for_ready(self):

diff --git a/testsuite/openshift/objects/__init__.py b/testsuite/openshift/objects/__init__.py
@@ -3,6 +3,8 @@
 
 from openshift import APIObject
 
+from testsuite.objects import LifecycleObject
+
 
 def modify(func):
     """Wraps method of a subclass of OpenShiftObject to use modify_and_apply when the object
@@ -28,7 +30,7 @@ def _wrap(self, *args, **kwargs):
     return _wrap
 
 
-class OpenShiftObject(APIObject):
+class OpenShiftObject(APIObject, LifecycleObject):
     """Custom APIObjects which tracks if the object was already committed to the server or not"""
 
     def __init__(self, dict_to_model=None, string_to_model=None, context=None):

diff --git a/testsuite/openshift/objects/ingress.py b/testsuite/openshift/objects/ingress.py
@@ -1,15 +1,14 @@
 """Kubernetes Ingress object"""
 from typing import Any, Dict, List, Optional, TYPE_CHECKING
 
-from testsuite.objects import LifecycleObject
 from testsuite.openshift.objects import OpenShiftObject
 
 if TYPE_CHECKING:
     # pylint: disable=cyclic-import
     from testsuite.openshift.client import OpenShiftClient
 
 
-class Ingress(OpenShiftObject, LifecycleObject):
+class Ingress(OpenShiftObject):
     """Represents Kubernetes Ingress object"""
 
     @classmethod