From ea3333347a74f1c0b9c074c3cf7f84bb556fee40 Mon Sep 17 00:00:00 2001 From: devanshjain Date: Mon, 31 Mar 2025 19:05:01 +0000 Subject: [PATCH] Update log handling in playbooks and mock data for JSON compatibility --- .gitignore | 2 ++ src/roles/misc/tasks/post-validations-db.yml | 6 ++++-- src/roles/misc/tasks/post-validations-scs.yml | 6 ++++-- src/roles/misc/tasks/rescue.yml | 6 ++++-- tests/roles/mock_data/log_parser.txt | 3 ++- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cf4800cd..34fe382f 100644 --- a/.gitignore +++ b/.gitignore @@ -406,3 +406,5 @@ FodyWeavers.xsd WORKSPACES/* .ppk VMWPASSWORD +.coverage.* +*.ini diff --git a/src/roles/misc/tasks/post-validations-db.yml b/src/roles/misc/tasks/post-validations-db.yml index 9d5e9cee..727b5ef0 100644 --- a/src/roles/misc/tasks/post-validations-db.yml +++ b/src/roles/misc/tasks/post-validations-db.yml @@ -19,12 +19,14 @@ {{ ( hostvars[cluster_status_pre.primary_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) + ( hostvars[cluster_status_pre.secondary_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) }} diff --git a/src/roles/misc/tasks/post-validations-scs.yml b/src/roles/misc/tasks/post-validations-scs.yml index 2f8d4167..f7387b37 100644 --- a/src/roles/misc/tasks/post-validations-scs.yml +++ b/src/roles/misc/tasks/post-validations-scs.yml @@ -19,12 +19,14 @@ {{ ( hostvars[cluster_status_pre.ascs_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) + ( hostvars[cluster_status_pre.ers_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) }} diff --git a/src/roles/misc/tasks/rescue.yml b/src/roles/misc/tasks/rescue.yml index 8ab623b1..a686751d 100644 --- a/src/roles/misc/tasks/rescue.yml +++ b/src/roles/misc/tasks/rescue.yml @@ -21,12 +21,14 @@ {{ ( hostvars[first_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) + ( hostvars[second_node]['var_log_messages_output'].filtered_logs - | default([]) + | default('[]') + | from_json ) }} diff --git a/tests/roles/mock_data/log_parser.txt b/tests/roles/mock_data/log_parser.txt index e51f851e..3e4841fb 100644 --- a/tests/roles/mock_data/log_parser.txt +++ b/tests/roles/mock_data/log_parser.txt @@ -1,6 +1,7 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- +import json from ansible.module_utils.basic import AnsibleModule def main(): @@ -17,7 +18,7 @@ def main(): # Return a mock cluster status module.exit_json( changed=False, - filtered_logs=["Mock log entry 1", "Mock log entry 2"], + filtered_logs=json.dumps(["Mock log entry 1", "Mock log entry 2"]), status="PASSED", keywords=module.params['keywords'], start_time=module.params['start_time'],