Merge ~afreiberger/charm-hw-health:bug/1838457-refactor into charm-hw-health:master

[Drew Freiberger]

[Drew Freiberger (afreiberger)]

supersedes https://code.launchpad.net/~aieri/charm-hw-health/+git/hw-health-charm/+merge/381343 to address comments.

[Xav Paice (xavpaice)]

This is a substantial size change, and could do with some improved test coverage.

Tests all pass - however there's a bunch of rebase errors in the change that should have been picked up by lint, let alone unit tests.

review: Needs Fixing

[Xav Paice (xavpaice)]

also needs a rebase, there's conflicts that will cause issues

[Drew Freiberger (afreiberger)]

I've run through and rebased on top of master. turns out a lot of the test coverage was already in master for these bits.

----------- coverage: platform linux, python 3.8.2-final-0 -----------
Name Stmts Miss Cover
-----------------------------------------------------------------
actions/__init__.py 0 0 100%
actions/actions.py 40 8 80%
files/common/hw_health_lib.py 122 76 38%
files/hplog/cron_hplog.py 144 63 56%
files/ilorest/cron_ilorest.py 79 29 63%
files/mdadm/check_mdadm.py 32 5 84%
files/mdadm/cron_mdadm.py 141 19 87%
files/megacli/check_megacli.py 101 28 72%
files/nvme/check_nvme.py 43 13 70%
files/sas2ircu/check_sas2ircu.py 50 13 74%
files/sas3ircu/check_sas3ircu.py 100 30 70%
files/ssacli/cron_ssacli.py 93 47 49%
lib/hwhealth/__init__.py 0 0 100%
lib/hwhealth/discovery/lshw.py 149 37 75%
lib/hwhealth/discovery/supported_vendors.py 4 0 100%
lib/hwhealth/hwdiscovery.py 67 15 78%
lib/hwhealth/tools.py 324 188 42%
-----------------------------------------------------------------
TOTAL 1489 571 62%

lint/unit tests are passing, running functional now.

[Drew Freiberger (afreiberger)]

I've fleshed out a couple of functional test bugs...this is still WIP.

I'm trying to find a way to remove the test input data from this MP and submit a dependent merge with just those sample files so this review can be code oriented.

[Drew Freiberger (afreiberger)]

running functional tests after resolving what appear to be the issues with the hp repos and lack of focal support. Focal deploy is now succeeding. Will have to see if the resolution for the new GPG key on the hp mcp repo fixes bionic.

review: Needs Resubmitting

a60b332... by Drew Freiberger on 2020-07-24

Added older megacli checksum

[Drew Freiberger (afreiberger)]

test results not good on functional testing. Needs more review. Blocking for MR waiting for HP tools for focal to be released. Or refactor based on tools that are series-specific.

https://pastebin.canonical.com/p/vvHxtQcfSd/

25cb015... by Drew Freiberger on 2020-07-28

Update hp-health ssacli repository to current-gen9

d98a133... by Drew Freiberger on 2020-07-31

Revert "Add supported_series no-op code to AptVendorTool class"

This reverts commit 760d646c6fcb0cb5ea40fbd2eebc13e83250e025.

26aabf1... by Drew Freiberger on 2020-08-07

Update tools discovery code and tests to be series-aware

Also remove known-bad checksum (zero byte file checksum e3b...)
from approved list of megacli checksums.

[Drew Freiberger (afreiberger)]

focal repositories do not have the same gen9 hp tooling, so are not enabled.
Gen10 hp tooling is a future TODO and will then support focal for HP tools.

Unmerged commits

26aabf1... by Drew Freiberger on 2020-08-07

Update tools discovery code and tests to be series-aware

Also remove known-bad checksum (zero byte file checksum e3b...)
from approved list of megacli checksums.

d98a133... by Drew Freiberger on 2020-07-31

Revert "Add supported_series no-op code to AptVendorTool class"

This reverts commit 760d646c6fcb0cb5ea40fbd2eebc13e83250e025.

25cb015... by Drew Freiberger on 2020-07-28

Update hp-health ssacli repository to current-gen9

a60b332... by Drew Freiberger on 2020-07-24

Added older megacli checksum

760d646... by Drew Freiberger on 2020-07-24

Add supported_series no-op code to AptVendorTool class

9f33298... by Drew Freiberger on 2020-07-24

Update HPE tool repositories and keys

686d4b1... by Drew Freiberger on 2020-07-23

Skip apt-add-repo for undefined AptVendorTool repos

Update cron script paths for cron_$tool.sh tools

Fixed functional test errors and cleaned nits from black

b851dc8... by Drew Freiberger on 2020-07-23

Fixing up tests from merge conflict resolution errors for nagios check tools

8232cd1... by Drew Freiberger on 2020-07-21

Fixed lint and focal test environment issues

Updated checksum for new version of sas3ircu tool

85988a1... by Andrea Ieri on 2020-03-27

[test_hwhealth] pep8 compliance

diff --git a/.gitignore b/.gitignore
index e808ce9..06bf3e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,3 @@ builds
 
 # tools bundle (needed for functional testing)
 tools.zip
-tools-checksum.zip
-tools-missing.zip
diff --git a/Makefile b/Makefile
index 70f7666..d314eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@ lint:
 
 test: lint unittest functional
 
-unittest:
-	@cd src && tox -e unit
+unittest: build
+	@cd $(JUJU_REPOSITORY)/builds/hw-health && tox -e unit
 
-functional: resource_check build
-	@cd src && tox -e functional
+functional: resource_check build buildresources
+	@cd $(JUJU_REPOSITORY)/builds/hw-health && tox -e functional
 
 resource_check:
 ifeq ("$(wildcard $(JUJU_REPOSITORY)/tools.zip)","")
@@ -39,17 +39,21 @@ ifeq ("$(wildcard $(JUJU_REPOSITORY)/tools.zip)","")
 		before running functional tests. \
 		Check the README for instructions on how to do so.)
 endif
-ifeq ("$(wildcard $(JUJU_REPOSITORY)/tools-checksum.zip)","")
-	$(error ERROR: You must save the tools resource in $(JUJU_REPOSITORY)/tools-checksum.zip \
-		before running functional tests. \
-		megacli tool needs to be replaced by an empty file within the zip archive.)
-endif
-ifeq ("$(wildcard $(JUJU_REPOSITORY)/tools-missing.zip)","")
-	$(error ERROR: You must save the tools resource in $(JUJU_REPOSITORY)/tools-missing.zip \
-		before running functional tests. \
-		megacli tool needs to be removed from the zip archive.)
-endif
 
+buildresources:
+	@echo "Copying tools.zip to the builds directory"
+	@cp $(JUJU_REPOSITORY)/tools.zip $(JUJU_REPOSITORY)/builds/tools.zip
+	@echo "Building tools-missing.zip"
+	@zip $(JUJU_REPOSITORY)/tools.zip --copy \
+		--out $(JUJU_REPOSITORY)/builds/tools-missing.zip \
+		--exclude megacli
+	@echo "Building tools-checksum.zip"
+	@zip $(JUJU_REPOSITORY)/tools.zip --copy \
+		--out $(JUJU_REPOSITORY)/builds/tools-checksum.zip \
+		--exclude megacli
+	@touch $(JUJU_REPOSITORY)/builds/megacli
+	@zip --move --junk-path $(JUJU_REPOSITORY)/builds/tools-checksum.zip \
+		$(JUJU_REPOSITORY)/builds/megacli
 
 build:
 	@echo "Building charm to base directory $(JUJU_REPOSITORY)"
diff --git a/src/README.md b/src/README.md
index 45b48ed..0cb9007 100644
--- a/src/README.md
+++ b/src/README.md
@@ -20,8 +20,7 @@ Hardware-independent tools:
    default)
 
 In the backlog, hp-health logic still needs to be backported to support
-Hewlett-Packard equipment (HP Smart Array Controllers and MSA Controllers with
-hpacucli, hpssacli, ssacli).
+Hewlett-Packard gen8 and older equipment (HP Controllers with hpacucli)
 
 Furthermore, other hardware in the roadmap is:
 
diff --git a/src/files/common/check_hw_health_cron_output.py b/src/files/common/check_hw_health_cron_output.py
new file mode 100755
index 0000000..ebb63e1
--- /dev/null
+++ b/src/files/common/check_hw_health_cron_output.py
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+# ------------------------------------------------
+# This file is juju managed
+# ------------------------------------------------
+
+# Copyright (C) 2008, 2009, 2012  James Troup <[e-mail]>
+# Copyright (C) 2009  LaMont Jones <[e-mail]>
+
+###############################################################################
+
+from optparse import OptionParser
+
+from nagios_plugin3 import (check_file_freshness,
+                            try_check,
+                            WarnError,
+                            UnknownError,
+                            CriticalError)
+
+
+###############################################################################
+
+
+def check_and_open(filename, time_limit):
+    check_file_freshness(filename, time_limit)
+    return open(filename)
+
+
+###############################################################################
+
+
+def check_file_contents(input_filename, time_limit):
+    input_file = check_and_open(input_filename, time_limit)
+    for line in input_file.readlines():
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith("WARN"):
+            raise WarnError(line)
+        if line.startswith("UNKNOWN"):
+            raise UnknownError(line)
+        elif line.startswith("OK"):
+            print(line)
+        else:
+            raise CriticalError(line)
+
+
+###############################################################################
+
+
+def main():
+    parser = OptionParser()
+    parser.add_option(
+        "--time",
+        dest="time_limit",
+        help="freshness time limit [default=%default]",
+        metavar="SECONDS",
+        default=1200,
+        type=int
+    )
+    parser.add_option(
+        "-f", "--filename",
+        dest="input_file",
+        help=('file containing the output of '
+              'cron_ilorest.py [default=%default]'),
+        metavar="FILE",
+        nargs=1,
+        # default="/var/lib/nagios/UNSETOUTPUTFILE.out",
+        type=str
+    )
+
+    (opts, args) = parser.parse_args()
+
+    try_check(check_file_contents, opts.input_file, opts.time_limit)
+    print("All OK")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/files/common/hw_health_lib.py b/src/files/common/hw_health_lib.py
new file mode 100644
index 0000000..c75a4e5
--- /dev/null
+++ b/src/files/common/hw_health_lib.py
@@ -0,0 +1,263 @@
+# -----------------------------------------------
+# This file is juju managed
+# -----------------------------------------------
+
+# Copyright (C) 2008-2013  James Troup <[e-mail]>
+# Copyright (c) 2020 Drew Freiberger <[e-mail]>
+
+import argparse
+import os
+import re
+import subprocess
+import tempfile
+import yaml
+
+from datetime import datetime, timedelta
+from binascii import crc32
+from socket import gethostname
+
+
+ignoring_output = []
+
+
+def read_ignore_file(ignore_file):  # noqa C901
+    """
+    Reads a file to create a list of ignore dicts to use with
+    the ignore function.
+
+    The directory /etc/nagios/ignores/ must be owned by nagios user,
+    so that it can create and re-write the ignores files.
+    Use the following to create it with correct perms:
+      D=/etc/nagios/ignores; sudo mkdir $D; sudo chown nagios $D;
+      MODULE=power # or array, controller, fans
+      sudo -u nagios vim /etc/nagios/ignores/ignores-cat-hp-$MODULE.txt
+
+    The following is useful to paste at the top of an ignores file:
+    # This file used by /usr/lib/nagios/plugins/check_hp_hardware.py
+    # so that specific hardware errors can be ignored
+    # and the nagios alert NOT downtimed or acknowledged,
+    # thus allowing other hardware failures to alert.
+    # ----------------------------------------------------------------
+    # Ignore lines are an expiry date and a substring to match, like:
+    # [YYYY-mm-dd HH:MM] nagios error string
+    # Lines will be disabled when not matched so they can alert again,
+    # but starting a line with '*' will persist a line when not matched
+    # and should be used for flapping alerts/hardware only.
+    # Comment lines (starting with '#') and blank lines are ignored.
+    # Example ignore lines:
+    # # do not alert on fan 1 until 2016-11-17 11:00
+    # [2016-11-17 11:00] System Board (1): fans are not redundant
+    # # ignore power supply 1 until 2016-11-17 0:00, even if unmatched
+    # * [2016-11-17] Pwr. Supply Bay (1): power supply is 'Failed'
+
+    # example ignore dict
+    # {'matched': False, # set to True if it matches, check before write
+    #  'expired': False, # has ignore date passed
+    #  'line': "[2016-11-01 23:00] substring to match"
+    #  'ignore': "substring to match OR None", # None if expired
+    # }
+    """
+    ignores = []
+    if os.path.isfile(ignore_file):
+        for line in open(ignore_file).readlines():
+            d = {'matched': False, 'expired': False, 'line': line.rstrip(), 'ignore': None}
+            line = line.strip()
+            # special case lines starting with '*', do not disable if unmatched
+            persist = False
+            if line.startswith('*'):
+                persist = True
+                line = line.lstrip('*').strip()
+            # parse date lines
+            if line.startswith('['):
+                parts = re.split('\\[|\\]', line, maxsplit=2)
+                date = parts[1].strip()
+                ignore = parts[2].strip()
+                try:
+                    date = datetime.strptime(date, '%Y-%m-%d %H:%M')
+                except ValueError:
+                    try:
+                        date = datetime.strptime(date, '%Y-%m-%d')
+                    except ValueError:
+                        print("Failed to parse ignore date: {}".format(d['line']))
+                        date = None
+                    if date:
+                        # Do not alert directly at midnight UTC
+                        host_crc = crc32(gethostname()) & 0xFFFFFFFF
+                        date += timedelta(seconds=(host_crc % 86400))
+                # check if date valid and is in the future
+                if date:
+                    if datetime.now().weekday() in (5, 6):
+                        # Ignore Saturday/Sunday to not annoy on-call
+                        d['ignore'] = ignore
+                    elif date > datetime.now():
+                        d['ignore'] = ignore
+                    else:
+                        d['expired'] = True
+                    if persist and not d['expired']:
+                        # set matched True so will not get disabled on non-match
+                        d['matched'] = True
+            # comment lines and empty lines are just added
+            elif line.startswith('#') or not line:
+                # add with matched True so does not trigger a file rewrite
+                d['matched'] = True
+            # unrecognized lines left matched False so rewritten
+            ignores.append(d)
+    return ignores
+
+
+def write_ignore_file(ignores, ignore_file):
+    # if any ignores are not matched then write out file lines again
+    if any([not i['matched'] for i in ignores]):
+        dirname, basename = os.path.split(ignore_file)
+        date = datetime.now()
+        try:
+            f = tempfile.NamedTemporaryFile(dir=dirname, prefix=basename, delete=False)
+            for ignore in ignores:
+                if not ignore['matched'] and ignore['ignore']:
+                    ignore['line'] = "# not matched at {} #{}".format(
+                        date.strftime("%Y-%m-%dT%H:%M:%S"), ignore['line']
+                    )
+                elif ignore['expired']:
+                    # this won't get updated unless the alert has cleared
+                    ignore['line'] = "# expired #{}".format(ignore['line'])
+                elif not ignore['matched']:
+                    ignore['line'] = "# unknown or bad format #{}".format(ignore['line'])
+                f.write(ignore['line'] + '\n')
+            f.flush()
+            os.fsync(f.fileno())
+            f.close()
+            # NamedTemporaryFile has restricted permissions, open them up a bit
+            os.chmod(f.name, os.stat(f.name).st_mode | 0o044)
+            os.rename(f.name, ignore_file)
+        except OSError:
+            print("Failed to write {}".format(ignore_file))
+            pass
+
+
+def ignore(line, ignores):
+    # check if each ignore is in line
+    for ignore in ignores:
+        if ignore['ignore'] and ignore['ignore'] in line:
+            ignoring_output.append("Ignoring: {}".format(line))
+            # note: ignores can be updated since it is passed by reference
+            # matched=True to keep using this ignore (see write_ignore_file)
+            ignore['matched'] = True
+            return True
+    return False
+
+
+def get_hp_controller_slots():
+    """
+    TODO search for the controller slot
+
+    Use the utility to determine the current controller slot(s) available for probing
+    """
+    slots = []
+    cmd = ['/usr/sbin/hpssacli', 'ctrl', 'all', 'show']
+    try:
+        results = subprocess.check_output(cmd).decode('UTF-8')
+    except subprocess.CalledProcessError:
+        return slots
+    for line in results.splitlines():
+        if 'in Slot' in line:
+            slots.append(line.split()[5])
+    return slots
+
+
+class HWCronArgumentParser(argparse.ArgumentParser):
+    def __init__(
+        self,
+        def_write_file=None,
+        *args,
+        **kwargs
+    ):
+        super().__init__(
+            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+            *args,
+            **kwargs
+        )
+        # self.prog is populated by ArgumentParser
+        self._def_write_file = \
+            def_write_file or '/var/lib/nagios/{}.out'.format(self.prog)
+
+    def parse_args(self, *args, **kwargs):
+        self.add_argument(
+            '-w', '--write', dest='write', type=str,
+            default=self._def_write_file,
+            help='cache tool output in this file',
+        )
+        super().parse_args(*args, **kwargs)
+
+
+class HWCheckArgumentParser(argparse.ArgumentParser):
+    def __init__(
+        self,
+        def_input_file=None,
+        *args,
+        **kwargs
+    ):
+        super().__init__(
+            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+            *args,
+            **kwargs
+        )
+        # self.prog is populated by ArgumentParser
+        self._def_input_file = \
+            def_input_file or '/var/lib/nagios/{}.out'.format(self.prog)
+
+    def parse_args(self, *args, **kwargs):
+        self.add_argument(
+            '-i', '--input', dest='input_file', type=str,
+            default=self._def_input_file,
+            help='read cached tool output from this file',
+        )
+        super().parse_args(*args, **kwargs)
+
+
+class HPArgumentParser(HWCronArgumentParser):
+    def __init__(
+        self,
+        def_exclude_file=None,
+        *args,
+        **kwargs
+    ):
+        super().__init__(*args, **kwargs)
+        self._def_exclude_file = \
+            def_exclude_file or '/etc/nagios/{}.exclude.yaml'.format(self.prog)
+
+    def _expired(self, exclusion):
+        return 'expires' in exclusion and exclusion['expires'] < datetime.now()
+
+    def parse_args(self, *args, **kwargs):
+        self.add_argument(
+            '--debug', dest='debug', action='store_true',
+            help='Extra debugging',
+        )
+
+        self.add_argument(
+            '--exclude', dest='exclude', type=str, action='append',
+            help='Errors to ignore (multiple)',
+        )
+
+        self.add_argument(
+            '--exclude-file', dest='exclude_file', type=str,
+            default=self._def_exclude_file,
+            help='YAML file with errors to ignore',
+        )
+
+        # Ensure we initialize a namespace if needed,
+        # and have a reference to it
+        namespace = kwargs.get('namespace') or argparse.Namespace()
+        kwargs['namespace'] = namespace
+        # now parse args and put them in the namespace
+        super().parse_args(*args, **kwargs)
+
+        if namespace.exclude is None:
+            namespace.exclude = []
+        if os.path.exists(namespace.exclude_file):
+            with open(namespace.exclude_file) as f:
+                for i in yaml.safe_load(f):
+                    if not self._expired(i):
+                        namespace.exclude.append(i['error'])
+
+        return namespace
diff --git a/src/files/hplog/cron_hplog.py b/src/files/hplog/cron_hplog.py
new file mode 100755
index 0000000..d2b21cf
--- /dev/null
+++ b/src/files/hplog/cron_hplog.py
@@ -0,0 +1,304 @@
+#!/usr/bin/env python3
+# ------------------------------------------------
+# This file is juju managed
+# -----------------------------------------------
+
+"""
+Copyright (C) 2008-2013  James Troup <[e-mail]>
+Copyright (c) 2020 Rewrite: Drew Freiberger <[e-mail]>
+
+hplog lives in either /usr/sbin or /sbin depending on version of the
+hp-health package and cron jobs don't get a sane $PATH
+"""
+import os
+import subprocess
+import sys
+
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import (
+        read_ignore_file,
+        write_ignore_file,
+        ignore,
+        HPArgumentParser,
+    )
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import (
+        read_ignore_file,
+        write_ignore_file,
+        ignore,
+        HPArgumentParser,
+    )
+
+FLAG_PROCESSOR = {
+    't': 'parse_temperature',
+    'f': 'parse_fans',
+    'p': 'parse_power',
+    'v': 'save_log',
+}
+OUTPUT_FILE = '/var/lib/nagios/hplog.out'
+EXCLUDE_FILE = '/etc/nagios/hplog.exclude.yaml'
+DEBUG_FILE = '/var/lib/nagios/hplog.debug'
+
+
+def parse_args(argv=None):
+    parser = HPArgumentParser(
+        prog='cron_hplog',
+        def_write_file=OUTPUT_FILE,
+        def_exclude_file=EXCLUDE_FILE
+    )
+    parser.add_argument(
+        '-f', '--hplog_flags', dest='hplog_flags', type=str,
+        default=','.join(FLAG_PROCESSOR.keys()),
+        help='Flags to call hplog with',
+    )
+    parser.add_argument(
+        '-l', '--log_path', dest='log_path', type=str,
+        default=DEBUG_FILE,
+        help='Where to write hplog -v output for troubleshooting',
+    )
+    parser.add_argument(
+        '-s', '--single_psu', dest='single_psu', action='store_true',
+        help='Do not alert on lack of PSU redundancy', default=False,
+    )
+    return parser.parse_args(args=argv)
+
+
+def call_hplog(flag):
+    """
+    Grab hplogs from hpasm if available
+
+    The output of this cron script will be checked by
+    nagios via check_hplog.py.  The
+    """
+    env = 'export PATH=$PATH:/usr/sbin:/sbin'
+
+    cmd = 'hplog -{}'.format(flag)
+    try:
+        cmdline = '{}; {}'.format(env, cmd)
+        output = subprocess.check_output(cmdline, shell=True).decode('UTF-8')
+    except subprocess.CalledProcessError as e:
+        return ('Failed running command "{}" Return Code {}: {}'
+                ''.format(cmd, e.returncode, e.output))
+
+    funcname = FLAG_PROCESSOR[flag]
+    return globals()[funcname](output)
+
+
+def parse_temperature(result):
+    """
+    Temperature [hplog -t]
+              10        20        30        40        50        60        70
+    01234567890123456789012345678901234567890123456789012345678901234567890
+    ID     TYPE        LOCATION      STATUS    CURRENT  THRESHOLD
+     1  Basic Sensor I/O Zone        Normal   102F/ 39C 158F/ 70C
+     2  Basic Sensor Ambient         Normal    73F/ 23C 102F/ 39C
+     3  Basic Sensor CPU (1)         Normal    95F/ 35C 260F/127C
+     4  Basic Sensor CPU (1)         Normal    95F/ 35C 260F/127C
+     5  Basic Sensor Pwr. Supply Bay Normal   111F/ 44C 170F/ 77C
+     6  Basic Sensor CPU (2)         Normal   ---F/---C 260F/127C
+     7  Basic Sensor CPU (2)         Normal   ---F/---C 260F/127C
+    """
+    input_file = result.splitlines()
+    if os.path.isfile('/etc/nagios/skip-cat-hp-temperature.txt'):
+        return
+    header_line = input_file.pop(0).strip()
+    if header_line != "ID     TYPE        LOCATION      STATUS    CURRENT  THRESHOLD":  # noqa E501
+        return "UNKNOWN Unrecognised header line in 'hplog -t' output"
+    for line in input_file:
+        line = line.rstrip()
+        if not line:
+            continue
+        temp_id = line[0:3].strip()
+        # temp_type = line[4:16].strip()
+        temp_location = line[17:32].strip()
+        temp_location = "%s (%s)" % (temp_location, temp_id)
+        temp_status = line[33:41].strip()
+        temp_current = line[42:51].split("/")[1].strip()
+        temp_threshold = line[52:].split("/")[1].strip()
+        if temp_status not in ["Normal", "Nominal", "Absent"]:
+            return (
+                "%s: temperature is '%s' (%s / %s)" % (temp_location,
+                                                       temp_status,
+                                                       temp_current,
+                                                       temp_threshold)
+            )
+
+    return
+
+
+def parse_fans(result):
+    """
+    Fans [hplog -f]
+              10        20        30        40        50        60        70
+    01234567890123456789012345678901234567890123456789012345678901234567890
+    ID     TYPE        LOCATION      STATUS  REDUNDANT FAN SPEED
+     1  Var. Speed   I/O Zone        Normal     Yes     Medium ( 45)
+     2  Var. Speed   I/O Zone        Normal     Yes     Medium ( 45)
+     3  Var. Speed   Processor Zone  Normal     Yes     Medium ( 41)
+     4  Var. Speed   Processor Zone  Normal     Yes     Low    ( 36)
+     5  Var. Speed   Processor Zone  Normal     Yes     Low    ( 36)
+     6  Var. Speed   Processor Zone  Normal     Yes     Low    ( 36)
+    """
+    input_file = result.splitlines()
+    if os.path.isfile('/etc/nagios/skip-cat-hp-fans.txt'):
+        return
+    header_line = input_file.pop(0).strip()
+    if header_line != "ID     TYPE        LOCATION      STATUS  REDUNDANT FAN SPEED":  # noqa E501
+        return "UNKNOWN Unrecognised header line in 'hplog -f' output"
+
+    ignore_file = '/etc/nagios/ignores/ignores-cat-hp-fans.txt'
+    ignores = read_ignore_file(ignore_file)
+    for line in input_file:
+        line = line.rstrip()
+        if not line:
+            continue
+        fan_id = line[0:3].strip()
+        fan_type = line[4:16].strip()
+        fan_location = line[17:32].strip()
+        fan_location = "%s (%s)" % (fan_location, fan_id)
+        fan_status = line[33:40].strip()
+        fan_redundant = line[41:50].strip()
+        fan_speed = line[51:].strip()
+
+        (return_now, msg) = process_fan_line(
+            fan_type,
+            fan_location,
+            fan_status,
+            fan_speed,
+            fan_redundant,
+            ignores
+        )
+        if return_now:
+            return msg
+
+    write_ignore_file(ignores, ignore_file)
+
+
+def process_fan_line(
+    fan_type,
+    fan_location,
+    fan_status,
+    fan_speed,
+    fan_redundant,
+    ignores
+):
+    if fan_type == "Basic Fan":
+        return(False, None)
+
+    if fan_type not in ["Var. Speed", "Pwr. Supply", "Auto. Speed"]:
+        return(True, "UNKNOWN %s: Unrecognised fan type '%s'" % (fan_location,
+                                                                 fan_type))
+
+    if fan_status not in ["Normal", "Nominal"]:
+        err = "%s: fans are '%s' (%s / Redundant: %s)" % (fan_location,
+                                                          fan_status,
+                                                          fan_speed,
+                                                          fan_redundant)
+        if not ignore(err, ignores):
+            return(True, err)
+
+    if fan_redundant not in ["Yes", "N/A"] and fan_type == "Var. Speed":
+        err = "%s: fans are not redundant (%s / Status: %s)" % (fan_location,
+                                                                fan_speed,
+                                                                fan_redundant)
+        if not ignore(err, ignores):
+            return(True, err)
+
+    return(False, None)
+
+
+def parse_power(result):
+    """
+    Power supplies [hplog -p]
+              10        20        30        40        50        60        70
+    01234567890123456789012345678901234567890123456789012345678901234567890
+    ID     TYPE        LOCATION      STATUS  REDUNDANT
+     1  Standard     Pwr. Supply Bay Normal     Yes
+     2  Standard     Pwr. Supply Bay Normal     Yes
+    """
+    input_file = result.splitlines()
+    if os.path.isfile('/etc/nagios/skip-cat-hp-power.txt'):
+        return
+    header_line = input_file.pop(0).strip()
+    if header_line != "ID     TYPE        LOCATION      STATUS  REDUNDANT":
+        return "UNKNOWN Unrecognised header line in 'hplog -p' output"
+
+    ignore_file = '/etc/nagios/ignores/ignores-cat-hp-power.txt'
+    ignores = read_ignore_file(ignore_file)
+
+    for line in input_file:
+        line = line.rstrip()
+        if not line:
+            continue
+        power_id = line[0:3].strip()
+        power_type = line[4:16].strip()
+        power_location = line[17:32].strip()
+        power_location = "%s (%s)" % (power_location, power_id)
+        power_status = line[33:40].strip()
+        # power_redundant = line[41:50].strip()
+        if power_type != "Standard":
+            err = "%s: Unrecognised power type '%s'" % (power_location,
+                                                        power_type)
+            if not ignore(err, ignores):
+                return 'UNKNOWN {}'.format(err)
+        if not ARGS.single_psu and power_status not in ["Normal", "Nominal"]:
+            err = "%s: power supply is '%s'" % (power_location, power_status)
+            if not ignore(err, ignores):
+                return err
+    write_ignore_file(ignores, ignore_file)
+
+
+def save_log(result):
+    """
+    Save full hplog -v output for troubleshooting after alert
+    """
+    with open(ARGS.log_path, 'w') as f:
+        f.write(result)
+    return
+
+
+def main():
+    global ARGS
+    ARGS = parse_args()
+
+    try:
+        # This matches hpasmlited on latest packages for bionic on <= gen9
+        subprocess.check_call('ps -ef | grep -q hp[a]sm', shell=True)
+    except subprocess.CalledProcessError as e:
+        msg = (
+            'UNKNOWN hp[a]sm daemon not found running, cannot run hplog: '
+            '{}'.format(e.output)
+        )
+        exit = 3
+    else:
+        errors = []
+        for flag in ARGS.hplog_flags.split(','):
+            log_output = call_hplog(flag)
+            if log_output:
+                errors.append(log_output)
+
+        if len(errors) > 0:
+            msg = ('CRIT {} error(s): {}'
+                   ''.format(len(errors), ' - '.join(errors)))
+            exit = 2
+        else:
+            msg = 'OK No errors found'
+            exit = 0
+
+    if ARGS.write:
+        with open(ARGS.write, 'w') as f:
+            f.write(msg)
+    else:
+        print(msg)
+    sys.exit(exit)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/files/ilorest/check_ilorest.py b/src/files/ilorest/check_ilorest.py
new file mode 100755
index 0000000..430c632
--- /dev/null
+++ b/src/files/ilorest/check_ilorest.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+# ------------------------------------------------
+# This file is juju managed
+# ------------------------------------------------
+
+# Copyright (C) 2008, 2009, 2012  James Troup <[e-mail]>
+# Copyright (C) 2009  LaMont Jones <[e-mail]>
+
+###############################################################################
+
+from optparse import OptionParser
+
+from nagios_plugin3 import (check_file_freshness,
+                            try_check,
+                            WarnError,
+                            CriticalError)
+
+
+###############################################################################
+
+
+def check_and_open(filename, time_limit):
+    check_file_freshness(filename, time_limit)
+    return open(filename)
+
+
+###############################################################################
+
+
+def check_file_contents(input_filename, time_limit):
+    input_file = check_and_open(input_filename, time_limit)
+    for line in input_file.readlines():
+        line = line.rstrip()
+        if not line:
+            continue
+        if line.startswith("WARN"):
+            raise WarnError(line)
+        elif line.startswith("OK"):
+            print(line)
+        else:
+            raise CriticalError(line)
+
+
+###############################################################################
+
+
+def main():
+    parser = OptionParser()
+    parser.add_option(
+        "--time",
+        dest="time_limit",
+        help="freshness time limit [default=%default]",
+        metavar="SECONDS",
+        default=1200,
+        type=int
+    )
+    parser.add_option(
+        "-f", "--filename",
+        dest="input_file",
+        help=('file containing the output of '
+              'cron_ilorest.py [default=%default]'),
+        metavar="FILE",
+        default="/var/lib/nagios/ilorest.nagios",
+        type=str
+    )
+
+    (opts, args) = parser.parse_args()
+
+    try_check(check_file_contents, opts.input_file, opts.time_limit)
+    print("All OK")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/files/ilorest/cron_ilorest.py b/src/files/ilorest/cron_ilorest.py
new file mode 100755
index 0000000..739438d
--- /dev/null
+++ b/src/files/ilorest/cron_ilorest.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+# ------------------------------------------------
+# This file is juju managed
+# ------------------------------------------------
+
+# ilorest interface for Gen10 HPE machines
+# Original author: Ryan Finnie <[e-mail]>
+# Porting for the HW health charm: Andrea Ieri <[e-mail]>
+
+import json
+import sys
+import os
+from subprocess import check_output
+
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HPArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HPArgumentParser
+
+
+DEFAULT_SELECTORS = [
+    'Chassis',
+    'HpeSmartStorage',
+    'Memory',
+    'Power',
+    'Processor',
+    'Thermal',
+]
+
+EXCLUDE_FILE = '/etc/nagios/cron_ilorest.exclude.yaml'
+OUTPUT_FILE = '/var/lib/nagios/ilorest.nagios'
+
+
+class CronILOrest:
+    def __init__(self, argv=[]):
+        self.args = self.parse_args(argv)
+
+    def parse_args(self, argv=None):
+        parser = HPArgumentParser(
+            prog='cron_ilorest',
+            description=('Convert the output of ilorest into an appropriate '
+                         'Nagios status line'),
+            def_write_file=OUTPUT_FILE,
+            def_exclude_file=EXCLUDE_FILE
+        )
+
+        parser.add_argument(
+            '--selectors', dest='selectors', type=str, nargs='+',
+            default=DEFAULT_SELECTORS,
+            help='iLO selectors to run',
+        )
+
+        return parser.parse_args(args=argv)
+
+    def check_selector(self, selector):
+        if self.args.debug:
+            print('Checking selector {}'.format(selector), file=sys.stderr)
+        ilorest_output = self._get_json_ilorest_output(selector)
+
+        errors = []
+        jsonidx = -1
+        # Disregard the first chunk of data, it's banner/debug/etc
+        for jsondata in ilorest_output.split('\n{\n')[1:]:
+            # The output will be one or more JSON defs
+            jsonidx += 1
+            j = json.loads('{' + jsondata)
+            errors += self._walk_selector(j, [selector, str(jsonidx)])
+        return errors
+
+    def _get_json_ilorest_output(self, selector):
+        cmd = ['ilorest', 'list', '-j', '--selector={}'.format(selector)]
+        return check_output(cmd).decode('UTF-8')
+
+    def _get_health_status_message(self, j, crumb_trail=[]):
+        desc = j['Name']
+        if 'SerialNumber' in j:
+            desc += ' ({})'.format(j['SerialNumber'])
+        state = j.get('Status', 'null').get('State', 'unknown')
+        health = j.get('Status', 'null').get('Health', 'unknown')
+        msg = '{} ({}): {} health {}'.format(' '.join(crumb_trail),
+                                             desc,
+                                             state,
+                                             health)
+        if self.args.debug:
+            print(msg, file=sys.stderr)
+
+        if msg in self.args.exclude and self.args.debug:
+            print('Ignoring excluded error: {}'.format(msg), file=sys.stderr)
+            return []
+        else:
+            return [msg]
+
+    def _walk_selector(self, j, crumb_trail=[]):
+        errors = []
+        if j.get('Status') and j.get('Status').get('Health') != 'OK':
+            errors.extend(self._get_health_status_message(j, crumb_trail))
+
+        for keyname in j.keys():
+            # If the key value is a list, it might be a list of
+            # dicts with Status data
+            if type(j[keyname]) != list:
+                continue
+            for i in range(len(j[keyname])):
+                if type(j[keyname][i]) != dict:
+                    continue
+                if 'Status' not in j[keyname][i]:
+                    continue
+                self._walk_selector(j[keyname][i],
+                                    (crumb_trail + [keyname, str(i)]))
+        return errors
+
+
+def main(argv=None):
+    cronilorest = CronILOrest(argv)
+
+    errors = [cronilorest.check_selector(selector)
+              for selector in cronilorest.args.selectors]
+
+    if len(errors) > 0:
+        msg = 'CRIT {} error(s): {}'.format(len(errors), ' - '.join(errors))
+        exit = 2
+    else:
+        msg = 'OK No errors found'
+        exit = 0
+
+    if cronilorest.args.write:
+        if cronilorest.args.write == '-':
+            print(msg)
+        else:
+            with open(cronilorest.args.write, 'w') as f:
+                f.write(msg)
+    else:
+        # This should never happen since 'write' has a default value
+        print(msg)
+    sys.exit(exit)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/src/files/mdadm/check_mdadm.py b/src/files/mdadm/check_mdadm.py
index 56e37a8..29a82c6 100755
--- a/src/files/mdadm/check_mdadm.py
+++ b/src/files/mdadm/check_mdadm.py
@@ -2,17 +2,33 @@
 # -*- coding: us-ascii -*-
 
 import os
-
+import sys
+import argparse
 from nagios_plugin3 import CriticalError, WarnError, UnknownError, try_check
 
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HWCheckArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HWCheckArgumentParser
+
 INPUT_FILE = '/var/lib/nagios/mdadm.out'
+ARGS = argparse.Namespace()
 
 
 def parse_output():
-    if not os.path.exists(INPUT_FILE):
-        raise UnknownError('UNKNOWN: file not found ({})'.format(INPUT_FILE))
+    if not os.path.exists(ARGS.input_file):
+        raise UnknownError(
+            'UNKNOWN: file not found ({})'.format(ARGS.input_file)
+        )
 
-    with open(INPUT_FILE, 'r') as fd:
+    with open(ARGS.input_file, 'r') as fd:
         for line in fd.readlines():
             line = line.strip()
             if line.startswith('CRITICAL: '):
@@ -23,9 +39,18 @@ def parse_output():
                 print(line)
 
 
-def main():
+def parse_args(argv=None):
+    parser = HWCheckArgumentParser(
+        prog='check_mdadm',
+        def_input_file=INPUT_FILE,
+    )
+    return parser.parse_args(args=argv, namespace=ARGS)
+
+
+def main(argv):
+    parse_args(argv)
     try_check(parse_output)
 
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])
diff --git a/src/files/mdadm/cron_mdadm.py b/src/files/mdadm/cron_mdadm.py
index 5aaafa4..ddf5d5e 100755
--- a/src/files/mdadm/cron_mdadm.py
+++ b/src/files/mdadm/cron_mdadm.py
@@ -5,18 +5,31 @@ import re
 import shutil
 import subprocess
 import sys
+import argparse
 
-OUTPUT_FILE = '/var/lib/nagios/mdadm.out'
-TEMP_FILE = '/tmp/mdadm.out'
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HWCronArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HWCronArgumentParser
+
+OUTPUT_FILE = "/var/lib/nagios/mdadm.out"
+TEMP_FILE = "/tmp/mdadm.out"
+ARGS = argparse.Namespace()
 
 
 def get_devices():
     if os.path.exists('/sbin/mdadm'):
         try:
-            devices_raw = subprocess.check_output(
-                ['/sbin/mdadm', '--detail', '--scan']
-            )
-            devices_re = re.compile(r'^ARRAY\s+([^ ]+) ')
+            cmd = ["/sbin/mdadm", "--detail", "--scan"]
+            devices_raw = subprocess.check_output(cmd)
+            devices_re = re.compile(r"^ARRAY\s+([^ ]+) ")
             devices = set()
             for line in devices_raw.decode().split('\n'):
                 line = line.strip()
@@ -26,7 +39,7 @@ def get_devices():
             return devices
         except subprocess.CalledProcessError as error:
             rc = generate_output(
-                'CRITICAL: get_devices error - {}'.format(error)
+                "CRITICAL: get_devices error - {}".format(error)
             )
             if rc:
                 sys.exit(0)
@@ -37,7 +50,7 @@ def generate_output(msg):
     try:
         with open(TEMP_FILE, 'w') as fd:
             fd.write(msg)
-        shutil.move(TEMP_FILE, OUTPUT_FILE)
+        shutil.move(TEMP_FILE, ARGS.write)
         return True
     except Exception as error:
         print('Unable to generate output file:', error)
@@ -129,7 +142,7 @@ def parse_output():
         devices_stats = get_devices_stats(devices)
     except subprocess.CalledProcessError as error:
         return generate_output(
-            'WARNING: error executing mdadm: {}'.format(error)
+            "WARNING: error executing mdadm: {}".format(error)
         )
 
     msg = []
@@ -178,5 +191,18 @@ def parse_output():
     return generate_output(msg)
 
 
-if __name__ == '__main__':
+def parse_args(argv=None):
+    parser = HWCronArgumentParser(
+        prog='cron_mdadm',
+        def_write_file=OUTPUT_FILE,
+    )
+    return parser.parse_args(args=argv, namespace=ARGS)
+
+
+def main(argv):
+    parse_args(argv)
     parse_output()
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/src/files/megacli/check_megacli.py b/src/files/megacli/check_megacli.py
index ea28462..ed1e8d3 100755
--- a/src/files/megacli/check_megacli.py
+++ b/src/files/megacli/check_megacli.py
@@ -1,14 +1,31 @@
 #!/usr/bin/env python3
 # -*- coding: us-ascii -*-
 
+import argparse
+import os
 import re
-
+import sys
 from nagios_plugin3 import CriticalError, WarnError, try_check
 
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HWCheckArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HWCheckArgumentParser
+
 INPUT_FILE = '/var/lib/nagios/megacli.out'
+ARGS = argparse.Namespace()
 
 
-def handle_results(nlines, match, critical, errors, num_ldrive, num_pdrive, policy):
+def handle_results(
+    nlines, match, critical, errors, num_ldrive, num_pdrive, policy
+):
     if nlines == 0:
         raise WarnError('WARNING: controller not found')
     elif not match:
@@ -17,7 +34,8 @@ def handle_results(nlines, match, critical, errors, num_ldrive, num_pdrive, poli
         if len(errors) > 0:
             msg = ', '.join([
                 '{}({})'.format(cnt, vars()[cnt])
-                for cnt in ('failed_ld', 'wrg_policy_ld') if vars().get(cnt, 0) > 0
+                for cnt in ('failed_ld', 'wrg_policy_ld')
+                if vars().get(cnt, 0) > 0
             ])
             msg += '; '.join(errors)
         else:
@@ -30,7 +48,8 @@ def handle_results(nlines, match, critical, errors, num_ldrive, num_pdrive, poli
         if num_ldrive == 0:
             msg = 'OK: no disks configured for RAID'
         else:
-            msg = 'OK: Optimal, ldrives[{}], pdrives[{}]'.format(num_ldrive, num_pdrive)
+            msg = ('OK: Optimal, ldrives[{}], pdrives[{}]'
+                   ''.format(num_ldrive, num_pdrive))
             if policy:
                 msg += ', policy[{}]'.format(policy)
         print(msg)
@@ -57,7 +76,7 @@ def parse_output(policy=False):
     match = critical = False
     adapter_id = ldrive_id = None
 
-    with open(INPUT_FILE) as devices_raw:
+    with open(ARGS.input_file) as devices_raw:
         for line in devices_raw.readlines():
             if len(line.strip()) and not line.startswith('Exit Code'):
                 nlines += 1
@@ -107,12 +126,23 @@ def parse_output(policy=False):
                         critical = True
                     continue
 
-    handle_results(nlines, match, critical, errors, num_ldrive, num_pdrive, policy)
+    handle_results(
+        nlines, match, critical, errors, num_ldrive, num_pdrive, policy
+    )
+
+
+def parse_args(argv=None):
+    parser = HWCheckArgumentParser(
+        prog='check_megacli',
+        def_input_file=INPUT_FILE,
+    )
+    return parser.parse_args(args=argv, namespace=ARGS)
 
 
-def main(policy=False):
+def main(argv, policy=False):
+    parse_args(argv)
     try_check(parse_output, policy)
 
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])
diff --git a/src/files/megacli/check_megacli.sh b/src/files/megacli/cron_megacli.sh
similarity index 50%
rename from src/files/megacli/check_megacli.sh
rename to src/files/megacli/cron_megacli.sh
index cca1f9f..313cb96 100755
--- a/src/files/megacli/check_megacli.sh
+++ b/src/files/megacli/cron_megacli.sh
@@ -3,9 +3,20 @@
 PATH="/snap/bin:/usr/local/bin:$PATH"
 FILE=/var/lib/nagios/megacli.out
 TMP_FILE=/tmp/megacli.out
+RC_FILE=/var/lib/nagios/megacli.rc
+CMD="megacli -LDInfo -LALL -aALL -NoLog"
 
-megacli -LDInfo -LALL -aALL -NoLog  2>&1 > $TMP_FILE
+if [ $# -gt 0 ]; then
+    echo "This program will cache the output of '$CMD' as follows"
+    echo "    stdout + stderr -> $FILE"
+    echo "    return code     -> $RC_FILE"
+    echo
+    echo "It does not accept any option or argument"
+    exit 0
+fi
+
+$CMD 2>&1 > $TMP_FILE
 RC=$?
-echo $RC > /var/lib/nagios/megacli.rc
+echo $RC > $RC_FILE
 mv $TMP_FILE $FILE
 exit 0
diff --git a/src/files/nvme/check_nvme.py b/src/files/nvme/check_nvme.py
index 7009c90..d4117c9 100755
--- a/src/files/nvme/check_nvme.py
+++ b/src/files/nvme/check_nvme.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: us-ascii -*-
 
+import argparse
+import sys
 import glob
 import re
 import subprocess
@@ -50,5 +52,20 @@ def parse_output():
     print('\n'.join(alloutputs))
 
 
-if __name__ == '__main__':
+def parse_args(argv=None):
+    parser = argparse.ArgumentParser(
+        prog='check_nvme',
+        description=('this program reads the nvme smart-log and outputs an '
+                     'appropriate Nagios status line'),
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    return parser.parse_args(argv)
+
+
+def main(argv):
+    parse_args(argv)
     try_check(parse_output)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/src/files/sas2ircu/check_sas2ircu.py b/src/files/sas2ircu/check_sas2ircu.py
index 7a4c861..b38e131 100755
--- a/src/files/sas2ircu/check_sas2ircu.py
+++ b/src/files/sas2ircu/check_sas2ircu.py
@@ -1,11 +1,26 @@
 #!/usr/bin/env python3
 # -*- coding: us-ascii -*-
 
+import argparse
+import os
 import re
-
+import sys
 from nagios_plugin3 import CriticalError, WarnError, try_check
 
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HWCheckArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HWCheckArgumentParser
+
 INPUT_FILE = '/var/lib/nagios/sas2ircu.out'
+ARGS = argparse.Namespace()
 
 
 def parse_output():
@@ -22,7 +37,7 @@ def parse_output():
     devices = {}
     device = []
     critical = False
-    with open(INPUT_FILE) as devices_raw:
+    with open(ARGS.input_file) as devices_raw:
         for line in devices_raw.readlines():
             line = line.rstrip()
             for cre in encl_slot_state_cre:
@@ -49,9 +64,18 @@ def parse_output():
         print('OK: {}'.format(msg))
 
 
-def main():
+def parse_args(argv=None):
+    parser = HWCheckArgumentParser(
+        prog='check_sas2ircu',
+        def_input_file=INPUT_FILE,
+    )
+    return parser.parse_args(args=argv, namespace=ARGS)
+
+
+def main(argv):
+    parse_args(argv)
     try_check(parse_output)
 
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])
diff --git a/src/files/sas2ircu/check_sas2ircu.sh b/src/files/sas2ircu/cron_sas2ircu.sh
similarity index 50%
rename from src/files/sas2ircu/check_sas2ircu.sh
rename to src/files/sas2ircu/cron_sas2ircu.sh
index 23594a0..544df4d 100755
--- a/src/files/sas2ircu/check_sas2ircu.sh
+++ b/src/files/sas2ircu/cron_sas2ircu.sh
@@ -3,9 +3,20 @@
 PATH="/snap/bin:/usr/local/bin:$PATH"
 FILE=/var/lib/nagios/sas2ircu.out
 TMP_FILE=/tmp/sas2ircu.out
+RC_FILE=/var/lib/nagios/sas2ircu.rc
+CMD="sas2ircu 0 DISPLAY"
 
-sas2ircu 0 DISPLAY 2>&1 > $TMP_FILE
+if [ $# -gt 0 ]; then
+    echo "This program will cache the output of 'sas2ircu 0 DISPLAY' as follows"
+    echo "    stdout + stderr -> $FILE"
+    echo "    return code     -> $RC_FILE"
+    echo
+    echo "It does not accept any option or argument"
+    exit 0
+fi
+
+$CMD 2>&1 > $TMP_FILE
 RC=$?
-echo $RC > /var/lib/nagios/sas2ircu.rc
+echo $RC > $RC_FILE
 mv $TMP_FILE $FILE
 exit 0
diff --git a/src/files/sas3ircu/check_sas3ircu.py b/src/files/sas3ircu/check_sas3ircu.py
index 3e49d84..d62a90f 100755
--- a/src/files/sas3ircu/check_sas3ircu.py
+++ b/src/files/sas3ircu/check_sas3ircu.py
@@ -1,11 +1,27 @@
 #!/usr/bin/env python3
 # -*- coding: us-ascii -*-
 
+import argparse
+import os
 import re
+import sys
 from collections import defaultdict
 from nagios_plugin3 import CriticalError, WarnError, UnknownError, try_check
 
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import HWCheckArgumentParser
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import HWCheckArgumentParser
+
 INPUT_FILE = '/var/lib/nagios/sas3ircu.out'
+ARGS = argparse.Namespace()
 
 
 def parse_output(input_file):
@@ -51,10 +67,10 @@ def parse_output(input_file):
         enclosure = _kv_parse(sections['encl'])
 
     return {
-        'controller':  controller,
-        'volumes':     volumes,
-        'disks':       topology,
-        'enclosure':   enclosure
+        'controller': controller,
+        'volumes': volumes,
+        'disks': topology,
+        'enclosure': enclosure,
     }
 
 
@@ -183,10 +199,19 @@ class Status:
         print(self._status)
 
 
-def main():
-    data = parse_output(INPUT_FILE)
+def parse_args(argv=None):
+    parser = HWCheckArgumentParser(
+        prog='check_sas3ircu',
+        def_input_file=INPUT_FILE,
+    )
+    return parser.parse_args(args=argv, namespace=ARGS)
+
+
+def main(argv=None):
+    parse_args(argv)
+    data = parse_output(ARGS.input_file)
     try_check(eval_status, data)
 
 
 if __name__ == '__main__':
-    main()
+    main(sys.argv[1:])
diff --git a/src/files/sas3ircu/check_sas3ircu.sh b/src/files/sas3ircu/cron_sas3ircu.sh
similarity index 50%
rename from src/files/sas3ircu/check_sas3ircu.sh
rename to src/files/sas3ircu/cron_sas3ircu.sh
index 0b26e96..a73c0f1 100755
--- a/src/files/sas3ircu/check_sas3ircu.sh
+++ b/src/files/sas3ircu/cron_sas3ircu.sh
@@ -3,9 +3,20 @@
 PATH="/snap/bin:/usr/local/bin:$PATH"
 FILE=/var/lib/nagios/sas3ircu.out
 TMP_FILE=/tmp/sas3ircu.out
+RC_FILE=/var/lib/nagios/sas3ircu.rc
+CMD="sas3ircu 0 DISPLAY"
 
-sas3ircu 0 DISPLAY 2>&1 > $TMP_FILE
+if [ $# -gt 0 ]; then
+    echo "This program will cache the output of 'sas3ircu 0 DISPLAY' as follows"
+    echo "    stdout + stderr -> $FILE"
+    echo "    return code     -> $RC_FILE"
+    echo
+    echo "It does not accept any option or argument"
+    exit 0
+fi
+
+$CMD 2>&1 > $TMP_FILE
 RC=$?
-echo $RC > /var/lib/nagios/sas3ircu.rc
+echo $RC > $RC_FILE
 mv $TMP_FILE $FILE
 exit 0
diff --git a/src/files/ssacli/cron_ssacli.py b/src/files/ssacli/cron_ssacli.py
new file mode 100755
index 0000000..94c7ef7
--- /dev/null
+++ b/src/files/ssacli/cron_ssacli.py
@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+# -----------------------------------------------
+# This file is juju managed
+# -----------------------------------------------
+
+# Copyright (C) 2008-2013  James Troup <[e-mail]>
+# Copyright (c) 2020 Rewrite: Drew Freiberger <[e-mail]>
+
+# ssacli lives in either /usr/sbin or /sbin depending on version of the
+# package and cron jobs don't get a sane $PATH
+import os
+import re
+import subprocess
+import sys
+
+try:
+    # shared lib will be under $NAGIOS_PLUGIN_DIR at runtime
+    from hw_health_lib import (
+        read_ignore_file,
+        write_ignore_file,
+        ignore,
+        get_hp_controller_slots,
+        HPArgumentParser,
+    )
+except ImportError:
+    # shared lib will be under $CHARM_SOURCE_DIR/files/common during unit tests
+    common_libs_dir = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'common')
+    )
+    if common_libs_dir not in sys.path:
+        sys.path.append(common_libs_dir)
+    from hw_health_lib import (
+        read_ignore_file,
+        write_ignore_file,
+        ignore,
+        get_hp_controller_slots,
+        HPArgumentParser,
+    )
+
+SSACLI_BIN = '/opt/smartstorageadmin/ssacli/bin/ssacli'
+OUTPUT_FILE = '/var/lib/nagios/ssacli.out'
+EXCLUDE_FILE = '/etc/nagios/ssacli.exclude.yaml'
+
+
+def parse_args(argv=None):
+    parser = HPArgumentParser(
+        prog='cron_ssacli',
+        def_write_file=OUTPUT_FILE,
+        def_exclude_file=EXCLUDE_FILE
+    )
+    return parser.parse_args(args=argv)
+
+
+def check_array(slot):
+    """
+    RAID arrays [hpacucli]
+
+    logicaldrive 1 (68.3 GB, RAID RAID 1+0):  OK
+    logicaldrive 1 (2.8 TB, RAID RAID 6 (ADG)):  OK
+    physicaldrive 1:1 (box 1:bay 1, 72 GB): OK
+    physicaldrive 1:2 (box 1:bay 2, 72 GB): OK
+    """
+    if os.path.isfile('/etc/nagios/skip-cat-hp-array.txt'):
+        return
+
+    cmd = (
+        '{ssacli} ctrl slot={slot} ld all show status; '
+        '{ssacli} ctrl slot={slot} pd all show status'.format(ssacli=SSACLI_BIN, slot=slot)
+    )
+    try:
+        result = subprocess.check_output(cmd, shell=True).decode('UTF-8')
+        return _parse_array_output(result)
+    except subprocess.CalledProcessError as e:
+        return (
+            'UNKNOWN Call to ssacli to show ld/pd info failed. '
+            'Array Slot {} - Return Code {} - {}'
+            ''.format(slot, e.returncode, e.output)
+        )
+
+
+def _parse_array_output(output):
+    innocuous_errors = re.compile(r'^Error: The specified (device|controller) '
+                                  'does not have any (logical|physical)')
+    drive_status_line = re.compile(r'^\s*(logicaldrive|physicaldrive)')
+    ignore_file = '/etc/nagios/ignores/ignores-cat-hp-array.txt'
+    ignores = read_ignore_file(ignore_file)
+
+    for line in output.splitlines():
+        line = line.strip()
+        if not line or innocuous_errors.search(line) or not drive_status_line.search(line):
+            continue
+        (drivetype, number) = line.split()[:2]
+        status = line.split('):')[1].lstrip().upper()
+        if status != 'OK':
+            err = '{} {} is "{}"'.format(drivetype, number, status)
+            if not ignore(err, ignores):
+                return err
+    write_ignore_file(ignores, ignore_file)
+
+
+def check_controller(slot):
+    """
+    RAID controllers [hpacucli]
+
+    Smart Array 6400 in Slot 1
+      Controller Status: OK
+      Cache Status: OK
+      Battery Status: Failed (Replace Batteries)
+    """
+    if os.path.isfile('/etc/nagios/skip-cat-hp-controller.txt'):
+        return
+
+    cmd = '{ssacli} ctrl slot={slot} show status'.format(ssacli=SSACLI_BIN, slot=slot)
+    try:
+        result = subprocess.check_output(cmd, shell=True).decode('UTF-8')
+        return _parse_controller_output(result)
+    except subprocess.CalledProcessError as e:
+        return (
+            'UNKNOWN Call to ssacli to show ld/pd info failed. '
+            'Array Slot {} - Return Code {} - {}'
+            ''.format(slot, e.returncode, e.output)
+        )
+
+
+def _parse_controller_output(output):
+    controller = "Unknown"
+    ignore_file = '/etc/nagios/ignores/ignores-cat-hp-controller.txt'
+    ignores = read_ignore_file(ignore_file)
+    for line in output.splitlines():
+        line = line.strip()
+        if not line:
+            continue
+        if line.startswith("Smart Array") or line.startswith("Smart HBA"):
+            controller = line
+        else:
+            if ":" not in line:
+                err = "UNKNOWN Unrecognised line for controller '%s'" % (line)
+                return err
+            (part, status) = line.split(":")
+            status = status.strip().upper()
+            if status != "OK":
+                err = "%s on %s is '%s'" % (part, controller, status)
+                if not ignore(err, ignores):
+                    return err
+    write_ignore_file(ignores, ignore_file)
+
+
+def main():
+    global ARGS
+    ARGS = parse_args()
+
+    slots = get_hp_controller_slots()
+    if not slots:
+        msg = 'OK: no controller/array found to check'
+        exit = 0
+
+    errors = []
+    for slot in slots:
+        errors += check_controller(slot)
+        errors += check_array(slot)
+
+    if len(errors) > 0:
+        msg = 'CRIT {} error(s): {}'.format(len(errors), ' - '.join(errors))
+        exit = 2
+    else:
+        msg = 'OK No errors found'
+        exit = 0
+
+    if ARGS.write:
+        with open(ARGS.write, 'w') as f:
+            f.write(msg)
+    else:
+        print(msg)
+    sys.exit(exit)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/src/lib/hwhealth/discovery/lshw.py b/src/lib/hwhealth/discovery/lshw.py
index 7a2af8f..c2f6653 100644
--- a/src/lib/hwhealth/discovery/lshw.py
+++ b/src/lib/hwhealth/discovery/lshw.py
@@ -18,7 +18,8 @@ class Hardware(object):
                     hwinfo = json.load(fd)
             else:
                 output = subprocess.check_output(['lshw', '-json'])
-                # Note(aluria): py35 does not support extra args on subprocess.check_output
+                # Note(aluria): py35 does not support extra args on
+                # subprocess.check_output
                 output_str = output.decode(errors='ignore')
                 hwinfo = json.loads(output_str)
                 with open(self.__filename, 'w') as fd:
@@ -26,13 +27,16 @@ class Hardware(object):
 
             return hwinfo
         except PermissionError as error:
-            hookenv.log('lshw io error: {}'.format(error), hookenv.ERROR)
+            hookenv.log('lshw io error: {}'.format(error),
+                        hookenv.ERROR)
             return {}
         except subprocess.CalledProcessError as error:
-            hookenv.log('lshw subprocess error: {}'.format(error), hookenv.ERROR)
+            hookenv.log('lshw subprocess error: {}'.format(error),
+                        hookenv.ERROR)
             return {}
         except json.JSONDecodeError as error:
-            hookenv.log('lshw json error: {}'.format(error), hookenv.ERROR)
+            hookenv.log('lshw json error: {}'.format(error),
+                        hookenv.ERROR)
             return {}
 
     @property
@@ -64,7 +68,9 @@ class Hardware(object):
         bridge_class_items = []
         for item in bridge_item.get('children', [{}]):
             if item.get('class', '') == 'bridge':
-                bridge_class_items.extend(self._get_inspect_bridges(item, bridge_class))
+                bridge_class_items.extend(
+                    self._get_inspect_bridges(item, bridge_class)
+                )
             elif item.get('class', '') == bridge_class:
                 bridge_class_items.append(item)
         return bridge_class_items
@@ -74,8 +80,8 @@ class Hardware(object):
         """returns all the storage classes.
 
         Function is used by get_storage_class_info and get_disk_class_info.
-        The aim of this function is to easily parse products to detect which tool(s)
-        need to be used.
+        The aim of this function is to easily parse products to detect which
+        tool(s) need to be used.
         """
         storage = []
         # system -> bus -> bridge -> storage
@@ -87,7 +93,9 @@ class Hardware(object):
                     continue
                 for item in bridge.get('children', [{}]):
                     if item.get('class', '') == 'bridge':
-                        storage.extend(self._get_inspect_bridges(item, 'storage'))
+                        storage.extend(
+                            self._get_inspect_bridges(item, 'storage')
+                        )
                     elif item.get('class', '') == 'storage':
                         storage.append(item)
         return storage
@@ -96,16 +104,18 @@ class Hardware(object):
     def get_storage_class_info(self):
         """returns a list of storage controllers
 
-        Storage controllers have the following keys: vendor, product name, businfo and linux driver
-        The aim of the function is to easily parse products to detect which tool(s)
-        need to be used.
+        Storage controllers have the following keys: vendor, product name,
+        businfo and linux driver The aim of the function is to easily parse
+        products to detect which tool(s) need to be used.
         """
         keys = 'vendor product businfo'.split()
         config_keys = ['driver']
         storage = []
         for item in self._get_storage_class:
             storage_item = dict([(k, item.get(k)) for k in keys])
-            storage_item.update(dict([(k, item.get('configuration', {}).get(k)) for k in config_keys]))
+            storage_item.update(
+                dict([(k, item.get('configuration', {}).get(k))
+                      for k in config_keys]))
             storage_item.update({'has_children': 'children' in item})
             storage.append(storage_item)
 
@@ -115,12 +125,13 @@ class Hardware(object):
     def get_disk_class_info(self):
         """returns a list of storage devices
 
-        Storage devices have the following keys: product name, serial number, PCI bus info,
-        physical device and ID, size (capacity), logicalname (/dev/sdX) and storage parent
+        Storage devices have the following keys: product name, serial number,
+        PCI bus info, physical device and ID, size (capacity), logicalname
+        (/dev/sdX) and storage parent
         (ie. RAID controller)
 
-        The aim of the function is to easily parse products to detect which tool(s)
-        need to be used.
+        The aim of the function is to easily parse products to detect which
+        tool(s) need to be used.
         """
         keys = 'product serial businfo physid dev size logicalname'.split()
         disks = []
@@ -139,8 +150,8 @@ class Hardware(object):
         vendor, product name, businfo, logicalname (eno1...), serial number,
         linux driver and driver version, NIC firmware version and speed
 
-        The aim of the function is to easily parse products to detect which tool(s)
-        need to be used.
+        The aim of the function is to easily parse products to detect which
+        tool(s) need to be used.
         """
         keys = 'vendor product businfo logicalname serial'.split()
         config_keys = 'driver driverversion firmware speed'.split()
@@ -161,7 +172,9 @@ class Hardware(object):
         nics_filtered = []
         for nic in nics:
             nic_item = dict([(k, nic.get(k)) for k in keys])
-            nic_item.update(dict([(k, nic.get('configuration', {}).get(k)) for k in config_keys]))
+            nic_item.update(
+                dict([(k, nic.get('configuration', {}).get(k))
+                     for k in config_keys]))
             nics_filtered.append(nic_item)
         return nics_filtered
 
@@ -169,22 +182,26 @@ class Hardware(object):
     def formatted_system_info(self):
         ctxt = self.get_system
         return (
-            '{description}: vendor[{vendor}], product_name[{product}], version[{version}]'
-            ', serial[{serial}], hostname[{hostname}]').format(**ctxt)
+            '{description}: vendor[{vendor}], product_name[{product}], '
+            'version[{version}], serial[{serial}], hostname[{hostname}]'
+        ).format(**ctxt)
 
     @property
     def formatted_motherboard_info(self):
         return '\n'.join([
-            '{description}: vendor[{vendor}], product_name[{product}], version[{version}]'
-            ', serial[{serial}]'.format(**ctxt) for ctxt in self.get_motherboard])
+            '{description}: vendor[{vendor}], product_name[{product}], '
+            'version[{version}], serial[{serial}]'.format(**ctxt)
+            for ctxt in self.get_motherboard])
 
     @property
     def formatted_storage_class_info(self):
-        LINE = 'driver[{driver}], businfo[{businfo}], has_children[{has_children}]'
+        LINE = ('driver[{driver}], businfo[{businfo}], '
+                'has_children[{has_children}]')
         ctxts = []
         for ctxt in self.get_storage_class_info:
             if ctxt.get('vendor') and ctxt.get('product'):
-                tmpl = 'Storage class: vendor[{vendor}], product_name[{product}], ' + LINE
+                tmpl = ('Storage class: vendor[{vendor}],'
+                        'product_name[{product}], ') + LINE
             else:
                 tmpl = 'Storage class: {}'.format(LINE)
             ctxts.append(tmpl.format(**ctxt))
@@ -195,9 +212,10 @@ class Hardware(object):
     @property
     def formatted_disk_class_info(self):
         return '\n'.join([
-            'Disk class: ld[{logicalname}], dev[{dev}], physid[{physid}], businfo[{businfo}]'
-            ', product_name[{product}], serial[{serial}], size[{size}]'
-            ', storage_parent[{storage_parent}]'.format(**ctxt) for ctxt in self.get_disk_class_info
+            'Disk class: ld[{logicalname}], dev[{dev}], physid[{physid}], '
+            'businfo[{businfo}], product_name[{product}], serial[{serial}], '
+            'size[{size}], storage_parent[{storage_parent}]'.format(**ctxt)
+            for ctxt in self.get_disk_class_info
         ])
 
     @property
@@ -206,7 +224,8 @@ class Hardware(object):
             'NIC: iface[{logicalname}], businfo[{businfo}], vendor[{vendor}]'
             ', product_name[{product}], firmware[{firmware}], driver[{driver}'
             ', {driverversion}], serial[{serial}]'
-            ', speed[{speed}]'.format(**ctxt) for ctxt in self.get_network_class_info
+            ', speed[{speed}]'.format(**ctxt)
+            for ctxt in self.get_network_class_info
         ])
 
 
diff --git a/src/lib/hwhealth/discovery/supported_vendors.py b/src/lib/hwhealth/discovery/supported_vendors.py
index 8dc588e..ef37a5a 100644
--- a/src/lib/hwhealth/discovery/supported_vendors.py
+++ b/src/lib/hwhealth/discovery/supported_vendors.py
@@ -1,12 +1,12 @@
 # -*- coding: us-ascii -*-
 from hwhealth import tools
 
-SUPPORTED_VENDORS = {
+SUPPORTED_STORAGE = {
     'LSI Logic / Symbios Logic': {
         'SAS2308 PCI-Express Fusion-MPT SAS-2': tools.Sas2Ircu,
         'SAS3008 PCI-Express Fusion-MPT SAS-3': tools.Sas3Ircu,
         'MegaRAID SAS-3 3108 [Invader]': tools.MegaCLI,
-        },
+    },
     # 'Mellanox Technologies': {
     #     'MT27710 Family [ConnectX-4 Lx]': lambda: 'mlxconfig',
     #     'MT27700 Family [ConnectX-4]': lambda: 'mlxconfig',
@@ -18,9 +18,21 @@ SUPPORTED_VENDORS = {
         'NVMe SSD Controller SM961/PM961': tools.Nvme,
         'NVMe SSD Controller 172Xa/172Xb': tools.Nvme,
     },
-    # 'Hewlett-Packard Company': {
-    #     'Smart Array Gen9 Controllers': tools.HP,
-    # }
+    'Hewlett-Packard Company': {
+        'Smart Array Gen9 Controllers': tools.SsaCli,
+        'Smart Storage PQI 12G SAS/PCIe 3': tools.ILOrest,
+    },
+}
+
+SUPPORTED_SYSTEMS = {
+    'HPE': {
+        # tools.HpLog,  # not sure if this works on gen10+
+        tools.ILOrest,
+    },
+    'HP': {
+        tools.HpLog,
+        tools.SsaCli,
+    }
 }
 
 SUPPORTED_DRIVERS = {
diff --git a/src/lib/hwhealth/hwdiscovery.py b/src/lib/hwhealth/hwdiscovery.py
index f63a025..c23ee13 100644
--- a/src/lib/hwhealth/hwdiscovery.py
+++ b/src/lib/hwhealth/hwdiscovery.py
@@ -1,28 +1,40 @@
 # -*- coding: us-ascii -*-
+"""Discover hardware and determine tools selection."""
 import os
 import re
 import subprocess
+from itertools import chain
 
 from hwhealth import tools
 from hwhealth.discovery.lshw import Hardware
-from hwhealth.discovery.supported_vendors import SUPPORTED_VENDORS, SUPPORTED_DRIVERS
+from hwhealth.discovery.supported_vendors import (
+    SUPPORTED_STORAGE,
+    SUPPORTED_DRIVERS,
+    SUPPORTED_SYSTEMS
+)
 
 from charmhelpers.core import hookenv
 
 
 def get_tools(manufacturer='auto'):
+    """Return list of tool classes relevent for the current hardware.
+
+    In testing, we set manufacturer = test in order to test all tools classes.
+    Filtering added for known bad tools that don't work on all series combinations.
+    """
     if manufacturer == 'test':
         # Return all possible tools to aid testing
-        return [
-            # tools.HPE(), # NotImplementedYet
-            # tools.HP(),  # NotImplementedYet
-            tools.Mdadm(),
-            tools.MegaCLI(),
-            tools.Nvme(),
-            tools.Ipmi(),
-            tools.Sas2Ircu(),
-            tools.Sas3Ircu(),
-        ]
+        storage_tools = {tool
+                         for vendor in SUPPORTED_STORAGE.values()
+                         for tool in vendor.values()}
+        # Some system vendors have multiple tools, have to iterate sets
+        system_tools = set(chain.from_iterable(SUPPORTED_SYSTEMS.values()))
+        driver_tools = set(SUPPORTED_DRIVERS.values())
+        all_tools = storage_tools | system_tools | driver_tools
+        series_filtered_tools = set(
+            tool for tool in all_tools if tool.is_series_supported()
+        )
+        return series_filtered_tools
     elif manufacturer == 'auto':
         return _get_tools()
     else:
@@ -30,22 +42,28 @@ def get_tools(manufacturer='auto'):
 
 
 def _get_tools():
+    """Return list of tool classes relevent for the current hardware."""
     hwinfo = Hardware()
     toolset = set()
     for storage in hwinfo.get_storage_class_info:
-        if storage.get('vendor'):
-            if storage.get('product') in SUPPORTED_VENDORS.get(storage['vendor'], []):
-                toolset.add(SUPPORTED_VENDORS[storage['vendor']][storage['product']])
-            else:
-                hookenv.log('Product not supported: [{vendor}][{product}]'.format(**storage),
-                            hookenv.DEBUG)
+        vendor = storage.get('vendor')
+        product = storage.get('product')
+        tool = SUPPORTED_STORAGE.get(vendor, {}).get(product)
+        if isinstance(tool, list) or isinstance(tool, set):
+            toolset.update(tool)
+        elif tool:
+            toolset.add(tool)
+        else:
+            hookenv.log('Product not supported: [{}][{}]'
+                        ''.format(vendor, product), hookenv.DEBUG)
 
         driver = storage.get('driver')
         if driver:
             if driver in SUPPORTED_DRIVERS:
                 toolset.add(SUPPORTED_DRIVERS[driver])
                 continue
-            hookenv.log('Driver not supported: {}'.format(driver), hookenv.DEBUG)
+            hookenv.log('Driver not supported: {}'.format(driver),
+                        hookenv.DEBUG)
 
     # SW RAID?
     if _supports_mdadm():
@@ -54,22 +72,37 @@ def _get_tools():
     if hookenv.config('enable_ipmi'):
         toolset.add(tools.Ipmi)
 
-    executed_toolset = set([tool() for tool in toolset])
+    system_vendor = hwinfo.get_system.get('vendor')
+    tool = SUPPORTED_SYSTEMS.get(system_vendor)
+    if isinstance(tool, list) or isinstance(tool, set):
+        toolset.update(tool)
+    elif tool:
+        toolset.add(tool)
+    else:
+        hookenv.log('System vendor not supported: {}'.format(system_vendor),
+                    hookenv.DEBUG)
+
+    executed_toolset = set([tool() for tool in toolset if tool.is_series_supported])
     return executed_toolset
 
 
 def _supports_mdadm():
-    """scans for mdadm devices and returns True when the first one is found (otherwise, it returns False)
+    """Detect known mdadm supported storage devices.
+
+    Returns True when the first one is found; otherwise, it returns False)
     """
     if os.path.exists('/sbin/mdadm'):
         try:
-            devices_raw = subprocess.check_output(['/sbin/mdadm', '--detail', '--scan'])
+            devices_raw = subprocess.check_output(
+                ['/sbin/mdadm', '--detail', '--scan']
+            )
             devices_re = re.compile(r'^ARRAY\s+(\S+) ')
             for line in devices_raw.splitlines():
                 line = line.decode().strip()
                 raid_dev = devices_re.search(line)
                 if raid_dev:
-                    hookenv.log("Found md raid array {}".format(raid_dev.group(1)))
+                    hookenv.log("Found md raid array {}"
+                                "".format(raid_dev.group(1)))
                     return True
         except Exception as e:
             hookenv.log("mdadm scan failed with {}".format(e))
diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
index 970ac7d..e90cb6b 100644
--- a/src/lib/hwhealth/tools.py
+++ b/src/lib/hwhealth/tools.py
@@ -16,7 +16,9 @@ from tempfile import TemporaryDirectory
 from charmhelpers import fetch
 from charmhelpers.contrib.charmsupport import nrpe
 from charmhelpers.core import hookenv
+from charmhelpers.core.host import lsb_release
 from charmhelpers.core.templating import render
+from charms import apt
 
 
 class JujuResourceNotFound(Exception):
@@ -61,6 +63,7 @@ class Tool():
     CRONJOB_SCRIPT_MODE = 0o100755
     CRONJOB_SCRIPT_UID = 0
     CRONJOB_SCRIPT_GID = 0
+    CRONJOB_OUTPUT_DIR = '/var/lib/nagios'
     NRPE_PLUGINS_DIR = '/usr/local/lib/nagios/plugins'
     NRPE_PLUGINS_MODE = 0o100755
     NRPE_PLUGINS_UID = 0
@@ -69,27 +72,47 @@ class Tool():
     SUDOERS_MODE = 0o100440
     SUDOERS_UID = 0
     SUDOERS_GID = 0
+    SUPPORTED_SERIES = ['xenial', 'bionic', 'focal']
     TOOLS_DIR = '/usr/local/bin'
     TOOLS_MODE = 0o100755
     TOOLS_UID = 0
     TOOLS_GID = 0
 
-    def __init__(self, shortname, nrpe_opts=''):
+    def __init__(
+        self,
+        shortname=None,
+        nrpe_opts='',
+        nrpe_script=None,
+        nrpe_script_dir=None,
+        cron_script=None,
+        cron_script_dir=None,
+        cron_script_args=None,
+    ):
         self._nagios_hostname = nrpe.get_nagios_hostname()
         self._nrpe_opts = nrpe_opts
-        self._shortname = shortname
+        self._shortname = (shortname if shortname
+                           else self.__class__.__name__.lower())
         self._files_dir = os.path.join(hookenv.charm_dir(),
                                        'files',
                                        self._shortname)
+        self._nrpe_script = (nrpe_script if nrpe_script
+                             else 'check_{}.py'.format(self._shortname))
+        self._nrpe_script_dir = (nrpe_script_dir if nrpe_script_dir
+                                 else self._files_dir)
+        self._cron_script = (cron_script if cron_script
+                             else 'cron_{}.py'.format(self._shortname))
+        self._cron_script_dir = (cron_script_dir if cron_script_dir
+                                 else self._files_dir)
         self._templates_dir = os.path.join(hookenv.charm_dir(),
                                            'templates',
                                            self._shortname)
-        self._nrpe_script = 'check_{}'.format(shortname)
-        self._cronjob_script = None
-        self._cronjob_script_args = None
+        self._common_libs_dir = os.path.join(hookenv.charm_dir(),
+                                             'files/common')
+        self._common_libs = ['hw_health_lib.py']
+        self._cron_script_args = cron_script_args
 
     def _install_nrpe_plugin(self):
-        src = os.path.join(self._files_dir, self._nrpe_script)
+        src = os.path.join(self._nrpe_script_dir, self._nrpe_script)
         dst = shutil.copy(src, self.NRPE_PLUGINS_DIR)
         os.chmod(dst, self.NRPE_PLUGINS_MODE)
         os.chown(dst, uid=self.NRPE_PLUGINS_UID, gid=self.NRPE_PLUGINS_GID)
@@ -100,6 +123,21 @@ class Tool():
         )
         return dst
 
+    def _install_common_libs(self):
+        dsts = []
+        for lib in self._common_libs:
+            src = os.path.join(self._common_libs_dir, lib)
+            dst = shutil.copy(src, self.NRPE_PLUGINS_DIR)
+            os.chmod(dst, self.NRPE_PLUGINS_MODE)
+            os.chown(dst, uid=self.NRPE_PLUGINS_UID, gid=self.NRPE_PLUGINS_GID)
+            hookenv.log(
+                'Common Library {} for tool [{}] installed at as {}'
+                ''.format(lib, self._shortname, dst),
+                hookenv.DEBUG
+            )
+            dsts.append(dst)
+        return dsts
+
     def _remove_nrpe_plugin(self):
         plugin_path = os.path.join(self.NRPE_PLUGINS_DIR, self._nrpe_script)
         if not os.path.exists(plugin_path):
@@ -111,10 +149,10 @@ class Tool():
         )
 
     def configure_nrpe_check(self, nrpe_setup):
-        cmd = ' '.join([self._nrpe_script, self._nrpe_opts])
+        cmd = ' '.join([os.path.basename(self._nrpe_script), self._nrpe_opts])
         nrpe_setup.add_check(
             shortname=self._shortname,
-            description='{} Hardware Health',
+            description='{} Hardware Health'.format(self._shortname),
             check_cmd=cmd,
         )
         hookenv.log(
@@ -136,6 +174,7 @@ class Tool():
         )
 
     def install(self):
+        self._install_common_libs()
         self._install_nrpe_plugin()
         hookenv.log('Installed tool [{}]'.format(self._shortname))
 
@@ -144,30 +183,45 @@ class Tool():
         self._remove_nrpe_plugin()
         hookenv.log('Removed tool [{}]'.format(self._shortname))
 
+    @classmethod
+    def is_series_supported(cls):
+        series = lsb_release()['DISTRIB_CODENAME']
+
+        # BUG(lp#1890652) The following works around xenial layer-apt bug during test
+        if (
+            hookenv.config("manufacturer") == "test"
+            and series == "xenial"
+            and isinstance(cls, AptVendorTool)
+        ):
+            return False
+
+        return series in cls.SUPPORTED_SERIES
+
     def _install_cronjob(self, cron_user='root'):
-        assert self._cronjob_script is not None
+        assert self._cron_script is not None
 
         # Copy the cronjob script to the nagios plugins directory
-        src = os.path.join(self._files_dir, self._cronjob_script)
+        src = os.path.join(self._cron_script_dir, self._cron_script)
         dst = shutil.copy(src, self.NRPE_PLUGINS_DIR)
         os.chmod(dst, self.CRONJOB_SCRIPT_MODE)
         os.chown(dst, uid=self.CRONJOB_SCRIPT_UID, gid=self.CRONJOB_SCRIPT_GID)
         hookenv.log(
             'Cronjob script [{}] copied to {}'
-            ''.format(self._cronjob_script, self.NRPE_PLUGINS_DIR),
+            ''.format(self._cron_script, self.NRPE_PLUGINS_DIR),
             hookenv.DEBUG
         )
 
         cmdline = [dst]
-        if self._cronjob_script_args \
-                and isinstance(self._cronjob_script_args, str):
+        if self._cron_script_args \
+                and isinstance(self._cron_script_args, str):
             cmdline.extend([shlex.quote(arg)
-                            for arg in self._cronjob_script_args.split()])
-        else:
-            # Run it once to generate the temp file, otherwise the nrpe check
-            # might fail at first. For security reasons, cronjobs that allow
-            # parameters shared by the user don't run the script as root
-            # (check_ipmi allows a missing output file)
+                            for arg in self._cron_script_args.split()])
+        elif hookenv.config('manufacturer') != 'test':
+            # Run it once to generate the temp file unless we're on a test
+            # container, otherwise the nrpe check # might fail at first.
+            # For security reasons, cronjobs that allow parameters shared
+            # by the user don't run the script as root
+            # e.g. check_ipmi allows a missing output file
             subprocess.call(cmdline)
 
         # Generate random cronjob execution (internal in minutes)
@@ -193,19 +247,18 @@ class Tool():
         return dst
 
     def _remove_cronjob(self):
-        assert self._cronjob_script is not None
+        assert self._cron_script is not None
 
         crond_file = os.path.join(self.CROND_DIR,
                                   'hwhealth_{}'.format(self._shortname))
-        cronjob_script = os.path.join(self.NRPE_PLUGINS_DIR,
-                                      self._cronjob_script)
-        for filename in (crond_file, cronjob_script):
+        cron_script = os.path.join(self.NRPE_PLUGINS_DIR, self._cron_script)
+        for filename in (crond_file, cron_script):
             if not os.path.exists(filename):
                 continue
             os.remove(filename)
         hookenv.log(
             'Removed cronjob files [{}, {}]'
-            ''.format(crond_file, cronjob_script),
+            ''.format(crond_file, cron_script),
             hookenv.DEBUG
         )
 
@@ -214,7 +267,8 @@ class Tool():
         if not sudoer_path.exists():
             return
         sudoer_path.unlink()
-        hookenv.log('deleted sudoer file: {}'.format(sudoer_path), hookenv.DEBUG)
+        hookenv.log('deleted sudoer file: {}'.format(sudoer_path),
+                    hookenv.DEBUG)
 
 
 class VendorTool(Tool):
@@ -225,10 +279,8 @@ class VendorTool(Tool):
     cronjob that runs as root and saves the tool output in a temporary file
     that nrpe can read (as nagios user).
     """
-    def __init__(self, shortname):
-        super().__init__(shortname=shortname)
-        self._cronjob_script = 'check_{}.sh'.format(shortname)
-        self._nrpe_script = 'check_{}.py'.format(shortname)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.checksums = []
 
     def install(self):
@@ -260,10 +312,12 @@ class VendorTool(Tool):
                         with open(tmpfile, 'rb') as fd:
                             checksum.update(fd.read())
                         if checksum.hexdigest() not in self.checksums:
-                            raise ToolChecksumError({'shortname': self._shortname,
-                                                     'checksum': checksum.hexdigest(),
-                                                     'expected_checksums': ', '.join(self.checksums),
-                                                     })
+                            checksums_string = ', '.join(self.checksums)
+                            raise ToolChecksumError({
+                                'shortname': self._shortname,
+                                'checksum': checksum.hexdigest(),
+                                'expected_checksums': checksums_string
+                            })
                         # We could just use self.TOOLS_DIR as a destination
                         # here, but shutil.move refuses to overwrite the
                         # destination file unless it receives a full path
@@ -277,7 +331,8 @@ class VendorTool(Tool):
 
                 except PermissionError as error:
                     hookenv.log(
-                        'Unable to unzip tool {} from the provided resource: {}'
+                        'Unable to unzip tool {} '
+                        'from the provided resource: {}'
                         ''.format(self._shortname, error),
                         hookenv.ERROR
                     )
@@ -296,13 +351,194 @@ class VendorTool(Tool):
         )
 
 
+class AptVendorTool(Tool):
+    """A class representing a vendor tool binary package available via apt
+
+    An AptVendorTool is a statically linked binary or set of binaries,
+    config files, and libraries available via apt repository from Ubuntu
+    or Hardware Vendor package Archives. Since it requires root privileges
+    to run locally, we also deploy a cronjob that runs as root and saves
+    the tool output in a temporary file that nrpe can read (as nagios user).
+
+    """
+
+    HPE_ILOREST_KEY = """-----BEGIN PGP PUBLIC KEY BLOCK-----
+    Version: GnuPG v1.4.12 (GNU/Linux)
+
+    mQENBFZp0LkBCACXajRw3b4x7G7dulNYj0hUID4BtVFq/MjEb6PHckTxGxZDoQRX
+    RK54tiTFA9wq3b4P3yEFnOjbjRoI0d7Ls67FADugFO+cDCtsV9yuDlaYP/U/h2nX
+    N0R4AdYbsVd5yr6xr+GAy66Hmx5jFH3kbC+zJpOcI0tU9hcyU7gjbxu6KQ1ypI2Q
+    VRKf8sRBJXgmkOlbYx35ZUMFcmVxrLJXvUuxmAVXgT9f5M3Z3rsGt/ab+/+1TFSb
+    RsaqHsIPE0QH8ikqW4IeDQAo1T99pCdf7FWr45KFFTo7O4AZdLMWVgqeFHaSoZxJ
+    307VIINsWiwQoPp0tfU5NOOOwB1Sv3x9QgFtABEBAAG0P0hld2xldHQgUGFja2Fy
+    ZCBFbnRlcnByaXNlIENvbXBhbnkgUlNBLTIwNDgtMjUgPHNpZ25ocEBocGUuY29t
+    PokBPQQTAQIAJwUCVmnQuQIbLwUJEswDAAYLCQgHAwIGFQgCCQoLAxYCAQIeAQIX
+    gAAKCRDCCK3eJsK3l9G+B/0ekblsBeN+xHIJ28pvo2aGb2KtWBwbT1ugI+aIS17K
+    UQyHZJUQH+ZeRLvosuoiQEdcGIqmOxi2hVhSCQAOV1LAonY16ACveA5DFAEBz1+a
+    WQyx6sOLLEAVX1VqGlBXxh3XLEUWOhlAf1gZPNtHsmURTUy2h1Lv/Yoj8KLyuK2n
+    DmrLOS3Ro+RqWocaJfvAgXKgt6Fq/ChDUHOnar7lGswzMsbE/yzLJ7He4y89ImK+
+    2ktR5HhDuxqgCe9CWH6Q/1WGhUa0hZ3nbluq7maa+kPe2g7JcRzPH/nJuDCAOZ7U
+    6mHE8j0kMQMYjgaYEx2wc02aQRmPyxhbDLjSbtjomXRr
+    =voON
+    -----END PGP PUBLIC KEY BLOCK-----"""
+    HPE_MCP_KEY = """-----BEGIN PGP PUBLIC KEY BLOCK-----
+    Version: GnuPG v1.4.12 (MingW32)
+
+    mQENBFRtGAgBCADlSku65P14hVdx9E/W0n6MwuB3WGqmsyKNoa3HezFdMjWERldI
+    NNUdi8O28cZ6j2+Hi9L1HeQIQ9+7FHpR3JyQePBJtRX8WSEusfRtML98opDhJxKm
+    8Jyxb7aTvCwdNHz3yxADINkMtOj5oRm7VCr8XHkG7YU27ELs8B+BXWvjO21oSosi
+    FurnhT+H3hQsYXfYA55aa21q0qX+L5dFJSNdzZVo7m9ybioVv2R5+PfBvdaSxCnm
+    OpcGXFaKAsqVHeTW0pd3sdkin1rkbhOBaU5lFBt2ZiMtKpKHpT8TZnqHpFHFbgi8
+    j2ARJj4IDct2OGILddUIZSFyue6WE2hpV5c/ABEBAAG0OEhld2xldHQtUGFja2Fy
+    ZCBDb21wYW55IFJTQSAoSFAgQ29kZXNpZ25pbmcgU2VydmljZSkgLSAxiQE+BBMB
+    AgAoBQJUbRgIAhsDBQkSzAMABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD6
+    3Y1ksSdeo6BJCADOfIPPLPpIOnFK9jH4t8lLUd+RyMc+alA3uTDPUJa/ZHa6DHfh
+    42iaPYVEV8OG0tnbMlHmwvsZ5c1/MRMw1UbxCvD88P2qM4SUrUjQUlSCms2GLGvF
+    ftFXBiOJQ7/yBc9o+yoSvwPrrTxSCk4+Sqm0IfVXVzChDM9dM9YPY2Vzjd+LUaYC
+    3X+eSuggUDO0TmJLJd7tZdF9fVXq3lr63BZ5PY98MTCuOoeSMDa9FIUQf6vn6UUJ
+    MDSRZ9OzhpNJOKR+ShVRwDK6My8gtVIW1EAW2w3VQWI2UNF07aLeO8UG6nTNWA23
+    +OuZkUdgQovjcq01caSefgOkmiQOx6d74CAk
+    =X+eo
+    -----END PGP PUBLIC KEY BLOCK-----"""
+
+    HPE_MCP_REPO_TMPL = (
+        'deb http://downloads.linux.hpe.com/SDR/repo/mcp {series}/current-gen9 non-free'
+    )
+    HPE_ILOREST_REPO_TMPL = (
+        'deb http://downloads.linux.hpe.com/SDR/repo/ilorest {series}/current non-free'
+    )
+
+    # HP doesn't have focal APT sources as of yet
+    APT_SOURCES = {
+        'ssacli': {
+            'xenial': HPE_MCP_REPO_TMPL.format(series='xenial'),
+            'bionic': HPE_MCP_REPO_TMPL.format(series='bionic'),
+        },
+        'ilorest': {
+            'xenial': HPE_ILOREST_REPO_TMPL.format(series='xenial'),
+            'bionic': HPE_ILOREST_REPO_TMPL.format(series='bionic'),
+        },
+        'hplog': {
+            'xenial': HPE_MCP_REPO_TMPL.format(series='xenial'),
+            'bionic': HPE_MCP_REPO_TMPL.format(series='bionic'),
+        },
+    }
+    APT_KEYS = {
+        'ssacli': {
+            'xenial': HPE_MCP_KEY,
+            'bionic': HPE_MCP_KEY,
+        },
+        'ilorest': {
+            'xenial': HPE_ILOREST_KEY,
+            'bionic': HPE_ILOREST_KEY,
+        },
+        'hplog': {
+            'xenial': HPE_MCP_KEY,
+            'bionic': HPE_MCP_KEY,
+        },
+    }
+
+    def __init__(self, shortname=None, apt_packages=[]):
+        super().__init__(
+            shortname=shortname,
+            nrpe_script='check_hw_health_cron_output.py',
+            nrpe_opts='--filename {}/{}.out'.format(self.CRONJOB_OUTPUT_DIR,
+                                                    shortname)
+        )
+        self.apt_packages = (apt_packages if apt_packages
+                             else [self.__class__.__name__.lower()])
+        self._nrpe_script_dir = self._common_libs_dir
+
+    def install(self):
+        self._install_packages()
+        self.install_cronjob()
+        super().install()
+
+    def remove(self):
+        self._remove_cronjob()
+        self._remove_packages()
+        super().remove()
+
+    def _install_packages(self):
+        """
+        Install the apt packages via layer-apt
+
+        As deb packages manage their own checksums and each cloud can point to
+        trusted repositories via install_sources and install_keys config, no
+        checksumming is necessary as in resource-shipped VendorTool.
+
+        Each instantiation should configure it's apt_packages based on the
+        hardware present on the system.
+        """
+        self._add_apt_source()
+        if hookenv.config('manufacturer') == 'test':
+            # If we are forcing install on a container for functional tests,
+            # we should only download and not install the packages, as some
+            # vendor tools depend on hardware to be preset to complete postinst
+            # need one option added per package
+            apt.queue_install(self.apt_packages, options=["--download-only" for _ in self.apt_packages])
+        else:
+            apt.queue_install(self.apt_packages)
+
+    def _add_apt_source(self):
+        series = lsb_release()['DISTRIB_CODENAME']
+        if self._shortname not in self.APT_SOURCES and self._shortname not in self.APT_KEYS:
+            return
+        if series in self.APT_SOURCES[self._shortname]:
+            apt.add_source(self.APT_SOURCES[self._shortname][series],
+                           key=self.APT_KEYS[self._shortname][series])
+
+    def _remove_packages(self):
+        apt.purge(self.apt_packages)
+
+    def install_cronjob(self):
+        hookenv.log(
+            'Attempting AptVendorTool cronjob script install [{}]'
+            ''.format(self._cron_script),
+            hookenv.DEBUG
+        )
+        # Don't install a cronjob until the tools are installed
+        if self.is_apt_installed():
+            hookenv.log(
+                'calling _install_cronjob for {}'
+                ''.format(self._cron_script),
+                hookenv.DEBUG
+            )
+            self._install_cronjob()
+
+    def configure_nrpe_check(self, nrpe_setup):
+        # Don't drop nrpe checks until the APT package is successfully
+        # installed or we'll get red warnings due to Apt errors which
+        # should just be reported through juju status
+        if self.is_apt_installed():
+            super().configure_nrpe_check(nrpe_setup)
+
+    def is_apt_installed(self):
+        """
+        Check if packaged queued for install are installed
+
+        The apt layer will install packages in the background, this method
+        allows the reactive layer to know when the apt packages have finished
+        installing so that it may go on to configure the nrpe layer of tools
+        """
+        if hookenv.config('manufacturer') == 'test':
+            # it is okay to skip this part in testing as layer-apt will block
+            # if the package is not downloadable from sources
+            return True
+        apt_installed_packages = apt.installed()
+        for package in self.apt_packages:
+            if package not in apt_installed_packages:
+                return False
+        return True
+
+
 class Sas3Ircu(VendorTool):
     """A class representing the sas3ircu tool
 
     This is a tool supporting the LSI SAS 12Gb/s controllers
     """
     def __init__(self):
-        super().__init__(shortname='sas3ircu')
+        super().__init__(cron_script='cron_sas3ircu.sh')
         self.checksums = [
             'f150eb37bb332668949a3eccf9636e0e03f874aecd17a39d586082c6be1386bd',
             'd69967057992134df1b136f83bc775a641e32c4efc741def3ef6f6a25a9a14b5',
@@ -315,8 +551,8 @@ class Sas2Ircu(VendorTool):
     This is a tool supporting the LSI SAS 6Gb/s controllers
     """
     def __init__(self):
-        super().__init__(shortname='sas2ircu')
-        self.checksums = ['37467826d0b22aad47287efe70bb34e47f475d70e9b1b64cbd63f57607701e73']
+        super().__init__(cron_script='cron_sas2ircu.sh')
+        self.checksums = ['37467826d0b22aad47287efe70bb34e47f475d70e9b1b64cbd63f57607701e73']  # noqa: E501
 
 
 class MegaCLI(VendorTool):
@@ -325,7 +561,7 @@ class MegaCLI(VendorTool):
     This is a tool supporting the LSI MegaRAID SAS controllers
     """
     def __init__(self):
-        super().__init__(shortname='megacli')
+        super().__init__(cron_script='cron_megacli.sh')
         self.checksums = [
             '34f1a235543662615ee35f458317380b3f89fac0e415dee755e0dbc7c4cf6f92',
             '1c4effe33ee5db82227e05925dd629771fd49c7d2be2382d48c48a864452cdec',
@@ -333,6 +569,40 @@ class MegaCLI(VendorTool):
         ]
 
 
+class HpLog(AptVendorTool):
+    """A class representing the hplog tool
+
+    This is a tool supporting the LSI MegaRAID SAS controllers
+    """
+
+    SUPPORTED_SERIES = ['xenial', 'bionic']
+
+    def __init__(self):
+        super().__init__(apt_packages=['hp-health'])
+
+
+class SsaCli(AptVendorTool):
+    """A class representing the ssacli tool
+
+    This is a tool supporting the HP Smart Array controllers
+    """
+
+    SUPPORTED_SERIES = ['xenial', 'bionic']
+
+    def __init__(self):
+        super().__init__()
+
+
+class ILOrest(AptVendorTool):
+    """A class representing the ILOrest vendor tool (HPE hardware (Gen 10+)
+    """
+
+    SUPPORTED_SERIES = ['xenial', 'bionic']
+
+    def __init__(self):
+        super().__init__()
+
+
 class Mdadm(VendorTool):
     """A class representing the mdadm tool (software RAID)
 
@@ -340,10 +610,7 @@ class Mdadm(VendorTool):
     installation as it has a cronjob + check script
     """
     def __init__(self):
-        shortname = 'mdadm'
-        super().__init__(shortname=shortname)
-        self._cronjob_script = 'cron_{}.py'.format(shortname)
-        self._nrpe_script = 'check_{}.py'.format(shortname)
+        super().__init__()
 
     def install(self):
         # mdadm should already be installed, but let's check
@@ -368,11 +635,11 @@ class Ipmi(Tool):
     actual nrpe check, which is imported as a git submodule
     """
     def __init__(self, nrpe_opts=''):
-        super().__init__(shortname='ipmi')
-        self._nrpe_script = 'check_ipmi.py'
+        super().__init__(
+            cron_script='cron_ipmi_sensors.py',
+            cron_script_args=hookenv.config('ipmi_check_options')
+        )
         self._sudoer_file = '99-check_ipmi_sensor'
-        self._cronjob_script = 'cron_ipmi_sensors.py'
-        self._cronjob_script_args = hookenv.config('ipmi_check_options')
 
     def configure_nrpe_check(self, nrpe_setup):
         # extra options for check_ipmi_sensors Perl script are configured in
@@ -423,37 +690,17 @@ class Ipmi(Tool):
         return dst
 
 
-class HP(VendorTool):
-    """A class representing tools needed to monitor HP hardware
-
-    This class will need to install tools such as hponcfg, hp-health, and
-    hpssacli
-    """
-    def __init__(self):
-        raise NotImplementedError
-
-
-class HPE(VendorTool):
-    """A class representing tools needed to monitor HPE hardware
-
-    This class will need to install tools such as hponcfg and ilorest
-    """
-    def __init__(self):
-        raise NotImplementedError
-
-
 class Nvme(Tool):
     """A class representing the nvme tool (userspace tooling to control NVMe)
 
-    Our nvme check kind of behaves like a VendorTool for the purpose of
-    installation as it has a cronjob + check script
+    This is a direct subclass of Tool because unlike a VendorTool we are not
+    using a cronjob script
     """
     def __init__(self):
-        shortname = 'nvme'
-        super().__init__(shortname=shortname)
-        self._nrpe_script = 'check_{}.py'.format(shortname)
+        super().__init__()
         self._sudoer_template = '99-check_nvme.tmpl'
         self._sudoer_file = '99-check_nvme'
+        self._cron_script = None
 
     def install(self):
         # mdadm should already be installed, but let's check
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 58c709a..a06914e 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -18,6 +18,7 @@ description: |
     nvme
     sas2ircu
     sas3ircu
+    ilorest
 
 tags:
 - monitoring
diff --git a/src/reactive/hw_health.py b/src/reactive/hw_health.py
index 6619dd4..a04f790 100644
--- a/src/reactive/hw_health.py
+++ b/src/reactive/hw_health.py
@@ -10,7 +10,16 @@ from hwhealth.hwdiscovery import get_tools
 from hwhealth import tools
 
 
+def _set_install_status(tool):
+    if isinstance(tool, tools.VendorTool) and not isinstance(tool, tools.Mdadm):
+        status.maintenance('Installing from attached resource')
+    elif isinstance(tool, tools.AptVendorTool):
+        status.maintenance('Installing vendor tools via apt')
+        set_flag('hw-health.wait-for-vendor-apt')
+
+
 @when_none('hw-health.installed', 'hw-health.unsupported')
+@when('nrpe-external-master.available')
 @when('general-info.connected')
 def install():
     manufacturer = hookenv.config('manufacturer')
@@ -32,9 +41,10 @@ def install():
     else:
         try:
             tool_list = list()
-            for tool in toolset:
-                if isinstance(tool, tools.VendorTool) and not isinstance(tool, tools.Mdadm):
-                    status.maintenance('Installing from attached resource')
+            for toolClass in toolset:
+                tool = toolClass()
+                _set_install_status(tool)
+                status.maintenance('Installing tool {}'.format(type(tool).__name__))
                 tool.install()
                 # Save the class name in the unit kv db. This will be reused when
                 # reconfiguring or removing the checks
@@ -84,6 +94,24 @@ def remove_tools():
     clear_flag('hw-health.configured')
 
 
+@when('hw-health.wait-for-vendor-apt')
+def wait_for_vendor_apt():
+    # cycle through any vendor tools that are of type AptVendorTool and
+    # check if all packages needed are installed.  If not, eject and wait
+    unitdb = unitdata.kv()
+    for tool_class_name in unitdb.get('toolset', set()):
+        # Re-instantiate the tool from the saved class name
+        tool_class = getattr(tools, tool_class_name)
+        if isinstance(tool_class, tools.AptVendorTool):
+            if tool_class.is_apt_installed():
+                tool_class.install_cronjob()
+            else:
+                status.maintenance('Waiting for vendor tools to install via apt')
+                return
+    clear_flag('hw-health.wait-for-vendor-apt')
+    clear_flag('hw-health.configured')
+
+
 @when('config.changed')
 @when_not('config.changed.manufacturer')
 def config_changed():
diff --git a/src/tests/expected/lshw.py b/src/tests/expected/lshw.py
new file mode 100644
index 0000000..d11909f
--- /dev/null
+++ b/src/tests/expected/lshw.py
@@ -0,0 +1,1917 @@
+EXPECTED = {
+    "lshw.dell.01.json": {
+        "system": {
+            "description": "Rack Mount Chassis",
+            "hostname": "compute-4",
+            "product": "PowerEdge R730 (SKU=NotProvided;ModelName=PowerEdge R730, DBE)",  # noqa E501
+            "serial": "3YMGWL2",
+            "vendor": "Dell Inc.",
+            "version": None,
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "04N3DF",
+                "serial": ".3YMGWL2.CNFCP0077F0059.",
+                "vendor": "Dell Inc.",
+                "version": "A10",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:03:00.0",
+                "driver": "megaraid_sas",
+                "has_children": True,
+                "product": "MegaRAID SAS-3 3108 [Invader]",
+                "vendor": "LSI Logic / Symbios Logic",
+            },
+            {
+                "businfo": "pci@0000:00:11.4",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset sSATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:1f.2",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset 6-Port SATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:82:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "PCIe Data Center SSD",
+                "vendor": "Intel Corporation",
+            },
+        ],
+        "disk_class_info": [
+            {
+                "businfo": "scsi@0:2.0.0",
+                "dev": "8:0",
+                "logicalname": "/dev/sda",
+                "physid": "2.0.0",
+                "product": "PERC H730P Mini",
+                "serial": "00174c7006cbabeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.1.0",
+                "dev": "8:16",
+                "logicalname": "/dev/sdb",
+                "physid": "2.1.0",
+                "product": "PERC H730P Mini",
+                "serial": "00f7e28406ccabeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.2.0",
+                "dev": "8:32",
+                "logicalname": "/dev/sdc",
+                "physid": "2.2.0",
+                "product": "PERC H730P Mini",
+                "serial": "0024b29406cdabeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.3.0",
+                "dev": "8:48",
+                "logicalname": "/dev/sdd",
+                "physid": "2.3.0",
+                "product": "PERC H730P Mini",
+                "serial": "007a79a506ceabeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.4.0",
+                "dev": "8:64",
+                "logicalname": ["/dev/sde", "/srv/node/sde"],
+                "physid": "2.4.0",
+                "product": "PERC H730P Mini",
+                "serial": "0005ebba06cfabeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.5.0",
+                "dev": "8:80",
+                "logicalname": ["/dev/sdf", "/srv/node/sdf"],
+                "physid": "2.5.0",
+                "product": "PERC H730P Mini",
+                "serial": "005c35cc06d1abeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+            {
+                "businfo": "scsi@0:2.6.0",
+                "dev": "8:96",
+                "logicalname": ["/dev/sdg", "/srv/node/sdg"],
+                "physid": "2.6.0",
+                "product": "PERC H730P Mini",
+                "serial": "00e046dd06d2abeb2100aa7515604609",
+                "size": 4000225165312,
+                "storage_parent": "MegaRAID SAS-3 3108 [Invader]",
+            },
+        ],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:01:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "eno1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:01:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "eno2",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:01:02.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s2f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:02.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s2f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.2",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f2",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.3",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.4",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.5",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:03.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s3f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.2",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f2",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.3",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.4",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.5",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:04.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s4f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:05.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:01:05.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2810000034)",
+                "logicalname": "enp1s5f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:83:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:83:02.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s2f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:02.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s2f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.2",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f2",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.3",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.4",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.5",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:03.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s3f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.2",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f2",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.3",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f3",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.4",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f4",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.5",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.6",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f6",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:04.7",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s4f7",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:05.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s5",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+            {
+                "businfo": "pci@0000:83:05.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.3012 (DEL2420110034)",
+                "logicalname": "enp131s5f1",
+                "product": "Illegal Vendor ID",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Illegal Vendor ID",
+            },
+        ],
+    },
+    "lshw.dell.02.json": {
+        "system": {
+            "description": "Notebook",
+            "hostname": "pluto",
+            "product": "Precision 7520 (07B0)",
+            "serial": "1N79PH2",
+            "vendor": "Dell Inc.",
+            "version": None,
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "04FCWT",
+                "serial": "/1N79PH2/CN129637BG002D/",
+                "vendor": "Dell Inc.",
+                "version": "A00",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:00:17.0",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Q170/Q150/B150/H170/H110/Z170/CM236 Chipset SATA Controller [AHCI Mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:3c:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "NVMe SSD Controller SM961/PM961",
+                "vendor": "Samsung Electronics Co Ltd",
+            },
+        ],
+        "disk_class_info": [],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:01:00.0",
+                "driver": "iwlwifi",
+                "driverversion": "4.15.0-46-generic",
+                "firmware": "34.0.1",
+                "logicalname": "wlp1s0",
+                "product": "Wireless 8265 / 8275",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:1f.6",
+                "driver": "e1000e",
+                "driverversion": "3.2.6-k",
+                "firmware": "0.1-3",
+                "logicalname": "enp0s31f6",
+                "product": "Ethernet Connection (5) I219-LM",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "1Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+        ],
+    },
+    "lshw.hp.json": {
+        "system": {
+            "description": "Rack Mount Chassis",
+            "hostname": "hpmachine",
+            "product": "ProLiant DL380 Gen9 (719061-B21)",
+            "serial": "MXQ53804X4",
+            "vendor": "HP",
+            "version": None,
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": None,
+                "serial": None,
+                "vendor": None,
+                "version": None,
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:08:00.0",
+                "driver": "hpsa",
+                "has_children": True,
+                "product": "Smart Array Gen9 Controllers",
+                "vendor": "Hewlett-Packard Company",
+            },
+            {
+                "businfo": "pci@0000:0b:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "PCIe Data Center SSD",
+                "vendor": "Intel Corporation",
+            },
+        ],
+        "disk_class_info": [],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:05:00.0",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800005ab",
+                "logicalname": "ens1f0",
+                "product": "Ethernet Controller 10-Gigabit X540-AT2",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:05:00.1",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800005ab",
+                "logicalname": "ens1f1",
+                "product": "Ethernet Controller 10-Gigabit X540-AT2",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:04:00.0",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800005ac",
+                "logicalname": "eno49",
+                "product": "Ethernet Controller 10-Gigabit X540-AT2",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:04:00.1",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800005ac",
+                "logicalname": "eno50",
+                "product": "Ethernet Controller 10-Gigabit X540-AT2",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:02:00.0",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.41 NCSI v1.3.7.0",
+                "logicalname": "eno1",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Broadcom Corporation",
+            },
+            {
+                "businfo": "pci@0000:02:00.1",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.41 NCSI v1.3.7.0",
+                "logicalname": "eno2",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Broadcom Corporation",
+            },
+            {
+                "businfo": "pci@0000:02:00.2",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.41 NCSI v1.3.7.0",
+                "logicalname": "eno3",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Broadcom Corporation",
+            },
+            {
+                "businfo": "pci@0000:02:00.3",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.41 NCSI v1.3.7.0",
+                "logicalname": "eno4",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Broadcom Corporation",
+            },
+        ],
+    },
+    "lshw.hpe.nonvme.json": {
+        "system": {
+            "description": "Rack Mount Chassis",
+            "hostname": "lcpip-hcosmg01",
+            "product": "ProLiant DL380 Gen10 (868706-B21)",
+            "serial": "2M291303M6",
+            "vendor": "HPE",
+            "version": None,
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "ProLiant DL380 Gen10",
+                "serial": "PFARA%%LMBR4ZT",
+                "vendor": "HPE",
+                "version": None,
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:5c:00.0",
+                "driver": "smartpqi",
+                "has_children": True,
+                "product": "Smart Storage PQI 12G SAS/PCIe 3",
+                "vendor": "Adaptec",
+            }
+        ],
+        "disk_class_info": [
+            {
+                "businfo": "scsi@1:1.0.0",
+                "dev": "8:0",
+                "logicalname": "/dev/sda",
+                "physid": "1.0.0",
+                "product": "LOGICAL VOLUME",
+                "serial": "PEYHC0DRHBU40M",
+                "size": 8001529315328,
+                "storage_parent": "Smart Storage PQI 12G SAS/PCIe 3",
+            },
+            {
+                "businfo": "scsi@1:1.0.1",
+                "dev": "8:16",
+                "logicalname": "/dev/sdb",
+                "physid": "1.0.1",
+                "product": "LOGICAL VOLUME",
+                "serial": "PEYHC0DRHBU40M",
+                "size": 800131645440,
+                "storage_parent": "Smart Storage PQI 12G SAS/PCIe 3",
+            },
+        ],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:02:00.0",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.46 NCSI v1.5.1.0",
+                "logicalname": "eno1",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "2e:77:1a:56:c8:fb",
+                "speed": "1Gbit/s",
+                "vendor": "Broadcom Inc. and subsidiaries",
+            },
+            {
+                "businfo": "pci@0000:02:00.1",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.46 NCSI v1.5.1.0",
+                "logicalname": "eno2",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "2e:77:1a:56:c8:fb",
+                "speed": "1Gbit/s",
+                "vendor": "Broadcom Inc. and subsidiaries",
+            },
+            {
+                "businfo": "pci@0000:02:00.2",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.46 NCSI v1.5.1.0",
+                "logicalname": "eno3",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "b8:83:03:52:42:26",
+                "speed": None,
+                "vendor": "Broadcom Inc. and subsidiaries",
+            },
+            {
+                "businfo": "pci@0000:02:00.3",
+                "driver": "tg3",
+                "driverversion": "3.137",
+                "firmware": "5719-v1.46 NCSI v1.5.1.0",
+                "logicalname": "eno4",
+                "product": "NetXtreme BCM5719 Gigabit Ethernet PCIe",
+                "serial": "b8:83:03:52:42:27",
+                "speed": None,
+                "vendor": "Broadcom Inc. and subsidiaries",
+            },
+            {
+                "businfo": "pci@0000:5d:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.23.8052 (HP_2690110034)",
+                "logicalname": "eno5",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "a2:ce:45:45:2b:ea",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:5d:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.23.8052 (HP_2690110034)",
+                "logicalname": "eno6",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "a2:ce:45:45:2b:ea",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+        ],
+    },
+    "lshw.huawei.json": {
+        "system": {
+            "description": "System",
+            "hostname": "huaweimachine",
+            "product": "RH2288H V3 (Type1Sku0)",
+            "serial": "2102311GHG10G2000031",
+            "vendor": "Huawei",
+            "version": "V100R003",
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "BC11HGSA0",
+                "serial": "022HLVCNFB004121",
+                "vendor": "Huawei",
+                "version": "V100R003",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:01:00.0",
+                "driver": "mpt3sas",
+                "has_children": True,
+                "product": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+                "vendor": "LSI Logic / Symbios Logic",
+            },
+            {
+                "businfo": "pci@0000:03:00.0",
+                "driver": "hio",
+                "has_children": False,
+                "product": None,
+                "vendor": None,
+            },
+            {
+                "businfo": "pci@0000:00:11.4",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset sSATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:1f.2",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset 6-Port SATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+        ],
+        "disk_class_info": [
+            {
+                "businfo": "scsi@0:0.0.0",
+                "dev": "8:0",
+                "logicalname": "/dev/sda",
+                "physid": "0.0.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ6T0XS",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.1.0",
+                "dev": "8:16",
+                "logicalname": "/dev/sdb",
+                "physid": "0.1.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ8L6XS",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.2.0",
+                "dev": "8:32",
+                "logicalname": "/dev/sdc",
+                "physid": "0.2.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ93NES",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.3.0",
+                "dev": "8:48",
+                "logicalname": "/dev/sdd",
+                "physid": "0.3.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ93J3S",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.4.0",
+                "dev": "8:64",
+                "logicalname": "/dev/sde",
+                "physid": "0.4.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ6SZYS",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.5.0",
+                "dev": "8:80",
+                "logicalname": "/dev/sdf",
+                "physid": "0.5.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ93MKS",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.6.0",
+                "dev": "8:96",
+                "logicalname": "/dev/sdg",
+                "physid": "0.6.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ8L7TS",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+            {
+                "businfo": "scsi@0:0.7.0",
+                "dev": "8:112",
+                "logicalname": "/dev/sdh",
+                "physid": "0.7.0",
+                "product": "HGST HUS724040AL",
+                "serial": "PN1334PEJ8L85S",
+                "size": 4000787030016,
+                "storage_parent": "SAS2308 PCI-Express Fusion-MPT SAS-2",
+            },
+        ],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:02:00.0",
+                "driver": "igb",
+                "driverversion": "5.4.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp2s0f0",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "1Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:02:00.1",
+                "driver": "igb",
+                "driverversion": "5.4.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp2s0f1",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "1Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:82:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.18.2000 (MT_2420110034)",
+                "logicalname": "enp130s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:82:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.18.2000 (MT_2420110034)",
+                "logicalname": "enp130s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:81:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.18.2000 (MT_2420110034)",
+                "logicalname": "enp129s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:81:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.18.2000 (MT_2420110034)",
+                "logicalname": "enp129s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Mellanox Technologies",
+            },
+        ],
+    },
+    "lshw.supermicro.notools.json": {
+        "system": {
+            "description": "Computer",
+            "hostname": "supermicro01",
+            "product": "SYS-6029U-TR4T (To be filled by O.E.M.)",
+            "serial": "E263684X8302310",
+            "vendor": "Supermicro",
+            "version": "0123456789",
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "X11DPU",
+                "serial": "OM181S021896",
+                "vendor": "Supermicro",
+                "version": "1.10",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:00:11.5",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SSATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:17.0",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+        ],
+        "disk_class_info": [],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:18:00.0",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno1",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.1",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno2",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.2",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno3",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.3",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno4",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:af:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp175s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:af:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp175s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+        ],
+    },
+    "lshw.supermicro.nvme.json": {
+        "system": {
+            "description": "Computer",
+            "hostname": "supermicro-nvme",
+            "product": "SYS-2029U-TN24R4T (To be filled by O.E.M.)",
+            "serial": "E264025X8400712",
+            "vendor": "Supermicro",
+            "version": "0123456789",
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "X11DPU",
+                "serial": "OM183S019050",
+                "vendor": "Supermicro",
+                "version": "1.10",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:00:11.5",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SSATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:17.0",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:60:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:61:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:62:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:63:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:64:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:65:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:66:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:67:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:68:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:69:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:6a:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+        ],
+        "disk_class_info": [],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:18:00.0",
+                "driver": "ixgbe",
+                "driverversion": "5.1.0-k",
+                "firmware": "0x800005f8",
+                "logicalname": "eno1",
+                "product": "Ethernet Controller 10G X550T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.1",
+                "driver": "ixgbe",
+                "driverversion": "5.1.0-k",
+                "firmware": "0x800005f8",
+                "logicalname": "eno2",
+                "product": "Ethernet Controller 10G X550T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:19:00.0",
+                "driver": "ixgbe",
+                "driverversion": "5.1.0-k",
+                "firmware": "0x800005f9",
+                "logicalname": "eno3",
+                "product": "Ethernet Controller 10G X550T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:19:00.1",
+                "driver": "ixgbe",
+                "driverversion": "5.1.0-k",
+                "firmware": "0x800005f9",
+                "logicalname": "eno4",
+                "product": "Ethernet Controller 10G X550T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:3b:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "12.17.2020 (SM_2001000001033)",
+                "logicalname": "enp59s0f0",
+                "product": "MT27700 Family [ConnectX-4]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:3b:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "12.17.2020 (SM_2001000001033)",
+                "logicalname": "enp59s0f1",
+                "product": "MT27700 Family [ConnectX-4]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+        ],
+    },
+    "lshw.supermicro.sas.01.json": {
+        "system": {
+            "description": "Computer",
+            "hostname": "supermicro-sas01",
+            "product": "SYS-6029U-TR4T (To be filled by O.E.M.)",
+            "serial": "E263684X8302334",
+            "vendor": "Supermicro",
+            "version": "0123456789",
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "X11DPU",
+                "serial": "OM183S008126",
+                "vendor": "Supermicro",
+                "version": "1.10",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:00:11.5",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SSATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:17.0",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "Lewisburg SATA Controller [AHCI mode]",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:1a:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "Intel Corporation",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:86:00.0",
+                "driver": "mpt3sas",
+                "has_children": True,
+                "product": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+                "vendor": "LSI Logic / Symbios Logic",
+            },
+            {
+                "businfo": "pci@0000:af:00.0",
+                "driver": "mpt3sas",
+                "has_children": True,
+                "product": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+                "vendor": "LSI Logic / Symbios Logic",
+            },
+        ],
+        "disk_class_info": [
+            {
+                "businfo": "scsi@0:0.0.0",
+                "dev": "8:0",
+                "logicalname": "/dev/sda",
+                "physid": "0.0.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HX9AJD",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.1.0",
+                "dev": "8:16",
+                "logicalname": "/dev/sdb",
+                "physid": "0.1.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HXJ44F",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.2.0",
+                "dev": "8:32",
+                "logicalname": "/dev/sdc",
+                "physid": "0.2.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HWXPJD",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.3.0",
+                "dev": "8:48",
+                "logicalname": "/dev/sdd",
+                "physid": "0.3.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HXJ6YF",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.4.0",
+                "dev": "8:64",
+                "logicalname": "/dev/sde",
+                "physid": "0.4.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HWXPDD",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.5.0",
+                "dev": "8:80",
+                "logicalname": "/dev/sdf",
+                "physid": "0.5.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HXJLUF",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.6.0",
+                "dev": "8:96",
+                "logicalname": "/dev/sdg",
+                "physid": "0.6.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HWXPYD",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@0:0.7.0",
+                "dev": "8:112",
+                "logicalname": "/dev/sdh",
+                "physid": "0.7.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HWXP4D",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@1:0.2.0",
+                "dev": "8:160",
+                "logicalname": "/dev/sdk",
+                "physid": "0.2.0",
+                "product": "ST6000NM0095",
+                "serial": "ZAD4S0DW0000C843M2UC",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@1:0.0.0",
+                "dev": "8:128",
+                "logicalname": "/dev/sdi",
+                "physid": "0.0.0",
+                "product": "HUS726060AL5210",
+                "serial": "K1HWGU9D",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@1:0.1.0",
+                "dev": "8:144",
+                "logicalname": "/dev/sdj",
+                "physid": "0.1.0",
+                "product": "ST6000NM0095",
+                "serial": "ZAD4S0A50000C8432082",
+                "size": 6001175126016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+        ],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:18:00.0",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno1",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.1",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno2",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.2",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno3",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:18:00.3",
+                "driver": "i40e",
+                "driverversion": "2.1.14-k",
+                "firmware": "6.01 0x800036f0 1.1861.0",
+                "logicalname": "eno4",
+                "product": "Ethernet Controller X710/X557-AT 10GBASE-T",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:3b:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "12.17.2020 (SM_2001000001033)",
+                "logicalname": "enp59s0f0",
+                "product": "MT27700 Family [ConnectX-4]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:3b:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "12.17.2020 (SM_2001000001033)",
+                "logicalname": "enp59s0f1",
+                "product": "MT27700 Family [ConnectX-4]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.0",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f0",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+            {
+                "businfo": "pci@0000:d8:00.1",
+                "driver": "mlx5_core",
+                "driverversion": "5.0-0",
+                "firmware": "14.21.1000 (SM_2001000001034)",
+                "logicalname": "enp216s0f1",
+                "product": "MT27710 Family [ConnectX-4 Lx]",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Mellanox Technologies",
+            },
+        ],
+    },
+    "lshw.supermicro.sas.02.json": {
+        "system": {
+            "description": "Computer",
+            "hostname": "supermicro-sas02",
+            "product": "SYS-6028U-TR4+ (Default string)",
+            "serial": "S16512428221502",
+            "vendor": "Supermicro",
+            "version": "0123456789",
+        },
+        "motherboard": [
+            {
+                "description": "Motherboard",
+                "product": "X10DRU-i+",
+                "serial": "OM17CS000182",
+                "vendor": "Supermicro",
+                "version": "1.02B",
+            }
+        ],
+        "storage_class_info": [
+            {
+                "businfo": "pci@0000:03:00.0",
+                "driver": "mpt3sas",
+                "has_children": True,
+                "product": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+                "vendor": "LSI Logic / Symbios Logic",
+            },
+            {
+                "businfo": "pci@0000:00:11.4",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset sSATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:00:1f.2",
+                "driver": "ahci",
+                "has_children": False,
+                "product": "C610/X99 series chipset 6-Port SATA Controller [AHCI mode]",  # noqa E501
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:81:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "NVMe SSD Controller SM961/PM961",
+                "vendor": "Samsung Electronics Co Ltd",
+            },
+            {
+                "businfo": "pci@0000:82:00.0",
+                "driver": "nvme",
+                "has_children": False,
+                "product": "NVMe SSD Controller SM961/PM961",
+                "vendor": "Samsung Electronics Co Ltd",
+            },
+        ],
+        "disk_class_info": [
+            {
+                "businfo": "scsi@10:0.0.0",
+                "dev": None,
+                "logicalname": None,
+                "physid": "0.0.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10Z0XQ",
+                "size": None,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:1.0.0",
+                "dev": "8:0",
+                "logicalname": "/dev/sda",
+                "physid": "1.0.0",
+                "product": "Logical Volume",
+                "serial": "3589195262245447776",
+                "size": 3999999721472,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:0.1.0",
+                "dev": None,
+                "logicalname": None,
+                "physid": "0.1.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10Z0ZL",
+                "size": None,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:0.2.0",
+                "dev": "8:16",
+                "logicalname": "/dev/sdb",
+                "physid": "0.2.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10YVHJ",
+                "size": 4000787030016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:0.3.0",
+                "dev": "8:32",
+                "logicalname": "/dev/sdc",
+                "physid": "0.3.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10XX97",
+                "size": 4000787030016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:0.4.0",
+                "dev": "8:48",
+                "logicalname": "/dev/sdd",
+                "physid": "0.4.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10SFX1",
+                "size": 4000787030016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+            {
+                "businfo": "scsi@10:0.5.0",
+                "dev": "8:64",
+                "logicalname": "/dev/sde",
+                "physid": "0.5.0",
+                "product": "ST4000NM115-1YZ1",
+                "serial": "ZC10YVK1",
+                "size": 4000787030016,
+                "storage_parent": "SAS3008 PCI-Express Fusion-MPT SAS-3",
+            },
+        ],
+        "network_class_info": [
+            {
+                "businfo": "pci@0000:01:00.0",
+                "driver": "igb",
+                "driverversion": "5.3.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp1s0f0",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "1Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:01:00.1",
+                "driver": "igb",
+                "driverversion": "5.3.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp1s0f1",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:01:00.2",
+                "driver": "igb",
+                "driverversion": "5.3.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp1s0f2",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "1Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:01:00.3",
+                "driver": "igb",
+                "driverversion": "5.3.0-k",
+                "firmware": "1.63, 0x800009fa",
+                "logicalname": "enp1s0f3",
+                "product": "I350 Gigabit Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": None,
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:83:00.0",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800006da",
+                "logicalname": "enp131s0f0",
+                "product": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:83:00.1",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800006da",
+                "logicalname": "enp131s0f1",
+                "product": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:84:00.0",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800006da",
+                "logicalname": "ens4f0",
+                "product": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+            {
+                "businfo": "pci@0000:84:00.1",
+                "driver": "ixgbe",
+                "driverversion": "4.2.1-k",
+                "firmware": "0x800006da",
+                "logicalname": "ens4f1",
+                "product": "82599ES 10-Gigabit SFI/SFP+ Network Connection",
+                "serial": "de:ad:be:ef:00:ef",
+                "speed": "10Gbit/s",
+                "vendor": "Intel Corporation",
+            },
+        ],
+    },
+}
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index 193a938..88925a4 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -5,3 +5,4 @@ pytest
 pytest-asyncio
 requests
 charmhelpers
+charms.reactive
diff --git a/src/tests/functional/test_hwhealth.py b/src/tests/functional/test_hwhealth.py
index 51d407a..3e544ea 100644
--- a/src/tests/functional/test_hwhealth.py
+++ b/src/tests/functional/test_hwhealth.py
@@ -19,16 +19,18 @@ SERIES = [
 ]
 JUJU_REPOSITORY = os.getenv('JUJU_REPOSITORY', '.')
 NRPECFG_DIR = '/etc/nagios/nrpe.d'
+DEF_TIMEOUT = 600
+# These go along with the hpe repos for the hp* tools
 
 ################
 # Helper funcs #
 ################
 
 
-async def deploy_hwhealth_res(model, app_name, tool_name):
+async def deploy_hwhealth_res(model, app_name, res_filename):
     # Attaching resources is not implemented yet in libjuju
     # see https://github.com/juju/python-libjuju/issues/294
-    tools_res_path = os.path.join(JUJU_REPOSITORY, tool_name)
+    tools_res_path = os.path.join(JUJU_REPOSITORY, 'builds', res_filename)
     subprocess.check_call([
         'juju',
         'deploy',
@@ -41,8 +43,8 @@ async def deploy_hwhealth_res(model, app_name, tool_name):
     ])
 
 
-async def update_hwhealth_res(model, app_name, tool_name):
-    tools_res_path = os.path.join(JUJU_REPOSITORY, tool_name)
+async def update_hwhealth_res(model, app_name, res_filename):
+    tools_res_path = os.path.join(JUJU_REPOSITORY, 'builds', res_filename)
     subprocess.check_call([
         'juju',
         'attach-resource',
@@ -82,8 +84,12 @@ async def deploy_app(request, model):
             series=series,
             channel=channel,
         )
-    await model.deploy('ubuntu', application_name='ubuntu-checksum-{}'.format(release),
-                       series=release, channel=channel)
+    await model.deploy(
+        'ubuntu',
+        application_name='ubuntu-checksum-{}'.format(release),
+        series=release,
+        channel=channel
+    )
     nrpe_app = await model.deploy(
         'nrpe',
         application_name='nrpe-{}'.format(release),
@@ -104,33 +110,43 @@ async def deploy_app(request, model):
     # Attaching resources is not implemented yet in libjuju
     # see https://github.com/juju/python-libjuju/issues/294
     await deploy_hwhealth_res(model, hw_health_app_name, 'tools.zip')
-    await deploy_hwhealth_res(model, hw_health_checksum_app_name, 'tools-checksum.zip')
+    await deploy_hwhealth_res(model, hw_health_checksum_app_name,
+                              'tools-checksum.zip')
 
     # This is pretty horrible, but we can't deploy via libjuju
     while True:
         try:
             hw_health_app = model.applications[hw_health_app_name]
-            hw_health_checksum_app = model.applications[hw_health_checksum_app_name]
+            hw_health_checksum_app = \
+                model.applications[hw_health_checksum_app_name]
             break
         except KeyError:
             await asyncio.sleep(5)
 
-    await hw_health_app.add_relation('general-info',
-                                     'ubuntu-{}:juju-info'.format(release))
-    await hw_health_app.add_relation('nrpe-external-master',
-                                     '{}:nrpe-external-master'.format(nrpe_app.name))
+    await hw_health_app.add_relation(
+        'general-info',
+        'ubuntu-{}:juju-info'.format(release)
+    )
+    await hw_health_app.add_relation(
+        'nrpe-external-master',
+        '{}:nrpe-external-master'.format(nrpe_app.name)
+    )
 
-    await hw_health_checksum_app.add_relation('general-info',
-                                              'ubuntu-checksum-{}:juju-info'.format(release))
-    await hw_health_checksum_app.add_relation('nrpe-external-master',
-                                              '{}:nrpe-external-master'.format(nrpe_app.name))
+    await hw_health_checksum_app.add_relation(
+        'general-info',
+        'ubuntu-checksum-{}:juju-info'.format(release)
+    )
+    await hw_health_checksum_app.add_relation(
+        'nrpe-external-master',
+        '{}:nrpe-external-master'.format(nrpe_app.name)
+    )
 
     # The app will initially be in blocked state because it's running in a
     # container
     await model.block_until(
-        lambda: (hw_health_app.status == 'blocked' and
+        lambda: (hw_health_app.status == 'blocked' and  # noqa:W504
                  hw_health_checksum_app.status == 'blocked'),
-        timeout=600
+        timeout=DEF_TIMEOUT
     )
     yield hw_health_app
 
@@ -151,10 +167,10 @@ async def toolset(monkeypatch):
         m.setattr('charmhelpers.core.hookenv.charm_dir',
                   lambda: JUJU_REPOSITORY)
         m.setattr('charmhelpers.core.hookenv.config',
-                  lambda x=None: dict())
+                  lambda x=None: dict({'manufacturer': 'test'}))
         m.setattr('charmhelpers.contrib.charmsupport.nrpe.get_nagios_hostname',
                   lambda: 'pytest')
-        return hwdiscovery.get_tools('test')
+        return [tool() for tool in hwdiscovery.get_tools('test')]
 
 #########
 # Tests #
@@ -172,14 +188,17 @@ async def test_forced_deploy(deploy_app, model, run_command):
     for unit in model.units.values():
         if unit.entity_id.startswith('ubuntu-{}'.format(series)):
             ubuntu_unit = unit
-            await model.block_until(lambda: ubuntu_unit.workload_status == 'active', timeout=180)
+            await model.block_until(
+                lambda: ubuntu_unit.workload_status == 'active',
+                timeout=DEF_TIMEOUT
+            )
             await run_command(CREATE_FAKE_NVME, ubuntu_unit)
             break
 
     await deploy_app.set_config({'manufacturer': 'test'})
     await model.block_until(
         lambda: deploy_app.status == 'active',
-        timeout=600
+        timeout=DEF_TIMEOUT
     )
     assert deploy_app.status == 'active'
 
@@ -188,64 +207,84 @@ async def test_checksum_forced_deploy(deploy_app, model, run_command):
     # Create a fake NVMe device for the cronjob to be configured
     CREATE_FAKE_NVME = "/bin/bash -c 'touch /dev/nvme0'"
     series = deploy_app.name.split('-')[-1]
-    hw_health_checksum_app_name = 'hw-health-checksum-{}'.format(series)
-    hw_health_checksum_app = model.applications[hw_health_checksum_app_name]
+    checksum_app_name = 'hw-health-checksum-{}'.format(series)
+    checksum_app = model.applications[checksum_app_name]
     for unit in model.units.values():
         if unit.entity_id.startswith('ubuntu-checksum-{}'.format(series)):
             ubuntu_unit = unit
-            await model.block_until(lambda: ubuntu_unit.workload_status == 'active',
-                                    timeout=180)
+            await model.block_until(
+                lambda: ubuntu_unit.workload_status == 'active',
+                timeout=DEF_TIMEOUT
+            )
             await run_command(CREATE_FAKE_NVME, ubuntu_unit)
-        elif unit.entity_id.startswith(hw_health_checksum_app_name):
-            hw_health_checksum_unit = unit
-
-    await hw_health_checksum_app.set_config({'manufacturer': 'test'})
-    await model.block_until(
-        lambda: (hw_health_checksum_app.status == 'blocked' and
-                 hw_health_checksum_unit.workload_status_message == 'Tool megacli - checksum error'),
-        timeout=600)
+        elif unit.entity_id.startswith(checksum_app_name):
+            checksum_unit = unit
+
+    await checksum_app.set_config({'manufacturer': 'test'})
+    try:
+        await model.block_until(
+            lambda: (
+                checksum_app.status == 'blocked' and checksum_unit.workload_status_message == 'Tool megacli - checksum error'  # noqa E501
+            ),
+            timeout=DEF_TIMEOUT)
+    except asyncio.exceptions.TimeoutError:
+        print(
+            "failed to get expected state 'blocked:Tool megacli - checksum error', "
+            "witnessed '{}:{}'".format(checksum_app.status, checksum_unit.workload_status_message)
+        )
+        assert checksum_app.status == 'blocked'
+        assert checksum_unit.workload_status_message == 'Tool megacli - checksum error'
 
 
 async def test_checksum_updated_resource_missing(deploy_app, model):
     series = deploy_app.name.split('-')[-1]
-    hw_health_checksum_app_name = 'hw-health-checksum-{}'.format(series)
-    hw_health_checksum_app = model.applications[hw_health_checksum_app_name]
-    await update_hwhealth_res(model, hw_health_checksum_app_name, 'tools-missing.zip')
+    checksum_app_name = 'hw-health-checksum-{}'.format(series)
+    checksum_app = model.applications[checksum_app_name]
+    await update_hwhealth_res(model, checksum_app_name, 'tools-missing.zip')
     for unit in model.units.values():
-        if unit.entity_id.startswith(hw_health_checksum_app_name):
-            hw_health_checksum_unit = unit
+        if unit.entity_id.startswith(checksum_app_name):
+            checksum_unit = unit
             break
 
     await model.block_until(
-        lambda: (hw_health_checksum_app.status == 'blocked' and
-                 hw_health_checksum_unit.workload_status_message == 'Tool megacli not found'),
-        timeout=600
+        lambda: (
+            checksum_app.status == 'blocked' and checksum_unit.workload_status_message == 'Tool megacli not found'  # noqa E501
+        ),
+        timeout=DEF_TIMEOUT
     )
 
 
 async def test_checksum_updated_resource_ok(deploy_app, model):
     series = deploy_app.name.split('-')[-1]
-    hw_health_checksum_app_name = 'hw-health-checksum-{}'.format(series)
-    hw_health_checksum_app = model.applications[hw_health_checksum_app_name]
-    await update_hwhealth_res(model, hw_health_checksum_app_name, 'tools.zip')
+    checksum_app_name = 'hw-health-checksum-{}'.format(series)
+    checksum_app = model.applications[checksum_app_name]
+    await update_hwhealth_res(model, checksum_app_name, 'tools.zip')
     for unit in model.units.values():
-        if unit.entity_id.startswith(hw_health_checksum_app_name):
-            hw_health_checksum_unit = unit
+        if unit.entity_id.startswith(checksum_app_name):
+            checksum_unit = unit
             break
 
     await model.block_until(
-        lambda: (hw_health_checksum_app.status == 'active' and
-                 hw_health_checksum_unit.workload_status_message == 'ready'),
-        timeout=600
+        lambda: (checksum_app.status == 'active' and  # noqa:W504
+                 checksum_unit.workload_status_message == 'ready'),
+        timeout=DEF_TIMEOUT
     )
 
 
-async def test_stats(toolset, deployed_unit, file_stat):
+async def test_deployed_file_stats(monkeypatch, toolset, deploy_app, deployed_unit, file_stat):
     # This should really be a parametrized test, but fixtures cannot be used as
     # params value as if they were iterators
     # It should also check for other installed files and differentiate between
     # tool types (e.g. tools.Ipmi does not use a vendor binary)
+    series = deploy_app.name.split('-')[-1]
     for tool in toolset:
+        # Skip tools that are out of series for the currently deployed application
+        with monkeypatch.context() as m:
+            m.setattr('hwhealth.tools.lsb_release',
+                      lambda x=None: {'DISTRIB_CODENAME': series})
+            if not tool.is_series_supported():
+                print('Skipping tool {}.  Distribution {} not supported.'.format(tool, series))
+                continue
         # Have we rendered the nrpe check cfg?
         nrpecfg_path = os.path.join(NRPECFG_DIR,
                                     'check_{}.cfg'.format(tool._shortname))
@@ -255,7 +294,7 @@ async def test_stats(toolset, deployed_unit, file_stat):
 
         # Have we installed the nrpe check script?
         nrpescript_path = os.path.join(tool.NRPE_PLUGINS_DIR,
-                                       tool._nrpe_script)
+                                       os.path.basename(tool._nrpe_script))
         print('Checking {}'.format(nrpescript_path))
         test_stat = await file_stat(nrpescript_path, deployed_unit)
         assert test_stat['size'] > 0
@@ -263,6 +302,17 @@ async def test_stats(toolset, deployed_unit, file_stat):
         assert test_stat['uid'] == tool.NRPE_PLUGINS_UID
         assert test_stat['mode'] == oct(tool.NRPE_PLUGINS_MODE)
 
+        # Have we installed any common libs?
+        for lib in tool._common_libs:
+            lib_path = os.path.join(tool.NRPE_PLUGINS_DIR,
+                                    os.path.basename(lib))
+            print('Checking {}'.format(nrpescript_path))
+            test_stat = await file_stat(lib_path, deployed_unit)
+            assert test_stat['size'] > 0
+            assert test_stat['gid'] == tool.NRPE_PLUGINS_GID
+            assert test_stat['uid'] == tool.NRPE_PLUGINS_UID
+            assert test_stat['mode'] == oct(tool.NRPE_PLUGINS_MODE)
+
         if isinstance(tool, tools.Ipmi) or isinstance(tool, tools.Nvme):
             # Have we added sudo rights for running freeipmi commands?
             sudoer_path = os.path.join(tool.SUDOERS_DIR, tool._sudoer_file)
@@ -275,10 +325,10 @@ async def test_stats(toolset, deployed_unit, file_stat):
 
         if isinstance(tool, tools.Ipmi) or isinstance(tool, tools.VendorTool):
             # Have we installed the cronjob script helper?
-            cronjob_script_path = os.path.join(tool.NRPE_PLUGINS_DIR,
-                                               tool._cronjob_script)
-            print('Checking {}'.format(cronjob_script_path))
-            test_stat = await file_stat(cronjob_script_path, deployed_unit)
+            cron_script_path = os.path.join(tool.NRPE_PLUGINS_DIR,
+                                            tool._cron_script)
+            print('Checking {}'.format(cron_script_path))
+            test_stat = await file_stat(cron_script_path, deployed_unit)
             assert test_stat['size'] > 0
             assert test_stat['gid'] == tool.CRONJOB_SCRIPT_GID
             assert test_stat['uid'] == tool.CRONJOB_SCRIPT_UID
@@ -305,14 +355,42 @@ async def test_stats(toolset, deployed_unit, file_stat):
             assert test_stat['mode'] == oct(tool.TOOLS_MODE)
 
 
-async def test_removal(toolset, model, deploy_app, file_stat):
[e-mail]('script_type', ['_nrpe_script', '_cron_script'])
+async def test_imports(script_type, monkeypatch, toolset, deploy_app, deployed_unit, run_command):
+    '''Dry run all auxiliary files to ensure we have all needed dependecies'''
+    series = deploy_app.name.split('-')[-1]
+    for tool in toolset:
+        # Skip tools that are out of series for the currently deployed application
+        with monkeypatch.context() as m:
+            m.setattr('hwhealth.tools.lsb_release',
+                      lambda x=None: {'DISTRIB_CODENAME': series})
+            if not tool.is_series_supported():
+                print('Skipping tool {}.  Distribution {} not supported.'.format(tool, series))
+                continue
+        script_name = getattr(tool, script_type)
+        tool_name = tool.__class__.__name__
+        if not script_name:
+            # Cannot pytest.skip because it would break out of the loop
+            print('Skipping test as {} does not have a {}'
+                  ''.format(tool_name, script_type))
+        else:
+            print('Checking {}: {}'.format(tool_name, script_name))
+            path = os.path.join(tool.NRPE_PLUGINS_DIR, script_name)
+            cmd = path + " --help"
+            results = await run_command(cmd, deployed_unit)
+            rc = results['Code']
+            assert rc == '0', ('{}, {}. RC is non-zero. results={}'
+                               ''.format(tool_name, script_name, results))
+
+
+async def test_removal(monkeypatch, toolset, model, deploy_app, file_stat):
     '''Remove the unit, test that all files have been cleaned up'''
     hw_health_app_name = deploy_app.name
     series = deploy_app.name.split('-')[-1]
     await deploy_app.remove()
     await model.block_until(
         lambda: hw_health_app_name not in model.applications,
-        timeout=600
+        timeout=DEF_TIMEOUT
     )
     # Since we've removed the hw-health app, we can't target it anymore, we
     # need to find the principal unit
@@ -320,6 +398,13 @@ async def test_removal(toolset, model, deploy_app, file_stat):
         if unit.entity_id.startswith('ubuntu-{}'.format(series)):
             ubuntu_unit = unit
     for tool in toolset:
+        # Skip tools that are out of series for the currently deployed application
+        with monkeypatch.context() as m:
+            m.setattr('hwhealth.tools.lsb_release',
+                      lambda x=None: {'DISTRIB_CODENAME': series})
+            if not tool.is_series_supported():
+                print('Skipping tool {}.  Distribution {} not supported.'.format(tool, series))
+                continue
         # Have we removed the nrpe check cfg?
         nrpecfg_path = os.path.join(NRPECFG_DIR,
                                     'check_{}.cfg'.format(tool._shortname))
@@ -344,7 +429,7 @@ async def test_removal(toolset, model, deploy_app, file_stat):
         if isinstance(tool, tools.Ipmi) or isinstance(tool, tools.VendorTool):
             # Have we removed the cronjob script helper?
             cronjob_path = os.path.join(tool.NRPE_PLUGINS_DIR,
-                                        tool._cronjob_script)
+                                        tool._cron_script)
             print('Checking {}'.format(cronjob_path))
             with pytest.raises(RuntimeError):
                 await file_stat(cronjob_path, ubuntu_unit)
@@ -356,7 +441,7 @@ async def test_removal(toolset, model, deploy_app, file_stat):
             with pytest.raises(RuntimeError):
                 await file_stat(cronjob_path, ubuntu_unit)
 
-        if isinstance(tool, tools.VendorTool) and not isinstance(tool, tools.Mdadm):
+        if isinstance(tool, tools.VendorTool) and not isinstance(tool, tools.Mdadm):  # noqa E501
             # /sbin/mdadm will not be removed, but the vendor binaries
             # should have been
             bin_path = os.path.join(tool.TOOLS_DIR, tool._shortname)
diff --git a/src/tests/hw-health-samples/cron_outputs/hplog.out.ok b/src/tests/hw-health-samples/cron_outputs/hplog.out.ok
new file mode 100644
index 0000000..3ff5bcb
--- /dev/null
+++ b/src/tests/hw-health-samples/cron_outputs/hplog.out.ok
@@ -0,0 +1 @@
+OK No errors found
\ No newline at end of file
diff --git a/src/tests/hw-health-samples/cron_outputs/ipmi_sensors.out.critical b/src/tests/hw-health-samples/cron_outputs/ipmi_sensors.out.critical
new file mode 100644
index 0000000..4359fa2
--- /dev/null
+++ b/src/tests/hw-health-samples/cron_outputs/ipmi_sensors.out.critical
@@ -0,0 +1 @@
+IPMI Status: Critical [16 system event log (SEL) entries present] | 'Current Power'=116 'Temp 1'=28.00;;~:42.00 'Temp 2 (CPU 1)'=40.00;;~:81.00 'Temp 3 (CPU 2)'=40.00;;~:81.00 'Temp 4 (MemD1)'=44.00;;~:87.00 'Temp 5 (MemD2)'=37.00;;~:87.00 'Temp 7 (IIOH)'=60.00;;~:105.00 'Temp 8 (PCIR)'=37.00;;~:85.00 'Temp 9 (PCIR)'=43.00;;~:85.00 'Temp 10 (PCIR)'=32.00;;~:70.00 'Temp 11 (PCIR)'=31.00;;~:65.00 'Temp 12 (PCIR)'=40.00;;~:75.00 'Temp 13 (PCIR)'=38.00;;~:87.00 'Temp 14 (PCIR)'=32.00;;~:65.00 'Temp 15 (IOH2)'=0.00;;~:105.00
diff --git a/src/tests/hw-health-samples/cron_outputs/ssacli.out.ok b/src/tests/hw-health-samples/cron_outputs/ssacli.out.ok
new file mode 100644
index 0000000..3ff5bcb
--- /dev/null
+++ b/src/tests/hw-health-samples/cron_outputs/ssacli.out.ok
@@ -0,0 +1 @@
+OK No errors found
\ No newline at end of file