Merge ~ltrager/maas:lp1730976 into maas:master

Proposed by Lee Trager
Status: Merged
Approved by: Andres Rodriguez
Approved revision: e063bf53b0a095fcdd7b53a68f4f2c190fb9e880
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1730976
Merge into: maas:master
Diff against target: 23 lines (+7/-5)
1 file modified
src/maasserver/static/partials/node-details.html (+7/-5)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Björn Tillenius Needs Information
MAAS Lander Approve
Review via email: mp+333721@code.launchpad.net

Commit message

LP: #1730976 - Only show storage device health status for physical storage devices

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1730976 lp:~ltrager/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e063bf53b0a095fcdd7b53a68f4f2c190fb9e880

review: Approve
Revision history for this message
Björn Tillenius (bjornt) wrote :

The change itself is probably good for now, but I don't think it makes sense to link bug #1730976 to this branch. That bug talks about displaying the health of the underlying physical device.

Or am I missing something?

review: Needs Information
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Had a chat with Maria and this is what she said:
https://bugs.launchpad.net/maas/+bug/1730976/comments/4

So in other words, only physical devices should have hardware testing info.

Revision history for this message
Björn Tillenius (bjornt) wrote :

Ok. Could you please update the bug title and description then, so that it's clear?

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
2index 5d9493b..bafe89a 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -2322,11 +2322,13 @@
6 <div class="table__data table-col--15" aria-label="Device type">{$ getDeviceType(item) $}</div>
7 <div class="table__data table-col--35" aria-label="Used for">{$ item.used_for $}</div>
8 <div class="table__data table-col--26" aria-label="Health">
9- <span data-maas-script-status="script-status" data-script-status="item.test_status" data-ng-if="item.type === 'physical'"></span>
10- <span data-ng-if="item.test_status === 0 || item.test_status === 1 || item.test_status === 2 || item.test_status === 5 || item.test_status === 7">Ok</span>
11- <span data-ng-if="item.test_status === 3 || item.test_status === 4 || item.test_status === 8">Error</span>
12- <span data-ng-if="item.test_status === 6">Degraded</span>
13- <span data-ng-if="item.test_status === -1">Unknown</span>
14+ <span data-ng-if="item.type === 'physical'">
15+ <span data-maas-script-status="script-status" data-script-status="item.test_status"></span>
16+ <span data-ng-if="item.test_status === 0 || item.test_status === 1 || item.test_status === 2 || item.test_status === 5 || item.test_status === 7">Ok</span>
17+ <span data-ng-if="item.test_status === 3 || item.test_status === 4 || item.test_status === 8">Error</span>
18+ <span data-ng-if="item.test_status === 6">Degraded</span>
19+ <span data-ng-if="item.test_status === -1">Unknown</span>
20+ </span>
21 </div>
22 </div>
23 </div>

Subscribers

People subscribed via source and target branches