Skip to content

CherryPicked: [v4.16] Update wait_for_status_success() call to look at both type and status for status.conditions #2300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2025
Merged

CherryPicked: [v4.16] Update wait_for_status_success() call to look at both type and status for status.conditions #2300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions ocp_resources/node_network_configuration_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,21 +375,28 @@ def wait_for_status_success(self):
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(
Expand Down