diff --git a/validations/validate.py b/validations/validate.py index ef848b29..707c244d 100644 --- a/validations/validate.py +++ b/validations/validate.py @@ -1,13 +1,13 @@ -from image_validator.pkgmgr.common import get_package_manager_info -from image_validator.system import sysinfo, get_sysinfo -from image_validator.os_information.grub_info import get_grub_parameters -from datetime import datetime as dt -from image_validator.ASR.loaddriver import invoke_load_driver import json import os import socket +from datetime import datetime + +from image_validator.ASR.loaddriver import invoke_load_driver +from image_validator.os_information.grub_info import get_grub_parameters +from image_validator.pkgmgr.common import get_package_manager_info +from image_validator.system import get_sysinfo, sysinfo -release_notes = dict() def package_manager_validation(): try: @@ -20,12 +20,19 @@ def package_manager_validation(): from image_validator.pkgmgr.dnf import dnfValidation package_manager = dnfValidation() except ImportError: - return dict() + return {} get_package_manager_info(package_manager) return package_manager.info + if __name__ == "__main__": + release_notes = { + "version": "1.0.0", + "name": "ImageBuild Validator", + "date": str(datetime.now()), + "hostname": socket.gethostname(), + } try: release_notes["updateInformation"] = package_manager_validation() @@ -35,17 +42,14 @@ def package_manager_validation(): get_sysinfo() release_notes["systemInformation"] = sysinfo release_notes["grubParameters"] = get_grub_parameters() - release_notes["version"] = "1.0.0" - release_notes["name"] = "ImageBuild Validator" - release_notes["date"] = str(dt.now()) - release_notes["hostname"] = socket.gethostname() release_notes["ASR"] = invoke_load_driver() try: - release_notes["generation"] = release_notes["hostname"].split('-')[-1] - release_notes["imageName"] = release_notes["hostname"].split('-')[0] + hostname_parts = release_notes["hostname"].split('-') + release_notes["generation"] = hostname_parts[-1] + release_notes["imageName"] = hostname_parts[0] except: pass - with open("/tmp/logs.json", 'w') as f: - f.write(json.dumps(release_notes, indent=4)) + with open("/tmp/logs.json", "w") as f: + json.dump(release_notes, f, indent=4)