hw-health-charm

~xavpaice/charm-hw-health:ilorest-correction

  1. Git
  2. lp:~xavpaice/charm-hw-health
  3. ilorest-correction
Last commit made on 2020-08-12
Get this branch:
git clone -b ilorest-correction https://git.launchpad.net/~xavpaice/charm-hw-health
Only Xav Paice can upload to this branch. If you are Xav Paice please log in for upload directions.

Branch merges

Branch information

Name:
ilorest-correction
Repository:
lp:~xavpaice/charm-hw-health

Recent commits

bd8b1c2... by Xav Paice

Change the ilorest output file name

To make the output of cron_ilorest.py consistent with other scripts, and
compatible with the nrpe check which templates the filename as
toolname.out, this changes the ilorest output name from ilorest.nagios
to ilorest.out.

2602e4f... by Paul Goins

Merge branch 'wait-for-vendor-apt-fix' into merge-test

f948c8a... by Paul Goins

Fixed a bug in wait_for_vendor_apt().

There's a clause which tries to do an isinstance check, but does not
instantiate an object from its original class.

This triggered on tools.ILOrest because, while it is a subclass of
tools.AptVendorTool, it is not an instance of it.

>>> isinstance(tools.ILOrest, tools.AptVendorTool)
False

This is fixed by instantiating an ILOrest object and using that instead.

51b8e93... by Paul Goins

Merge branch 'cron-ilorest-cron-fix' into merge-test

6440d8e... by Paul Goins

Merge branch 'apt-vendor-tool-fix' into merge-test

7c50744... by Paul Goins

Merge branch 'functest-fix' into merge-test

a43c4ac... by Paul Goins

Fix for cron_ilorest.py

47020b6... by Paul Goins

Fixed AptVendorTool --filename argument

1fbfd15... by Paul Goins

Fixed error class reference

5222f82... by Paul Goins

Fixed inconsistency between get_tools() targets.

get_tools("test") returns a set of classes, while get_tools("auto")
returns a set of instantiated objects.

The charm code expects the classes and instantiates itself, which
results in breakage in the get_tools("auto") case since objects are
returned instead of classes.

This patch simply makes get_tools("auto") also return classes and rely
on the caller doing any needed instantiation.