Update log handling in playbooks and mock data for JSON compatibility (#34)

devanshjainms · web-flow · commit dadf37e15cdb · 2025-03-31T13:10:27.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'],

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,14 @@`
`19`	`19`	`{{`
`20`	`20`	`(`
`21`	`21`	`hostvars[cluster_status_pre.primary_node]['var_log_messages_output'].filtered_logs`
`22`		`- \| default([])`
	`22`	`+ \| default('[]')`
	`23`	`+ \| from_json`
`23`	`24`	`)`
`24`	`25`	`+`
`25`	`26`	`(`
`26`	`27`	`hostvars[cluster_status_pre.secondary_node]['var_log_messages_output'].filtered_logs`
`27`		`- \| default([])`
	`28`	`+ \| default('[]')`
	`29`	`+ \| from_json`
`28`	`30`	`)`
`29`	`31`	`}}`
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,14 @@`
`21`	`21`	`{{`
`22`	`22`	`(`
`23`	`23`	`hostvars[first_node]['var_log_messages_output'].filtered_logs`
`24`		`- \| default([])`
	`24`	`+ \| default('[]')`
	`25`	`+ \| from_json`
`25`	`26`	`)`
`26`	`27`	`+`
`27`	`28`	`(`
`28`	`29`	`hostvars[second_node]['var_log_messages_output'].filtered_logs`
`29`		`- \| default([])`
	`30`	`+ \| default('[]')`
	`31`	`+ \| from_json`
`30`	`32`	`)`
`31`	`33`	`}}`
`32`	`34`