Skip to content

Commit 44eb90f

Browse files
authored
Update wait_for_status_success() call to look at both type and status for status.conditions (#2289)
* status should return reason, when condition status is True * based on review comments and offline conversation with dev team * remove unnecessary code * undo retry * addressed review comment * address review comment * update based on reviews
1 parent 724244e commit 44eb90f

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

ocp_resources/node_network_configuration_policy.py

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -374,21 +374,28 @@ def wait_for_status_success(self):
374374
failed_condition_reason = self.Conditions.Reason.FAILED_TO_CONFIGURE
375375
no_match_node_condition_reason = self.Conditions.Reason.NO_MATCHING_NODE
376376

377-
# if we get here too fast there are no conditions, we need to wait.
378-
self.wait_for_configuration_conditions_unknown_or_progressing()
379-
380-
samples = TimeoutSampler(wait_timeout=self.success_timeout, sleep=1, func=lambda: self.status)
381377
try:
382-
for sample in samples:
383-
if sample == self.Conditions.Reason.SUCCESSFULLY_CONFIGURED:
384-
self.logger.info(f"NNCP {self.name} configured Successfully")
385-
return sample
386-
387-
elif sample == no_match_node_condition_reason:
388-
raise NNCPConfigurationFailed(f"{self.name}. Reason: {no_match_node_condition_reason}")
389-
390-
elif sample == failed_condition_reason:
391-
self._process_failed_status(failed_condition_reason=failed_condition_reason)
378+
for sample in TimeoutSampler(
379+
wait_timeout=self.success_timeout,
380+
sleep=5,
381+
func=lambda: next(
382+
(
383+
condition
384+
for condition in self.instance.get("status", {}).get("conditions", [])
385+
if condition and condition["type"] == self.Conditions.Type.AVAILABLE
386+
),
387+
{},
388+
),
389+
):
390+
if sample:
391+
if sample["status"] == self.Condition.Status.TRUE:
392+
self.logger.info(f"NNCP {self.name} configured Successfully")
393+
return sample
394+
elif sample.get("reason") == no_match_node_condition_reason:
395+
raise NNCPConfigurationFailed(f"{self.name}. Reason: {no_match_node_condition_reason}")
396+
397+
elif sample.get("reason") == failed_condition_reason:
398+
self._process_failed_status(failed_condition_reason=failed_condition_reason)
392399

393400
except (TimeoutExpiredError, NNCPConfigurationFailed):
394401
self.logger.error(

0 commit comments

Comments
 (0)