Enhance resource validation in HA cluster validator to check for required parameters and update warning messages for missing resources

Author: devanshjainms

src/module_utils/get_pcmk_properties.py

@@ -190,6 +190,22 @@ def _create_parameter(
                 expected_config = (expected_value, False)
 
         status = self._determine_parameter_status(value, expected_config)
+        if status == TestStatus.WARNING.value and (not value or value == ""):
+            is_required = False
+            if isinstance(expected_config, tuple) and len(expected_config) == 2:
+                is_required = expected_config[1]
+            elif isinstance(expected_config, dict):
+                is_required = expected_config.get("required", False)
+            
+            if is_required:
+                param_display_name = f"{op_name}_{name}" if op_name else name
+                category_display = f"{category}_{subcategory}" if subcategory else category
+                warning_msg = (
+                    f"Required parameter '{param_display_name}' in category '{category_display}' "
+                    + "has no value configured.\n"
+                )
+                self.result["message"] += warning_msg
+                self.log(logging.WARNING, warning_msg)
 
         display_expected_value = None
         if expected_config is None:
@@ -512,6 +528,8 @@ def validate_from_constants(self):
             overall_status = TestStatus.ERROR.value
         elif warning_parameters:
             overall_status = TestStatus.WARNING.value
+        elif self.result.get("status") == TestStatus.WARNING.value:
+            overall_status = TestStatus.WARNING.value
         else:
             overall_status = TestStatus.SUCCESS.value
 
@@ -653,10 +671,12 @@ def _check_required_resources(self):
 
                         if not elements:
                             warning_msg = (
-                                f"Required resource '{resource_type}' not"
-                                + " found in cluster configuration. "
+                                f"Required resource {resource_type} of xpath "
+                                + f"'{self.RESOURCE_CATEGORIES[resource_type]}' not"
+                                + " found in pacemaker cluster configuration.\n"
                             )
                             self.result["message"] += warning_msg
+                            self.result["status"] = TestStatus.WARNING.value
                             self.log(logging.WARNING, warning_msg)
 
         except Exception as ex:

src/modules/get_pcmk_properties_db.py

@@ -234,7 +234,6 @@ def _validate_resource_constants(self):
         :rtype: list
         """
         parameters = []
-        self._check_required_resources()
 
         try:
             if self.cib_output:
@@ -246,6 +245,7 @@ def _validate_resource_constants(self):
             if resource_scope is not None:
                 parameters.extend(self._parse_resources_section(resource_scope))
 
+            self._check_required_resources()
         except Exception as ex:
             self.result["message"] += f"Error validating resource constants: {str(ex)} "
 

src/modules/get_pcmk_properties_scs.py

@@ -230,7 +230,6 @@ def _validate_resource_constants(self):
         :rtype: list
         """
         parameters = []
-        self._check_required_resources()
 
         try:
             if self.cib_output:
@@ -242,6 +241,7 @@ def _validate_resource_constants(self):
 
             if resource_scope is not None:
                 parameters.extend(self._parse_resources_section(resource_scope))
+            self._check_required_resources()
 
         except Exception as ex:
             self.result["message"] += f"Error validating resource constants: {str(ex)} "

tests/module_utils/get_pcmk_properties_test.py

@@ -445,9 +445,10 @@ def test_check_required_resources_missing(self, validator):
         )
         validator._check_required_resources()
         assert (
-            "Required resource 'required_missing_resource' not found in cluster configuration"
-            in validator.result["message"]
+            "Required resource required_missing_resource" in validator.result["message"]
+            and "not found in pacemaker cluster configuration" in validator.result["message"]
         )
+        assert validator.result["status"] == TestStatus.WARNING.value
 
     def test_check_required_resources_present(self, validator):
         """