Refactor cluster status checking logic and improve logging for node attributes

Author: devanshjainms

src/module_utils/get_cluster_status.py

@@ -68,20 +68,17 @@ def _validate_cluster_basic_status(self, cluster_status_xml: ET.Element) -> bool
         :return: True if the cluster is stable, False otherwise.
         :rtype: bool
         """
-        # Check pacemaker status
         if self.execute_command_subprocess(PACEMAKER_STATUS).strip() == "active":
             self.result["pacemaker_status"] = "running"
         else:
             self.result["pacemaker_status"] = "stopped"
         self.log(logging.INFO, f"Pacemaker status: {self.result['pacemaker_status']}")
 
-        # Check node count
         if int(cluster_status_xml.find("summary").find("nodes_configured").attrib["number"]) < 2:
             self.result["message"] = "Pacemaker cluster isn't stable (insufficient nodes)"
             self.log(logging.WARNING, self.result["message"])
             return False
 
-        # Check if all nodes are online
         nodes = cluster_status_xml.find("nodes")
         for node in nodes:
             if node.attrib["online"] != "true":
@@ -114,7 +111,6 @@ def run(self) -> Dict[str, str]:
         self._get_stonith_action()
 
         try:
-            # Implementing a common loop structure
             while not self._is_cluster_ready():
                 self.result["cluster_status"] = self.execute_command_subprocess(CLUSTER_STATUS)
                 cluster_status_xml = ET.fromstring(self.result["cluster_status"])

src/modules/get_cluster_status_scs.py

@@ -40,16 +40,22 @@ def _process_node_attributes(self, node_attributes: ET.Element) -> Dict[str, Any
         :return: Dictionary with ASCS and ERS node information.
         :rtype: Dict[str, Any]
         """
+        if node_attributes is None:
+            self.log(logging.WARNING, "Node attributes is None")
+            return {}
         attribute_name = f"runs_ers_{self.sap_sid.upper()}"
+
         for node in node_attributes:
+            node_name = node.attrib.get("name", "unknown")
             for attribute in node:
-                if attribute.attrib["name"] == attribute_name:
-                    if attribute.attrib["value"] == "1":
-                        self.result["ers_node"] = node.attrib["name"]
+                attr_name = attribute.attrib.get("name", "")
+                if attr_name == attribute_name:
+                    if attribute.attrib.get("value") == "1":
+                        self.result["ers_node"] = node_name
                     else:
-                        self.result["ascs_node"] = node.attrib["name"]
-                else:
-                    continue
+                        self.result["ascs_node"] = node_name
+
+        return self.result
 
     def _is_cluster_ready(self) -> bool:
         """
@@ -58,9 +64,6 @@ def _is_cluster_ready(self) -> bool:
         :return: True if the cluster is ready, False otherwise.
         :rtype: bool
         """
-        self.log(
-            logging.INFO, f"Checking if the cluster is ready, ASCS NODE {self.result['ascs_node']}"
-        )
         return self.result["ascs_node"] != ""
 
     def _is_cluster_stable(self) -> bool: