From d8f9fa1c828bf3ddb8716ead1cabb558c0567e00 Mon Sep 17 00:00:00 2001 From: Claudio Kuenzler Date: Fri, 10 Jul 2020 07:30:43 +0200 Subject: [PATCH] Fix reported issues #47 and #48 (#49) --- check_esxi_hardware.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/check_esxi_hardware.py b/check_esxi_hardware.py index 9798de7..59d7166 100755 --- a/check_esxi_hardware.py +++ b/check_esxi_hardware.py @@ -275,6 +275,11 @@ #@ Author : Claudio Kuenzler #@ Reason : Add parameter (-S) for custom SSL/TLS protocol version #@--------------------------------------------------- +#@ Date : 20200710 +#@ Author : Claudio Kuenzler +#@ Reason : Improve missing mandatory parameter error text (issue #47) +#@ Delete temporary openssl config file after use (issue #48) +#@--------------------------------------------------- from __future__ import print_function import sys @@ -284,7 +289,7 @@ import re import pkg_resources from optparse import OptionParser,OptionGroup -version = '20200605' +version = '20200710' NS = 'root/cimv2' hosturl = '' @@ -585,7 +590,7 @@ def getopts() : mandatories = ['host', 'user', 'password'] for m in mandatories: if not options.__dict__[m]: - print("mandatory parameter '--" + m + "' is missing\n") + print("mandatory option '" + m + "' not defined. read usage in help.\n") parser.print_help() sys.exit(-1) @@ -1013,6 +1018,10 @@ if perfdata: if perf == '|': perf = '' +# Cleanup temporary openssl config +if sslproto: + os.remove(sslconfpath) + if GlobalStatus == ExitOK : print("OK - Server: %s %s %s%s" % (server_info, SerialNumber, bios_info, perf))