openshift-python-wrapper 4.16.4__tar.gz → 4.16.6__tar.gz

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: openshift-python-wrapper
-Version: 4.16.4
+Version: 4.16.6
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Home-page: https://github.com/RedHatQE/openshift-python-wrapper
 License: Apache-2.0
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: colorlog (>=6.7.0,<7.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: kubernetes (>=29,<30)

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/benchmark.py

@@ -1,4 +1,4 @@
-from ocp_resources.constants import NOT_FOUND_ERROR_EXCEPTION_DICT
+from ocp_resources.constants import NOT_FOUND_ERROR_EXCEPTION_DICT, TIMEOUT_30SEC
 from ocp_resources.resource import NamespacedResource
 from timeout_sampler import TimeoutSampler
 
@@ -35,7 +35,7 @@ class Benchmark(NamespacedResource):
             str or None: Value of key if found, otherwise None
         """
         samples = TimeoutSampler(
-            wait_timeout=30,
+            wait_timeout=TIMEOUT_30SEC,
             sleep=1,
             func=lambda: getattr(self.instance, parent, None),
             exceptions_dict=NOT_FOUND_ERROR_EXCEPTION_DICT,

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/constants.py

@@ -25,7 +25,9 @@ DEFAULT_CLUSTER_RETRY_EXCEPTIONS: Dict[type[Exception], List[str]] = {
 PROTOCOL_ERROR_EXCEPTION_DICT: Dict[type[Exception], List[str]] = {ProtocolError: []}
 NOT_FOUND_ERROR_EXCEPTION_DICT: Dict[type[Exception], List[str]] = {NotFoundError: []}
 
+TIMEOUT_5SEC: int = 5
 TIMEOUT_10SEC: int = 10
+TIMEOUT_30SEC: int = 30
 TIMEOUT_1MINUTE: int = 60
 TIMEOUT_2MINUTES: int = 2 * 60
 TIMEOUT_4MINUTES: int = 4 * 60

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/node_network_configuration_policy.py

@@ -302,7 +302,7 @@ class NodeNetworkConfigurationPolicy(Resource):
             return self
         except Exception as exp:
             self.logger.error(exp)
-            super().__exit__(exception_type=None, exception_value=None, traceback=None)
+            super().__exit__()
             raise
 
     def clean_up(self):

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/pod.py

@@ -2,7 +2,7 @@ import json
 
 import kubernetes
 
-from ocp_resources.constants import TIMEOUT_4MINUTES
+from ocp_resources.constants import TIMEOUT_4MINUTES, TIMEOUT_5SEC
 from ocp_resources.node import Node
 from ocp_resources.resource import NamespacedResource
 from timeout_sampler import TimeoutWatch
@@ -111,8 +111,8 @@ class Pod(NamespacedResource):
         if rcstring is None:
             raise ExecOnPodError(command=command, rc=-1, out="", err=stream_closed_error)
 
-        stdout = resp.read_stdout(timeout=5)
-        stderr = resp.read_stderr(timeout=5)
+        stdout = resp.read_stdout(timeout=TIMEOUT_5SEC)
+        stderr = resp.read_stderr(timeout=TIMEOUT_5SEC)
 
         if rcstring == "Success" or ignore_rc:
             return stdout

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/resource.py

@@ -35,6 +35,8 @@ from ocp_resources.constants import (
     TIMEOUT_1MINUTE,
     TIMEOUT_4MINUTES,
     TIMEOUT_10SEC,
+    TIMEOUT_30SEC,
+    TIMEOUT_5SEC,
 )
 from ocp_resources.event import Event
 from timeout_sampler import (
@@ -876,12 +878,16 @@ class Resource:
 
     @staticmethod
     def retry_cluster_exceptions(
-        func, exceptions_dict: Dict[type[Exception], List[str]] = DEFAULT_CLUSTER_RETRY_EXCEPTIONS, **kwargs: Any
+        func,
+        exceptions_dict: Dict[type[Exception], List[str]] = DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
+        timeout: int = TIMEOUT_10SEC,
+        sleep_time: int = 1,
+        **kwargs: Any,
     ) -> Any:
         try:
             sampler = TimeoutSampler(
-                wait_timeout=TIMEOUT_10SEC,
-                sleep=1,
+                wait_timeout=timeout,
+                sleep=sleep_time,
                 func=func,
                 print_log=False,
                 exceptions_dict=exceptions_dict,
@@ -1050,7 +1056,7 @@ class Resource:
     def wait_for_conditions(self) -> None:
         timeout_watcher = TimeoutWatch(timeout=30)
         for sample in TimeoutSampler(
-            wait_timeout=30,
+            wait_timeout=TIMEOUT_30SEC,
             sleep=1,
             func=lambda: self.exists,
         ):
@@ -1539,4 +1545,6 @@ class ResourceEditor:
             patches=patches,
             action_text=action_text,
             action=action,
+            timeout=TIMEOUT_30SEC,
+            sleep_time=TIMEOUT_5SEC,
         )

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/ocp_resources/virtual_machine_instance.py

@@ -75,6 +75,9 @@ class VirtualMachineInstance(NamespacedResource):
                 label_selector=f"kubevirt.io=virt-launcher,kubevirt.io/created-by={self.instance.metadata.uid}",
             )
         )
+        if not pods:
+            raise ResourceNotFoundError(f"VIRT launcher POD not found for {self.kind}:{self.name}")
+
         migration_state = self.instance.status.migrationState
         if migration_state:
             #  After VM migration there are two pods, one in Completed status and one in Running status.
@@ -85,8 +88,6 @@ class VirtualMachineInstance(NamespacedResource):
         else:
             return pods[0]
 
-        raise ResourceNotFoundError(f"VIRT launcher POD not found for {self.kind}:{self.name}")
-
     @property
     def virt_handler_pod(self):
         pods = list(

{openshift_python_wrapper-4.16.4 → openshift_python_wrapper-4.16.6}/pyproject.toml

@@ -19,7 +19,7 @@ warn_unused_ignores = true
 
 [tool.poetry]
 name = "openshift-python-wrapper"
-version = "4.16.4"
+version = "4.16.6"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 authors = ["Meni Yakove <myakove@gmail.com>", "Ruth Netser <rnetser@gmail.com>"]
 readme = "README.md"