Merge branch 'misc_fixes'

Author: datamuc

checkvsphere/cli.py

@@ -100,13 +100,13 @@ def main():
             sys.exit(3)
         else:
             sys.exit(e.code)
-    except CheckVsphereTimeout as e:
+    except CheckVsphereTimeout:
         print("UNKNOWN - Timeout reached")
         if int(os.environ.get("VSPHERE_DEBUG", "0")) > 0:
             traceback.print_exc(file=sys.stdout)
         sys.exit(3)
-    except ConnectionRefusedError as e:
-        print(f"UNKNOWN - Connection refused")
+    except ConnectionRefusedError:
+        print("UNKNOWN - Connection refused")
         raise SystemExit(2)
     except vim.fault.VimFault as e:
         if hasattr(e, 'msg'):

checkvsphere/tools/helper.py

@@ -15,7 +15,6 @@
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import re
-import os
 from pyVmomi import vim, vmodl
 from . import serviceutil
 

checkvsphere/tools/service_instance.py

@@ -23,13 +23,9 @@
 __author__ = "VMware, Inc."
 
 import atexit
-import json
 import logging
 import os
-import ssl
-import time
-from pyVim.connect import SmartConnect, Disconnect, vim, GetStub
-from pyVmomi.SoapAdapter import SoapStubAdapter
+from pyVim.connect import SmartConnect, Disconnect
 from .. import VsphereConnectException
 
 
@@ -74,7 +70,7 @@ def connect(args):
     try:
         try:
             service_instance = SmartConnect(**params)
-        except Exception as e:
+        except Exception:
             if sessionId:
                 logging.debug("retry without sessionId")
                 del params["sessionId"]
@@ -90,7 +86,7 @@ def connect(args):
     if sessionfile:
         write_session_id(service_instance, args.sessionfile)
     else:
-        logging.debug(f'add disconnect handler')
+        logging.debug('add disconnect handler')
         # doing this means you don't need to remember to disconnect your script/objects
         atexit.register(Disconnect, service_instance)
 

checkvsphere/vcmd/about.py

@@ -25,10 +25,8 @@
 import logging
 import os
 from monplugin import Status
-from ..tools.helper import find_entity_views
 from pyVmomi import vim
 from ..tools import cli, service_instance
-from .. import CheckVsphereException
 
 
 def run():
@@ -51,15 +49,15 @@ def run():
         if not args.skip_permission:
             try:
                 clock = si.serverClock
-            except Exception as e:
+            except Exception:
                 logging.debug("no server clock", exc_info=1)
                 status = Status.CRITICAL
                 clock = None
                 if args.sessionfile:
                     try:
                         logging.debug(f"deleting {args.sessionfile}")
                         os.unlink(args.sessionfile)
-                    except Exception as e:
+                    except Exception:
                         logging.debug(f"unlink {args.sessionfile} failed", exc_info=1)
 
         out = (

checkvsphere/vcmd/datastores.py

@@ -24,7 +24,6 @@
 from pyVmomi import vim, vmodl
 from monplugin import Check, Status, Threshold, Range
 from ..tools import cli, service_instance
-from .. import CheckVsphereException
 from ..tools.helper import (
     CheckArgument,
     find_entity_views,

checkvsphere/vcmd/hostnic.py

@@ -21,12 +21,10 @@
 
 __cmd__ = 'host-nic'
 
-import logging
 from pyVmomi import vim
 from monplugin import Check, Status
 from ..tools import cli, service_instance
 from ..tools.helper import find_entity_views, CheckArgument, isbanned
-from .. import CheckVsphereException
 
 def run():
     parser = cli.Parser()
@@ -71,8 +69,6 @@ def run():
     except IndexError:
         check.exit(Status.UNKNOWN, f"host {args.vihost or ''} not found")
 
-    result = []
-
     if vm['props']['runtime.inMaintenanceMode']:
         check.exit(
             Status[args.maintenance_state],
@@ -113,10 +109,7 @@ def run():
             else:
                 check.add_message(Status.OK, f"{pnics[str(nic)].device} is ok")
 
-
-    okmessage = "All nics connected"
-
-    (code, message) = check.check_messages(separator="\n", separator_all='\n')#, allok=okmessage)
+    (code, message) = check.check_messages(separator="\n", separator_all='\n')
     check.exit(
         code=code,
         message=( message or "everything ok" )

checkvsphere/vcmd/hostruntime.py

@@ -21,10 +21,8 @@
 
 __cmd__ = 'host-runtime'
 
-import logging
 from pyVmomi import vim
 from monplugin import Check, Status
-from .. import CheckVsphereException
 from ..tools import cli, service_instance
 from ..tools.helper import find_entity_views, isbanned, isallowed, CheckArgument
 
@@ -216,7 +214,7 @@ def check_health(check, vm, args, result):
             "no vim.Host.runtime.healthSystemRuntime.hardwareStatusInfo found"
         )
 
-    filterunknown = lambda x: x.status.key != "unknown"
+    filterunknown = lambda x: x.status.key.lower() != "unknown"
     cpustatus = healthsystem.hardwareStatusInfo.cpuStatusInfo
     storagestatus = list(filter(filterunknown, healthsystem.hardwareStatusInfo.storageStatusInfo))
     memorystatus = list(filter(filterunknown, healthsystem.hardwareStatusInfo.memoryStatusInfo))

checkvsphere/vcmd/hostservice.py

@@ -21,11 +21,9 @@
 
 __cmd__ = 'host-service'
 
-import logging
 from pyVmomi import vim, vmodl
 from monplugin import Check, Status
 from ..tools import cli, service_instance
-from .. import CheckVsphereException
 from ..tools.helper import (
     CheckArgument,
     find_entity_views,

checkvsphere/vcmd/hoststorage.py

@@ -24,11 +24,10 @@
 import re
 import itertools
 from pyVmomi import vim, vmodl
-from monplugin import Check, Status, Threshold, Range
+from monplugin import Check, Status
 from collections import namedtuple
 
 from ..tools import cli, service_instance
-from .. import CheckVsphereException
 from ..tools.helper import (
     CheckArgument,
     find_entity_views,
@@ -154,11 +153,9 @@ def iter_lun():
 
 def check_lun(check: Check, si: vim.ServiceInstance, storage):
     lun2disc = get_lun2disc(storage)
-    count = {}
+    count: dict[str, int] = {}
     luns = storage['storageDeviceInfo'].scsiLun
     for scsi in luns:
-        canonicalName = scsi.canonicalName
-        scsiId = scsi.uuid
         discKey = scsi.key.split("-")[-1]
         displayName = re.sub(r'[^][\w _().-]', '', scsi.displayName)
 
@@ -195,7 +192,7 @@ def check_lun(check: Check, si: vim.ServiceInstance, storage):
 
 
 def check_adapter(check: Check, si: vim.ServiceInstance, storage):
-    count = {}
+    count: dict[str, int] = {}
     adapters = storage['storageDeviceInfo'].hostBusAdapter
     for dev in adapters:
         if  (

checkvsphere/vcmd/listmetrics.py

@@ -22,9 +22,7 @@
 
 __cmd__ = 'list-metrics'
 
-import logging
 import textwrap
-from pyVmomi import vim
 from ..tools import cli, service_instance
 
 def run():
@@ -39,7 +37,6 @@ def run():
         group = counter.groupInfo.key
         name = counter.nameInfo.key
         rollup = counter.rollupType
-        id = counter.key
 
         metrics.setdefault(str(group), {}) \
             .setdefault(str(name), {}) \