From c9cf2dfc539d15be04890b8850f42e6fae1af090 Mon Sep 17 00:00:00 2001 From: Marcel Masque Salgado Date: Fri, 14 Jul 2023 14:48:59 +0200 Subject: [PATCH] Add a wrapper function to the main entrypoint Signed-off-by: Marcel Masque Salgado --- RedfishServiceValidator.py | 3 +-- redfish_service_validator/RedfishServiceValidator.py | 11 ++++++++--- .../RedfishServiceValidatorGui.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/RedfishServiceValidator.py b/RedfishServiceValidator.py index 0343d32..2ac80fd 100755 --- a/RedfishServiceValidator.py +++ b/RedfishServiceValidator.py @@ -7,5 +7,4 @@ import sys if __name__ == '__main__': - status_code, lastResultsPage, exit_string = main() - sys.exit(status_code) + sys.exit(main()) diff --git a/redfish_service_validator/RedfishServiceValidator.py b/redfish_service_validator/RedfishServiceValidator.py index 1849f83..dbd5de7 100755 --- a/redfish_service_validator/RedfishServiceValidator.py +++ b/redfish_service_validator/RedfishServiceValidator.py @@ -42,7 +42,7 @@ def verbose2(self, msg, *args, **kwargs): standard_out.setLevel(logging.INFO) my_logger.addHandler(standard_out) -def main(argslist=None, configfile=None): +def validate(argslist=None, configfile=None): """Main command Args: @@ -242,7 +242,12 @@ def main(argslist=None, configfile=None): return status_code, lastResultsPage, 'Validation done' +def main(): + """ + Entry point for the program. + """ + status_code, _, _ = validate() + return status_code if __name__ == '__main__': - status_code, lastResultsPage, exit_string = main() - sys.exit(status_code) + sys.exit(main()) diff --git a/redfish_service_validator/RedfishServiceValidatorGui.py b/redfish_service_validator/RedfishServiceValidatorGui.py index 99256c4..f4f0898 100755 --- a/redfish_service_validator/RedfishServiceValidatorGui.py +++ b/redfish_service_validator/RedfishServiceValidatorGui.py @@ -324,7 +324,7 @@ def run_imp( self ): # Launch the validator try: rsv_config = self.build_config_parser( False ) - status_code, last_results_page, exit_string = rsv.main(configfile = rsv_config ) + status_code, last_results_page, exit_string = rsv.validate( configfile = rsv_config ) if last_results_page is not None: webbrowser.open_new( last_results_page ) else: