Merge ~dashmage/charm-hw-health:add-focal-support into charm-hw-health:master

[Ashley James]

Add focal support for ILOrest package

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:29576ef60e361d991c1161c401eee30a8d579c5f
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/2/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/63/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/1//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:7ae47572fabf1815f84d93d35128b801320e2032
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/3/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/64/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-hw-health-ci/2//rebuild

review: Approve (continuous-integration)

[Ramesh Sattaru (rameshcan)]

LGTM

review: Approve

[Erhan Sunar (esunar)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 9a36d133af57b219c36ecb2330c7879890985b37

diff --git a/src/files/sas3ircu/check_sas3ircu.py b/src/files/sas3ircu/check_sas3ircu.py
index cf5d0c4..797e5ba 100755
--- a/src/files/sas3ircu/check_sas3ircu.py
+++ b/src/files/sas3ircu/check_sas3ircu.py
@@ -86,9 +86,9 @@ def _vols_parse(text):
         r"\s+PHY\[(?P<n>\d+)\]\s+Enclosure#\/Slot#\s+" r":\s+(?P<enc>\d+):(?P<slot>\d+)"
     )
     volumes = {}
-    for (vol_n, kv_data, vol_topology) in vols_re.findall(text):
+    for vol_n, kv_data, vol_topology in vols_re.findall(text):
         topology = {}
-        for (member_n, enc, slot) in vol_topology_re.findall(vol_topology):
+        for member_n, enc, slot in vol_topology_re.findall(vol_topology):
             topology[member_n] = {"enc": enc, "slot": slot}
         volumes[vol_n] = {**_kv_parse(kv_data), "topology": topology}
 
diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
index 3a3e8b4..6c9649c 100644
--- a/src/lib/hwhealth/tools.py
+++ b/src/lib/hwhealth/tools.py
@@ -430,6 +430,7 @@ class AptVendorTool(Tool):
         "ilorest": {
             "xenial": HPE_ILOREST_REPO_TMPL.format(series="xenial"),
             "bionic": HPE_ILOREST_REPO_TMPL.format(series="bionic"),
+            "focal": HPE_ILOREST_REPO_TMPL.format(series="focal"),
         },
         "hplog": {
             "xenial": HPE_MCP_REPO_TMPL.format(series="xenial"),
@@ -438,7 +439,11 @@ class AptVendorTool(Tool):
     }
     APT_KEYS = {
         "ssacli": {"xenial": HPE_MCP_KEY, "bionic": HPE_MCP_KEY},
-        "ilorest": {"xenial": HPE_ILOREST_KEY, "bionic": HPE_ILOREST_KEY},
+        "ilorest": {
+            "xenial": HPE_ILOREST_KEY,
+            "bionic": HPE_ILOREST_KEY,
+            "focal": HPE_ILOREST_KEY,
+        },
         "hplog": {"xenial": HPE_MCP_KEY, "bionic": HPE_MCP_KEY},
     }
 
@@ -643,8 +648,6 @@ class SsaCli(AptVendorTool):
 class ILOrest(AptVendorTool):
     """A class representing the ILOrest vendor tool (HPE hardware (Gen 10+)."""
 
-    SUPPORTED_SERIES = ["xenial", "bionic"]
-
     def __init__(self):
         super().__init__()
 
diff --git a/src/tox.ini b/src/tox.ini
index 566c5dd..ef7b675 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -37,13 +37,20 @@ deps =
 
 [flake8]
 ignore =
-    D100 #TODO Missing docstring in public module
-    D101 #TODO Missing docstring in public class
-    D102 #TODO Missing docstring in public method
-    D103 #TODO Missing docstring in public function
-    D104 #TODO Missing docstring in public package
-    D107 #TODO Missing docstring in __init__
-    D202 #No blank lines allowed after function docstring (conftest.py)
+    #TODO Missing docstring in public module
+    D100
+    #TODO Missing docstring in public class
+    D101
+    #TODO Missing docstring in public method
+    D102
+    #TODO Missing docstring in public function
+    D103
+    #TODO Missing docstring in public package
+    D104
+    #TODO Missing docstring in __init__
+    D107
+    #No blank lines allowed after function docstring (conftest.py)
+    D202
 exclude =
     .git,
     __pycache__,