Handle CR comments

Author: yossisegev

ocp_resources/node_network_configuration_policy.py

@@ -327,6 +327,35 @@ def _absent_interface(self):
             patches={self: {"spec": {"desiredState": {"interfaces": self.desired_state["interfaces"]}}}}
         ).update()
 
+    def update(self, resource_dict=None):
+        initial_transition_time = self._get_nncp_configured_last_transition_time()
+        super().update(resource_dict=resource_dict)
+        self._wait_for_nncp_status_update(initial_transition_time=initial_transition_time)
+
+    def _get_nncp_configured_last_transition_time(self):
+        for condition in self.instance.status.conditions:
+            if (
+                condition["type"] == NodeNetworkConfigurationPolicy.Conditions.Type.AVAILABLE
+                and condition["status"] == "True"
+                and condition["reason"] == NodeNetworkConfigurationPolicy.Conditions.Reason.SUCCESSFULLY_CONFIGURED
+            ):
+                return condition["lastTransitionTime"]
+
+    @retry(
+        wait_timeout=TIMEOUT_1MINUTE,
+        sleep=TIMEOUT_5SEC,
+    )
+    def _wait_for_nncp_status_update(self, initial_transition_time):
+        date_format = "%Y-%m-%dT%H:%M:%SZ"
+        formatted_initial_transition_time = datetime.strptime(initial_transition_time, date_format)
+        if any(
+            condition["type"] == NodeNetworkConfigurationPolicy.Conditions.Type.AVAILABLE
+            and datetime.strptime(condition["lastTransitionTime"], date_format) > formatted_initial_transition_time
+            for condition in self.instance.get("status", {}).get("conditions", [])
+        ):
+            return True
+        return False
+
     @property
     def status(self):
         for condition in self.instance.status.conditions:
@@ -448,34 +477,3 @@ def _get_failed_nnce(self):
             for nnce_cond in nnce.instance.status.conditions:
                 if nnce_cond.type == "Failing" and nnce_cond.status == Resource.Condition.Status.TRUE:
                     yield nnce
-
-    def _get_nncp_configured_last_transition_time(self):
-        for condition in self.instance.status.conditions:
-            if (
-                condition["type"] == NodeNetworkConfigurationPolicy.Conditions.Type.AVAILABLE
-                and condition["status"] == "True"
-                and condition["reason"] == NodeNetworkConfigurationPolicy.Conditions.Reason.SUCCESSFULLY_CONFIGURED
-            ):
-                return condition["lastTransitionTime"]
-
-    @retry(
-        wait_timeout=TIMEOUT_1MINUTE,
-        sleep=TIMEOUT_5SEC,
-    )
-    def _wait_for_nncp_with_different_transition_time(self, initial_transition_time):
-        date_format = "%Y-%m-%dT%H:%M:%SZ"
-        formatted_initial_transition_time = datetime.strptime(initial_transition_time, date_format)
-        for condition in self.instance.get("status", {}).get("conditions", []):
-            if (
-                condition
-                and condition["type"] == NodeNetworkConfigurationPolicy.Conditions.Type.AVAILABLE
-                and datetime.strptime(condition["lastTransitionTime"], date_format)
-                > formatted_initial_transition_time
-            ):
-                return True
-        return False
-
-    def update(self, resource_dict=None):
-        initial_transition_time = self._get_nncp_configured_last_transition_time()
-        super().update(resource_dict=resource_dict)
-        self._wait_for_nncp_with_different_transition_time(initial_transition_time=initial_transition_time)