Skip to content

Commit 93af7fc

Browse files
committed
Refactor resource failure checks and remove redundant logging in SCS cluster status checker
1 parent 0279321 commit 93af7fc

1 file changed

Lines changed: 5 additions & 21 deletions

File tree

src/modules/get_cluster_status_scs.py

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -134,39 +134,23 @@ def _process_node_attributes(self, cluster_status_xml: ET.Element) -> Dict[str,
134134
self.result["ascs_node"] = node_name
135135

136136
if resources is not None:
137-
self.log(
138-
logging.INFO,
139-
f"ASCS resource ID: {ascs_resource_id}, ERS resource ID: {ers_resource_id}",
140-
)
141137
ascs_resource = resources.find(f".//resource[@id='{ascs_resource_id}']")
142138
ers_resource = resources.find(f".//resource[@id='{ers_resource_id}']")
143-
self.log(
144-
logging.INFO,
145-
f"ASCS resource ID: {ascs_resource}, ERS resource ID: {ers_resource}",
146-
)
139+
147140
if ascs_resource is not None:
148-
is_failed = ascs_resource.attrib.get("failed", "false").lower() == "true"
149-
if not is_failed:
141+
failed = ascs_resource.attrib.get("failed", "false").lower() == "true"
142+
if not failed:
150143
node_element = ascs_resource.find("node")
151-
self.log(
152-
logging.INFO,
153-
f"ASCS node element: {node_element}, ASCS node: {self.result['ascs_node']}",
154-
)
155144
if node_element is not None:
156145
self.result["ascs_node"] = node_element.attrib.get(
157146
"name", self.result["ascs_node"]
158147
)
159-
160148
else:
161149
self.result["ascs_node"] = ""
162150

163151
if ers_resource is not None:
164-
is_failed = ers_resource.attrib.get("failed", "false").lower() == "true"
165-
self.log(
166-
logging.INFO,
167-
f"ERS resource ID: {ers_resource_id}, ERS resource failed: {is_failed}",
168-
)
169-
if not is_failed:
152+
failed = ers_resource.attrib.get("failed", "false").lower() == "true"
153+
if not failed:
170154
node_element = ers_resource.find("node")
171155
if node_element is not None:
172156
self.result["ers_node"] = node_element.attrib.get(

0 commit comments

Comments
 (0)