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

Proposed by Ashley James
Status: Merged
Approved by: Erhan Sunar
Approved revision: 7ae47572fabf1815f84d93d35128b801320e2032
Merged at revision: 9a36d133af57b219c36ecb2330c7879890985b37
Proposed branch: ~dashmage/charm-hw-health:add-focal-support
Merge into: charm-hw-health:master
Diff against target: 82 lines (+22/-12)
3 files modified
src/files/sas3ircu/check_sas3ircu.py (+2/-2)
src/lib/hwhealth/tools.py (+6/-3)
src/tox.ini (+14/-7)
Reviewer Review Type Date Requested Status
Erhan Sunar (community) Approve
Ramesh Sattaru (community) Approve
prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+437880@code.launchpad.net

Commit message

Add focal support for ILOrest package

To post a comment you must log in.
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ramesh Sattaru (rameshcan) wrote :

LGTM

review: Approve
Revision history for this message
Erhan Sunar (esunar) :
review: Approve
Revision history for this message
Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9a36d133af57b219c36ecb2330c7879890985b37

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/files/sas3ircu/check_sas3ircu.py b/src/files/sas3ircu/check_sas3ircu.py
2index cf5d0c4..797e5ba 100755
3--- a/src/files/sas3ircu/check_sas3ircu.py
4+++ b/src/files/sas3ircu/check_sas3ircu.py
5@@ -86,9 +86,9 @@ def _vols_parse(text):
6 r"\s+PHY\[(?P<n>\d+)\]\s+Enclosure#\/Slot#\s+" r":\s+(?P<enc>\d+):(?P<slot>\d+)"
7 )
8 volumes = {}
9- for (vol_n, kv_data, vol_topology) in vols_re.findall(text):
10+ for vol_n, kv_data, vol_topology in vols_re.findall(text):
11 topology = {}
12- for (member_n, enc, slot) in vol_topology_re.findall(vol_topology):
13+ for member_n, enc, slot in vol_topology_re.findall(vol_topology):
14 topology[member_n] = {"enc": enc, "slot": slot}
15 volumes[vol_n] = {**_kv_parse(kv_data), "topology": topology}
16
17diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
18index 3a3e8b4..6c9649c 100644
19--- a/src/lib/hwhealth/tools.py
20+++ b/src/lib/hwhealth/tools.py
21@@ -430,6 +430,7 @@ class AptVendorTool(Tool):
22 "ilorest": {
23 "xenial": HPE_ILOREST_REPO_TMPL.format(series="xenial"),
24 "bionic": HPE_ILOREST_REPO_TMPL.format(series="bionic"),
25+ "focal": HPE_ILOREST_REPO_TMPL.format(series="focal"),
26 },
27 "hplog": {
28 "xenial": HPE_MCP_REPO_TMPL.format(series="xenial"),
29@@ -438,7 +439,11 @@ class AptVendorTool(Tool):
30 }
31 APT_KEYS = {
32 "ssacli": {"xenial": HPE_MCP_KEY, "bionic": HPE_MCP_KEY},
33- "ilorest": {"xenial": HPE_ILOREST_KEY, "bionic": HPE_ILOREST_KEY},
34+ "ilorest": {
35+ "xenial": HPE_ILOREST_KEY,
36+ "bionic": HPE_ILOREST_KEY,
37+ "focal": HPE_ILOREST_KEY,
38+ },
39 "hplog": {"xenial": HPE_MCP_KEY, "bionic": HPE_MCP_KEY},
40 }
41
42@@ -643,8 +648,6 @@ class SsaCli(AptVendorTool):
43 class ILOrest(AptVendorTool):
44 """A class representing the ILOrest vendor tool (HPE hardware (Gen 10+)."""
45
46- SUPPORTED_SERIES = ["xenial", "bionic"]
47-
48 def __init__(self):
49 super().__init__()
50
51diff --git a/src/tox.ini b/src/tox.ini
52index 566c5dd..ef7b675 100644
53--- a/src/tox.ini
54+++ b/src/tox.ini
55@@ -37,13 +37,20 @@ deps =
56
57 [flake8]
58 ignore =
59- D100 #TODO Missing docstring in public module
60- D101 #TODO Missing docstring in public class
61- D102 #TODO Missing docstring in public method
62- D103 #TODO Missing docstring in public function
63- D104 #TODO Missing docstring in public package
64- D107 #TODO Missing docstring in __init__
65- D202 #No blank lines allowed after function docstring (conftest.py)
66+ #TODO Missing docstring in public module
67+ D100
68+ #TODO Missing docstring in public class
69+ D101
70+ #TODO Missing docstring in public method
71+ D102
72+ #TODO Missing docstring in public function
73+ D103
74+ #TODO Missing docstring in public package
75+ D104
76+ #TODO Missing docstring in __init__
77+ D107
78+ #No blank lines allowed after function docstring (conftest.py)
79+ D202
80 exclude =
81 .git,
82 __pycache__,

Subscribers

People subscribed via source and target branches

to all changes: