Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions ocp_resources/node_network_configuration_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class Reason:
CONFIGURING = "ConfigurationProgressing"
SUCCESS = "SuccessfullyConfigured"
FAILED = "FailedToConfigure"
NO_MATCHING_NODE = "NoMatchingNode"

def __init__(
self,
Expand Down Expand Up @@ -301,6 +302,8 @@ def status(self):
return condition["reason"]

def wait_for_status_success(self):
failed_condition_reason = self.Conditions.Reason.FAILED
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_conditions()

Expand All @@ -311,7 +314,12 @@ def wait_for_status_success(self):
LOGGER.info("NNCP configured Successfully")
return sample

if sample == self.Conditions.Reason.FAILED:
if sample == no_match_node_condition_reason:
raise NNCPConfigurationFailed(
f"Reason: {no_match_node_condition_reason}"
)

if sample == failed_condition_reason:
for failed_nnce in self._get_failed_nnce():
nnce_dict = failed_nnce.instance.to_dict()
for cond in nnce_dict["status"]["conditions"]:
Expand All @@ -323,9 +331,7 @@ def wait_for_status_success(self):
f"NNCE {nnce_dict['metadata']['name']}: {error[0]}"
)

raise NNCPConfigurationFailed(
f"Reason: {self.Conditions.Reason.FAILED}"
)
raise NNCPConfigurationFailed(f"Reason: {failed_condition_reason}")

except (TimeoutExpiredError, NNCPConfigurationFailed):
LOGGER.error("Unable to configure NNCP for node")
Expand Down