openshift-python-wrapper 4.16.7__tar.gz → 4.16.8__tar.gz

{openshift_python_wrapper-4.16.7 → openshift_python_wrapper-4.16.8}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: openshift-python-wrapper
-Version: 4.16.7
+Version: 4.16.8
 Summary: Wrapper around https://github.com/kubernetes-client/python
-Home-page: https://github.com/RedHatQE/openshift-python-wrapper
 License: Apache-2.0
 Keywords: Openshift,Kubevirt,CNV
 Author: Meni Yakove
@@ -28,6 +27,7 @@ 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/
 Project-URL: Download, https://pypi.org/project/openshift-python-wrapper/
+Project-URL: Homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Description-Content-Type: text/markdown
 
 # openshift-python-wrapper

{openshift_python_wrapper-4.16.7 → openshift_python_wrapper-4.16.8}/ocp_resources/node_network_configuration_policy.py

@@ -375,21 +375,28 @@ class NodeNetworkConfigurationPolicy(Resource):
         failed_condition_reason = self.Conditions.Reason.FAILED_TO_CONFIGURE
         no_match_node_condition_reason = self.Conditions.Reason.NO_MATCHING_NODE
 
-        # if we get here too fast there are no conditions, we need to wait.
-        self.wait_for_configuration_conditions_unknown_or_progressing()
-
-        samples = TimeoutSampler(wait_timeout=self.success_timeout, sleep=1, func=lambda: self.status)
         try:
-            for sample in samples:
-                if sample == self.Conditions.Reason.SUCCESSFULLY_CONFIGURED:
-                    self.logger.info(f"NNCP {self.name} configured Successfully")
-                    return sample
-
-                elif sample == no_match_node_condition_reason:
-                    raise NNCPConfigurationFailed(f"{self.name}. Reason: {no_match_node_condition_reason}")
-
-                elif sample == failed_condition_reason:
-                    self._process_failed_status(failed_condition_reason=failed_condition_reason)
+            for sample in TimeoutSampler(
+                wait_timeout=self.success_timeout,
+                sleep=5,
+                func=lambda: next(
+                    (
+                        condition
+                        for condition in self.instance.get("status", {}).get("conditions", [])
+                        if condition and condition["type"] == self.Conditions.Type.AVAILABLE
+                    ),
+                    {},
+                ),
+            ):
+                if sample:
+                    if sample["status"] == self.Condition.Status.TRUE:
+                        self.logger.info(f"NNCP {self.name} configured Successfully")
+                        return sample
+                    elif sample.get("reason") == no_match_node_condition_reason:
+                        raise NNCPConfigurationFailed(f"{self.name}. Reason: {no_match_node_condition_reason}")
+
+                    elif sample.get("reason") == failed_condition_reason:
+                        self._process_failed_status(failed_condition_reason=failed_condition_reason)
 
         except (TimeoutExpiredError, NNCPConfigurationFailed):
             self.logger.error(

{openshift_python_wrapper-4.16.7 → openshift_python_wrapper-4.16.8}/pyproject.toml

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