Use addon_installation_instance_sampler as static method

RedHatQE · May 31, 2023 · 726faf3 · 726faf3
1 parent 6b2389a
commit 726faf3
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/ocm_python_wrapper/cluster.py b/ocm_python_wrapper/cluster.py
@@ -454,19 +454,14 @@ def addon_installation_instance(self):
             LOGGER.info(f"{self.addon_name} not found")
             return
 
-    def addon_installation_instance_sampler(self, wait_timeout=TIMEOUT_30MIN):
-        return TimeoutSampler(
-            wait_timeout=wait_timeout,
-            sleep=SLEEP_1SEC,
-            func=self.addon_installation_instance,
-        )
-
     def wait_for_install_state(self, state, wait_timeout=TIMEOUT_30MIN):
         _state = None
         try:
             for (
                 _addon_installation_instance
-            ) in self.addon_installation_instance_sampler(wait_timeout=wait_timeout):
+            ) in self.addon_installation_instance_sampler(
+                func=self.addon_installation_instance, wait_timeout=wait_timeout
+            ):
                 _state = str(_addon_installation_instance.get("state"))
                 if _state == state:
                     return True
@@ -501,7 +496,9 @@ def uninstall_addon(self, wait=True, wait_timeout=TIMEOUT_30MIN, rosa=False):
         if wait:
             for (
                 _addon_installation_instance
-            ) in self.addon_installation_instance_sampler(wait_timeout=wait_timeout):
+            ) in self.addon_installation_instance_sampler(
+                func=self.addon_installation_instance, wait_timeout=wait_timeout
+            ):
                 if not _addon_installation_instance:
                     return True
         LOGGER.info(f"{self.addon_name} v{self.addon_version} was successfully removed")
@@ -566,3 +563,11 @@ def check_param_conditions(clusters_dict, condition, condition_value):
             isinstance(condition_value, list)
             and cluster_condition_value in condition_value
         ) or cluster_condition_value == condition_value
+
+    @staticmethod
+    def addon_installation_instance_sampler(func, wait_timeout=TIMEOUT_30MIN):
+        return TimeoutSampler(
+            wait_timeout=wait_timeout,
+            sleep=SLEEP_1SEC,
+            func=func,
+        )