openshift-python-wrapper 10.0.47__tar.gz → 10.0.49__tar.gz

{openshift_python_wrapper-10.0.47 → openshift_python_wrapper-10.0.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openshift-python-wrapper
-Version: 10.0.47
+Version: 10.0.49
 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-10.0.47 → openshift_python_wrapper-10.0.49}/ocp_resources/constants.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Dict, List
 from kubernetes.dynamic.exceptions import (
     ForbiddenError,

{openshift_python_wrapper-10.0.47 → openshift_python_wrapper-10.0.49}/ocp_resources/network_attachment_definition.py

@@ -202,6 +202,8 @@ class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
         self,
         network_name=None,
         topology=None,
+        vlan=None,
+        mtu=None,
         **kwargs,
     ):
         """
@@ -211,8 +213,11 @@ 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.
+            network_name (str, optional): The name of the network, used to connect
+                resources created in different namespaces to the same network.
+            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).
             topology (str): The secondary network topology to be created.
         """
         super().__init__(
@@ -221,6 +226,8 @@ class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
         )
         self.network_name = network_name
         self.topology = topology
+        self.vlan = vlan
+        self.mtu = mtu
 
     def to_dict(self) -> None:
         super().to_dict()
@@ -229,6 +236,10 @@ class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
                 raise MissingRequiredArgumentError(argument="'network_name' and 'topology'")
 
             spec_config = self.res["spec"]["config"]
+            if self.vlan:
+                spec_config["vlanID"] = self.vlan
+            if self.mtu:
+                spec_config["mtu"] = self.mtu
             spec_config["name"] = self.network_name
             spec_config["topology"] = self.topology
             spec_config["netAttachDefName"] = f"{self.namespace}/{self.name}"

{openshift_python_wrapper-10.0.47 → openshift_python_wrapper-10.0.49}/ocp_resources/resource.py

@@ -535,11 +535,14 @@ class Resource:
         self.create(wait=wait)
         return self
 
-    def clean_up(self) -> None:
+    def clean_up(self, wait: bool = True) -> None:
         """
         For debug, export SKIP_RESOURCE_TEARDOWN to skip resource teardown.
         Spaces are important in the export dict
 
+        Args:
+            wait (bool, optional): Wait for resource deletion. Defaults to True.
+
         Examples:
             To skip teardown of all resources by kind:
                 export SKIP_RESOURCE_TEARDOWN="{Pod: {}}"
@@ -566,7 +569,7 @@ class Resource:
             )
             return
 
-        self.delete(wait=True, timeout=self.delete_timeout)
+        self.delete(wait=wait, timeout=self.delete_timeout)
 
     @classmethod
     def _prepare_resources(

{openshift_python_wrapper-10.0.47 → openshift_python_wrapper-10.0.49}/pyproject.toml

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