openshift-python-wrapper 4.15.43__tar.gz → 4.15.45__tar.gz

{openshift_python_wrapper-4.15.43 → openshift_python_wrapper-4.15.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openshift-python-wrapper
-Version: 4.15.43
+Version: 4.15.45
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Home-page: https://github.com/RedHatQE/openshift-python-wrapper
 License: Apache-2.0

{openshift_python_wrapper-4.15.43 → openshift_python_wrapper-4.15.45}/ocp_resources/datavolume.py

@@ -275,6 +275,7 @@ class DataVolume(NamespacedResource):
         self,
         timeout=TIMEOUT_10MINUTES,
         failure_timeout=TIMEOUT_2MINUTES,
+        dv_garbage_collection_enabled=False,
         stop_status_func=None,
         *stop_status_func_args,
         **stop_status_func_kwargs,
@@ -285,6 +286,7 @@ class DataVolume(NamespacedResource):
         Args:
             timeout (int):  Time to wait for the DataVolume to succeed.
             failure_timeout (int): Time to wait for the DataVolume to have not Pending/None status
+            dv_garbage_collection_enabled (bool, default: False): if True, expect that DV will disappear after success
             stop_status_func (function): function that is called inside the TimeoutSampler
                 if it returns True - stop the Sampler and raise TimeoutExpiredError
                 Example:
@@ -310,8 +312,10 @@ class DataVolume(NamespacedResource):
                 wait_timeout=timeout,
                 func=lambda: self.exists,
             ):
-                # DV reach to success if the status is succeeded or if the DV does not exist
-                if sample is None or sample.get("status", {}).get("phase") == self.Status.SUCCEEDED:
+                # DV reach success if the status is Succeeded, or if DV garbage collection enabled and the DV does not exist
+                if sample and sample.get("status", {}).get("phase") == self.Status.SUCCEEDED:
+                    break
+                elif sample is None and dv_garbage_collection_enabled:
                     break
                 elif stop_status_func and stop_status_func(*stop_status_func_args, **stop_status_func_kwargs):
                     raise TimeoutExpiredError(
@@ -321,7 +325,6 @@ class DataVolume(NamespacedResource):
                             f" {status_of_dv_str} {sample.status}"
                         )
                     )
-
         except TimeoutExpiredError:
             self.logger.error(f"{status_of_dv_str} {sample.status}")
             raise

{openshift_python_wrapper-4.15.43 → openshift_python_wrapper-4.15.45}/ocp_resources/network_attachment_definition.py

@@ -200,8 +200,10 @@ class OvsBridgeNetworkAttachmentDefinition(BridgeNetworkAttachmentDefinition):
 class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
     def __init__(
         self,
-        network_name=None,
         topology=None,
+        network_name=None,
+        vlan=None,
+        mtu=None,
         **kwargs,
     ):
         """
@@ -211,9 +213,12 @@ class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
         https://docs.openshift.com/container-platform/4.14/networking/multiple_networks/configuring-additional-network.html#configuration-ovnk-additional-networks_configuring-additional-network
 
         Args:
-            network_name (str): The name of the network. This field is mandatory when not using yaml
-                file.
             topology (str): The secondary network topology to be created.
+            network_name (str, optional): The name of the network, including the namespace
+                where the network it available, e.g. namespace/network-name.
+            vlan (int, optional): A vlan tag ID that will be assigned to traffic from this
+                additional network.
+            mtu (str, optional): The maximum transmission unit (MTU).
         """
         super().__init__(
             cni_type="ovn-k8s-cni-overlay",
@@ -221,16 +226,20 @@ class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
         )
         self.network_name = network_name
         self.topology = topology
+        self.vlan = vlan
+        self.mtu = mtu
 
     def to_dict(self):
         super().to_dict()
         if not self.yaml_file:
-            if not self.network_name:
-                raise ValueError("network_name is required")
             if not self.topology:
                 raise ValueError("topology is required")
             spec_config = self.res["spec"]["config"]
-            spec_config["name"] = self.network_name
+            if self.vlan:
+                spec_config["vlanID"] = self.vlan
+            if self.mtu:
+                spec_config["mtu"] = self.mtu
+            spec_config["name"] = self.name
             spec_config["topology"] = self.topology
-            spec_config["netAttachDefName"] = f"{self.namespace}/{self.name}"
+            spec_config["netAttachDefName"] = self.network_name or f"{self.namespace}/{self.name}"
             self.res["spec"]["config"] = json.dumps(spec_config)

{openshift_python_wrapper-4.15.43 → openshift_python_wrapper-4.15.45}/pyproject.toml

@@ -10,7 +10,7 @@ exclude = [".git", ".venv", ".mypy_cache", ".tox", "__pycache__"]
 
 [tool.poetry]
 name = "openshift-python-wrapper"
-version = "4.15.43"
+version = "4.15.45"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 authors = ["Meni Yakove <myakove@gmail.com>", "Ruth Netser <rnetser@gmail.com>"]
 readme = "README.md"