openshift-python-wrapper 4.15.46__tar.gz → 4.15.48__tar.gz

{openshift_python_wrapper-4.15.46 → openshift_python_wrapper-4.15.48}/PKG-INFO

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

@@ -200,10 +200,8 @@ class OvsBridgeNetworkAttachmentDefinition(BridgeNetworkAttachmentDefinition):
 class OVNOverlayNetworkAttachmentDefinition(NetworkAttachmentDefinition):
     def __init__(
         self,
-        topology=None,
         network_name=None,
-        vlan=None,
-        mtu=None,
+        topology=None,
         **kwargs,
     ):
         """
@@ -213,12 +211,9 @@ 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",
@@ -226,20 +221,16 @@ 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"]
-            if self.vlan:
-                spec_config["vlanID"] = self.vlan
-            if self.mtu:
-                spec_config["mtu"] = self.mtu
-            spec_config["name"] = self.name
+            spec_config["name"] = self.network_name
             spec_config["topology"] = self.topology
-            spec_config["netAttachDefName"] = self.network_name or f"{self.namespace}/{self.name}"
+            spec_config["netAttachDefName"] = f"{self.namespace}/{self.name}"
             self.res["spec"]["config"] = json.dumps(spec_config)

{openshift_python_wrapper-4.15.46 → openshift_python_wrapper-4.15.48}/pyproject.toml

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