feat: add match_mode options for string validation and enhance test coverage

Author: devanshjainms

scripts/sap_automation_qa.sh

@@ -75,6 +75,7 @@ Available Test Cases for groups:
 				azure-lb => Azure Load Balancer
 				sapcontrol-config => SAP Control Configuration
 				ascs-migration => ASCS Migration
+				ascs-node-crash => ASCS Node Crash
 				block-network => Block Network
 				kill-message-server => Kill Message Server
 				kill-enqueue-server => Kill Enqueue Server

src/modules/configuration_check_module.py

@@ -447,8 +447,16 @@ def validate_string(self, check: Check, collected_data: str) -> Dict[str, Any]:
             expected = expected.lower()
             collected = collected.lower()
 
+        match_mode = check.validator_args.get("match_mode", "exact")
+        if match_mode == "contains":
+            is_valid = expected in collected
+        elif match_mode == "not_contains":
+            is_valid = expected not in collected
+        else:
+            is_valid = collected == expected
+
         return {
-            "status": self._create_validation_result(check.severity, collected == expected),
+            "status": self._create_validation_result(check.severity, is_valid),
         }
 
     def validate_numeric_range(self, check: Check, collected_data: str) -> Dict[str, Any]:

src/roles/configuration_checks/tasks/files/hana.yml

@@ -831,7 +831,7 @@ checks:
       high_availability_agent:          [*fencing_agent]
     collector_type:                     *command
     collector_args:
-      command:                          cibadmin --query --xpath "//nvpair[@name='msi']" | grep -o 'value=\"[^\"]*\"' | cut -d'"' -f2
+      command:                          cibadmin --query --xpath "//nvpair[@name='msi']" 2>/dev/null | grep -o 'value="[^"]*"' 2>/dev/null | cut -d'"' -f2
       user:                             *root
     validator_type:                     *string
     validator_args:

src/roles/configuration_checks/tasks/files/network.yml

@@ -185,11 +185,12 @@ checks:
                                           nic=$(basename "$nic_id"); \
                                           status=$(az network nic show --resource-group {{ CONTEXT.resource_group_name }} --name "$nic" \
                                           --query "enableAcceleratedNetworking" -o tsv); \
-                                          echo "$status"; \
+                                          echo "$nic: AcceleratedNetworking=$status"; \
                                         done
     validator_type:                   *string
     validator_args:
-      expected_output:                "true"
+      expected_output:                "false"
+      match_mode:                     "not_contains"
     report:                           *check
 
   - id:                               "NET-0006"

src/roles/configuration_checks/tasks/files/virtual_machine.yml

@@ -261,7 +261,7 @@ checks:
       database_type:                  *db
     collector_type:                   *command
     collector_args:
-      command:                        "/bin/cat /etc/os-release | grep PRETTY_NAME | cut -d '=' -f2 | tr -d '\"'"
+      command:                        "/bin/cat /etc/os-release | grep -v '^#' | grep PRETTY_NAME | cut -d '=' -f2 | tr -d '\"'"
       user:                           *root
     report:                           *check
 
@@ -914,13 +914,13 @@ checks:
     severity:                         *info
     workload:                         *workload
     applicability:
-      os_type:                        [*suse, *redhat, *oraclelinux]
+      os_type:                        [*redhat]
       os_version:                     *all_versions
       hardware_type:                  *vm
       role:                           *role
       database_type:                  *db
     collector_type:                   *command
     collector_args:
-      command:                        "/bin/systemctl status kdump.service | grep -o 'Active:.*'"
+      command:                        "/bin/systemctl status kdump.service 2>/dev/null | grep -o 'Active:.*' || echo 'kdump.service not found. Recommendation: Install and enable kdump for crash dump analysis.'"
       user:                           *root
     report:                           *check

src/roles/ha_scs/tasks/ascs-node-crash.yml

@@ -90,10 +90,10 @@
         - name:                         "Test Execution: Determine test execution status"
           ansible.builtin.set_fact:
             test_execution_status:      "{{ 'PASSED' if (
-                                            (hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ascs_node == cluster_status_pre.ers_node and
-                                             hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ers_node == cluster_status_pre.ascs_node) or
-                                            (hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ascs_node == cluster_status_pre.ascs_node and
-                                             hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ers_node == cluster_status_pre.ers_node)
+                                            (hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ascs_node'] == cluster_status_pre.ers_node and
+                                             hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ers_node'] == cluster_status_pre.ascs_node) or
+                                            (hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ascs_node'] == cluster_status_pre.ascs_node and
+                                             hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ers_node'] == cluster_status_pre.ers_node)
                                           ) else 'FAILED' }}"
 
         - name:                         "Test Execution: Stop timer"
@@ -104,15 +104,15 @@
           ansible.builtin.set_fact:
             test_case_message_from_test_case: |
                                         Old ASCS: {{ cluster_status_pre.ascs_node }}
-                                        New ASCS: {{ hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ascs_node | default('N/A') }}
+                                        New ASCS: {{ hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ascs_node'] | default('N/A') }}
                                         Old ERS: {{ cluster_status_pre.ers_node }}
-                                        New ERS: {{ hostvars[cluster_status_pre.ers_node].cluster_status_test_execution.ers_node | default('N/A') }}
+                                        New ERS: {{ hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution']['ers_node'] | default('N/A') }}
             test_case_details_from_test_case: {
                                         "Pre Validations: Validate HANA DB cluster status": "{{ cluster_status_pre }}",
                                         "Pre Validations: CleanUp any failed resource": "{{ cleanup_failed_resource_pre }}",
                                         "Test Execution: Crash ASCS resource": "{{ ascs_crash_result }}",
                                         "Test Execution: Cleanup resources": "{{ cleanup_failed_resource_test_execution }}",
-                                        "Post Validations Result": "{{ hostvars[cluster_status_pre.ers_node].cluster_status_test_execution }}",
+                                        "Post Validations Result": "{{ hostvars[cluster_status_pre.ers_node]['cluster_status_test_execution'] }}",
                                         }
 # /*---------------------------------------------------------------------------
 # |                          Post Validations                                 |

src/roles/ha_scs/tasks/files/constants.yaml

@@ -208,8 +208,12 @@ RESOURCE_DEFAULTS:
           value:                    "5000"
           required:                 false
         priority:
-          value:                    "100"
-          required:                 true
+          ENSA1:
+            value:                  "10"
+            required:               true
+          ENSA2:
+            value:                  "100"
+            required:               true
       operations:
         monitor:
           interval:
@@ -267,8 +271,12 @@ RESOURCE_DEFAULTS:
           value:                    "5000"
           required:                 false
         priority:
-          value:                    "100"
-          required:                 false
+          ENSA1:
+            value:                  "1000"
+            required:               true
+          ENSA2:
+            value:                  "100"
+            required:               true
       operations:
         monitor:
           interval:

src/roles/ha_scs/tasks/sapcontrol-config.yml

@@ -52,6 +52,7 @@
         - name:                         "Test Execution: Validate sapcontrol commands"
           ansible.builtin.set_fact:
             test_execution_end:         "{{ now(utc=true, fmt='%Y-%m-%d %H:%M:%S') }}"
+            test_execution_status:      "{{ 'PASSED' if sapcontrol_results.results | map(attribute='rc') | reject('equalto', 0) | list | length == 0 else 'FAILED' }}"
             test_case_message_from_test_case: >-
               Commands executed:
               {% for res in sapcontrol_results.results %}

tests/modules/configuration_check_module_test.py

@@ -257,6 +257,45 @@ def test_validate_string_whitespace_handling(self, config_module, sample_check):
         result = config_module.validate_string(sample_check, "  test   value  ")
         assert result["status"] == TestStatus.SUCCESS.value
 
+    def test_validate_string_contains_mode_success(self, config_module, sample_check):
+        """Test string validation with match_mode contains"""
+        sample_check.validator_args = {"expected": "true", "match_mode": "contains"}
+        result = config_module.validate_string(sample_check, "nic1: AcceleratedNetworking=true")
+        assert result["status"] == TestStatus.SUCCESS.value
+
+    def test_validate_string_contains_mode_failure(self, config_module, sample_check):
+        """Test string validation with match_mode contains"""
+        sample_check.validator_args = {"expected": "false", "match_mode": "contains"}
+        sample_check.severity = TestSeverity.WARNING
+        result = config_module.validate_string(sample_check, "nic1: AcceleratedNetworking=true")
+        assert result["status"] == TestStatus.WARNING.value
+
+    def test_validate_string_not_contains_mode_success(self, config_module, sample_check):
+        """Test string validation with match_mode not_contains"""
+        sample_check.validator_args = {"expected": "false", "match_mode": "not_contains"}
+        result = config_module.validate_string(
+            sample_check, "nic1: AcceleratedNetworking=true nic2: AcceleratedNetworking=true"
+        )
+        assert result["status"] == TestStatus.SUCCESS.value
+
+    def test_validate_string_not_contains_mode_failure(self, config_module, sample_check):
+        """Test string validation with match_mode not_contains"""
+        sample_check.validator_args = {"expected": "false", "match_mode": "not_contains"}
+        sample_check.severity = TestSeverity.WARNING
+        result = config_module.validate_string(
+            sample_check, "nic1: AcceleratedNetworking=true nic2: AcceleratedNetworking=false"
+        )
+        assert result["status"] == TestStatus.WARNING.value
+
+    def test_validate_string_default_match_mode_is_exact(self, config_module, sample_check):
+        """Test that default match_mode is exact (backward compatible)"""
+        sample_check.validator_args = {"expected": "true"}
+        result = config_module.validate_string(sample_check, "true")
+        assert result["status"] == TestStatus.SUCCESS.value
+        sample_check.severity = TestSeverity.WARNING
+        result = config_module.validate_string(sample_check, "nic: true")
+        assert result["status"] == TestStatus.WARNING.value
+
     def test_validate_numeric_range_within_bounds(self, config_module, sample_check):
         """Test numeric range validation within bounds"""
         sample_check.validator_args = {"min": 10, "max": 100}