Merge ~xavpaice/charm-hw-health:lp1855095 into ~nagios-charmers/charm-hw-health:master

Proposed by Xav Paice
Status: Merged
Approved by: Xav Paice
Approved revision: a2c1c0c4c7c13039ce0778f567c353c04c53b1cb
Merged at revision: 9344567906e67f6cc1e54dbc7a0d0cfbd067ce4e
Proposed branch: ~xavpaice/charm-hw-health:lp1855095
Merge into: ~nagios-charmers/charm-hw-health:master
Diff against target: 17 lines (+3/-3)
1 file modified
src/lib/hwhealth/discovery/supported_vendors.py (+3/-3)
Reviewer Review Type Date Requested Status
Paul Goins Approve
Canonical IS Reviewers Pending
Review via email: mp+379431@code.launchpad.net

Commit message

remove HP from supported vendors as it's not actually supported yet

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
Paul Goins (vultaire) wrote :

I think this basically works.

Arguably I'd suggest simply removing the lines and adding them back in in the future if support is ever properly added, so as to remove cruft. It depends on how likely we think that support will be added in the future.

It might be worth adding a comment to the code with an explanation, but at the same time, "git blame" can be used to find the commit that these were commented in, and the commit message can provide this explanation.

However, I would strongly suggest that we mention lp#1855095 either in the commit message or in a comment, as that won't be readily viewable via git after this gets merged.

review: Needs Fixing
Revision history for this message
Xav Paice (xavpaice) wrote :

commit message updated - I've left the code there since the addition is on the roadmap and it'll save some time looking up vendor strings in the future.

Revision history for this message
Paul Goins (vultaire) wrote :

Thanks; approved.

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

Change successfully merged at revision 9344567906e67f6cc1e54dbc7a0d0cfbd067ce4e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/lib/hwhealth/discovery/supported_vendors.py b/src/lib/hwhealth/discovery/supported_vendors.py
2index 3dc9694..8dc588e 100644
3--- a/src/lib/hwhealth/discovery/supported_vendors.py
4+++ b/src/lib/hwhealth/discovery/supported_vendors.py
5@@ -18,9 +18,9 @@ SUPPORTED_VENDORS = {
6 'NVMe SSD Controller SM961/PM961': tools.Nvme,
7 'NVMe SSD Controller 172Xa/172Xb': tools.Nvme,
8 },
9- 'Hewlett-Packard Company': {
10- 'Smart Array Gen9 Controllers': tools.HP,
11- }
12+ # 'Hewlett-Packard Company': {
13+ # 'Smart Array Gen9 Controllers': tools.HP,
14+ # }
15 }
16
17 SUPPORTED_DRIVERS = {

Subscribers

People subscribed via source and target branches