openshift-python-wrapper 4.15.17__tar.gz → 4.15.19__tar.gz

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openshift-python-wrapper
-Version: 4.15.17
+Version: 4.15.19
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Home-page: https://github.com/RedHatQE/openshift-python-wrapper
 License: Apache-2.0
@@ -22,6 +22,7 @@ Requires-Dist: kubernetes (>=28.0.0,<29.0.0)
 Requires-Dist: packaging (>=23.1,<24.0)
 Requires-Dist: python-benedict (>=0.33.0,<0.34.0)
 Requires-Dist: python-simple-logger (>=1.0.6,<2.0.0)
+Requires-Dist: timeout-sampler (>=0.0.1,<0.0.2)
 Requires-Dist: xmltodict (>=0.13.0,<0.14.0)
 Project-URL: Bug Tracker, https://github.com/RedHatQE/openshift-python-wrapper/issues
 Project-URL: Documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/backup.py

@@ -6,22 +6,34 @@ from ocp_resources.resource import NamespacedResource
 class Backup(NamespacedResource):
     """
     Backup in 'velero' official API:
-        https://velero.io/docs/v0.7.1/api-types/backup/
+        https://velero.io/docs/main/api-types/backup/
     """
 
     api_group = NamespacedResource.ApiGroup.VELERO_IO
 
-    def __init__(self, included_namespaces=None, excluded_resources=None, **kwargs):
+    def __init__(
+        self,
+        included_namespaces=None,
+        excluded_resources=None,
+        snapshot_move_data=False,
+        storage_location=None,
+        **kwargs,
+    ):
         """
         Args:
             included_namespaces (list, optional): Namespaces to include in the backup.
                 If unspecified, all namespaces are included.
             excluded_resources (list, optional): Resources to exclude from the backup.
                 Resources may be shortcuts (e.g. 'po' for 'pods') or fully-qualified.
+            snapshot_move_data (bool, optional): If set to true, deploys the volume snapshot mover
+                controller and a modified CSI Data Mover plugin.
+            storage_location (string, optional): Define the location for the DataMover.
         """
         super().__init__(**kwargs)
         self.included_namespaces = included_namespaces
         self.excluded_resources = excluded_resources
+        self.snapshot_move_data = snapshot_move_data
+        self.storage_location = storage_location
 
     def to_dict(self):
         super().to_dict()
@@ -31,5 +43,9 @@ class Backup(NamespacedResource):
                 spec_dict.update({"includedNamespaces": self.included_namespaces})
             if self.excluded_resources:
                 spec_dict.update({"excludedResources": self.excluded_resources})
+            if self.snapshot_move_data:
+                spec_dict.update({"snapshotMoveData": self.snapshot_move_data})
+            if self.storage_location:
+                spec_dict.update({"storageLocation": self.storage_location})
             if spec_dict:
                 self.res.update({"spec": spec_dict})

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/benchmark.py

@@ -1,6 +1,6 @@
 from ocp_resources.constants import NOT_FOUND_ERROR_EXCEPTION_DICT
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler
+from timeout_sampler import TimeoutSampler
 
 
 class Benchmark(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/cdi_config.py

@@ -2,7 +2,7 @@
 
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import Resource
-from ocp_resources.utils import TimeoutSampler
+from timeout_sampler import TimeoutSampler
 
 
 class CDIConfig(Resource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/daemonset.py

@@ -2,7 +2,7 @@ import kubernetes
 
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler
+from timeout_sampler import TimeoutSampler
 
 
 class DaemonSet(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/datavolume.py

@@ -7,7 +7,7 @@ from ocp_resources.constants import (
 )
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.resource import NamespacedResource, Resource
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 
 class DataVolume(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/deployment.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler, TimeoutWatch
+from timeout_sampler import TimeoutSampler, TimeoutWatch
 
 
 class Deployment(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/machine_set.py

@@ -1,6 +1,6 @@
 from ocp_resources.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 TIMEOUT_5MINUTES = 300
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/mtv.py

@@ -1,4 +1,4 @@
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 
 def _get_status_condition_log_message(**status_condition):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/node_network_configuration_policy.py

@@ -9,7 +9,7 @@ from ocp_resources.node_network_configuration_enactment import (
 )
 from ocp_resources.node_network_state import NodeNetworkState
 from ocp_resources.resource import Resource, ResourceEditor
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler, TimeoutWatch
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler, TimeoutWatch
 
 IPV4_STR = "ipv4"
 IPV6_STR = "ipv6"

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/node_network_state.py

@@ -4,7 +4,7 @@ from kubernetes.dynamic.exceptions import ConflictError
 
 from ocp_resources.constants import TIMEOUT_4MINUTES
 from ocp_resources.resource import Resource
-from ocp_resources.utils import TimeoutSampler
+from timeout_sampler import TimeoutSampler
 
 SLEEP = 1
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/pod.py

@@ -5,7 +5,7 @@ import kubernetes
 from ocp_resources.constants import TIMEOUT_4MINUTES
 from ocp_resources.node import Node
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutWatch
+from timeout_sampler import TimeoutWatch
 
 
 class ExecOnPodError(Exception):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/resource.py

@@ -28,12 +28,12 @@ from ocp_resources.constants import (
     TIMEOUT_4MINUTES,
 )
 from ocp_resources.event import Event
-from ocp_resources.utils import (
+from timeout_sampler import (
     TimeoutExpiredError,
     TimeoutSampler,
     TimeoutWatch,
-    skip_existing_resource_creation_teardown,
 )
+from ocp_resources.utils import skip_existing_resource_creation_teardown
 
 LOGGER = get_logger(name=__name__)
 MAX_SUPPORTED_API_VERSION = "v2"

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/sriov_network_node_state.py

@@ -1,5 +1,5 @@
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler, TimeoutWatch
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler, TimeoutWatch
 
 
 class SriovNetworkNodeState(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/virtual_machine.py

@@ -7,7 +7,7 @@ from ocp_resources.constants import (
     TIMEOUT_4MINUTES,
 )
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler
+from timeout_sampler import TimeoutSampler
 from ocp_resources.virtual_machine_instance import VirtualMachineInstance
 
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/virtual_machine_import.py

@@ -3,7 +3,7 @@
 
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 from ocp_resources.virtual_machine import VirtualMachine
 
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/virtual_machine_instance.py

@@ -7,7 +7,7 @@ from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINU
 from ocp_resources.node import Node
 from ocp_resources.pod import Pod
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutExpiredError, TimeoutSampler
+from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
 
 class VirtualMachineInstance(NamespacedResource):

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/virtual_machine_restore.py

@@ -4,7 +4,7 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler, TimeoutWatch
+from timeout_sampler import TimeoutSampler, TimeoutWatch
 from ocp_resources.virtual_machine import VirtualMachine
 
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/ocp_resources/virtual_machine_snapshot.py

@@ -4,7 +4,7 @@ from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
 from ocp_resources.constants import PROTOCOL_ERROR_EXCEPTION_DICT, TIMEOUT_4MINUTES
 from ocp_resources.resource import NamespacedResource
-from ocp_resources.utils import TimeoutSampler, TimeoutWatch
+from timeout_sampler import TimeoutSampler, TimeoutWatch
 from ocp_resources.virtual_machine import VirtualMachine
 
 

{openshift_python_wrapper-4.15.17 → openshift_python_wrapper-4.15.19}/pyproject.toml

@@ -10,7 +10,7 @@ exclude = [".git", ".venv", ".mypy_cache", ".tox", "__pycache__"]
 
 [tool.poetry]
 name = "openshift-python-wrapper"
-version = "4.15.17"
+version = "4.15.19"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 authors = ["Meni Yakove <myakove@gmail.com>", "Ruth Netser <rnetser@gmail.com>"]
 readme = "README.md"
@@ -56,3 +56,4 @@ python-benedict = "^0.33.0"
 packaging = "^23.1"
 python-simple-logger = "^1.0.6"
 jinja2 = "^3.1.2"
+timeout-sampler = "^0.0.1"