Merge lp:~lmic/maas/maas19+fix-power-query-sm15k into lp:maas/1.9

Proposed by Larry Michel
Status: Merged
Approved by: Blake Rouse
Approved revision: 4536
Merged at revision: 4537
Proposed branch: lp:~lmic/maas/maas19+fix-power-query-sm15k
Merge into: lp:maas/1.9
Diff against target: 16 lines (+2/-2)
1 file modified
src/provisioningserver/drivers/power/seamicro.py (+2/-2)
To merge this branch: bzr merge lp:~lmic/maas/maas19+fix-power-query-sm15k
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Newell Jensen (community) Approve
Review via email: mp+282111@code.launchpad.net

This proposal supersedes a proposal from 2016-01-10.

Commit message

Pass id from context (which is system id from power parameters) into seamicroclient call when querying power.

Description of the change

Pass id from context (which is system id from power parameters) into seamicroclient call when querying power.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Looks good. I had originally coded it incorrectly as sm15k has a power parameter named system_id as well. Reason my unit tests didn't catch this was because when creating the context I also used 'system_id'. I have checked that this code change works with unit tests. Thanks Michael!

review: Approve
Revision history for this message
Larry Michel (lmic) wrote :

Thanks for reviewing Newell. Please merge the branch as I don't have the right permissions.

Revision history for this message
Newell Jensen (newell-jensen) wrote :

Larry,

You will need to get someone on the MAAS team to do that for you as I do not have the rights either.

Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good, but policy dictates that we land it on trunk (MAAS 2.0) first.

Are you able to test the SeaMicro chassis on Xenial/trunk as well?

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

Also need 1.10 back port!

On Monday, January 11, 2016, Mike Pontillo <email address hidden>
wrote:

> Looks good, but policy dictates that we land it on trunk (MAAS 2.0) first.
>
> Are you able to test the SeaMicro chassis on Xenial/trunk as well?
> --
>
> https://code.launchpad.net/~lmic/maas/maas19+fix-power-query-sm15k/+merge/282111
> Your team MAAS Committers is subscribed to branch lp:maas/1.9.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

Revision history for this message
Larry Michel (lmic) wrote :

Mike,
Do you mean testing it with maas server running on Zenial?

Revision history for this message
Larry Michel (lmic) wrote :

Correction in previous comment: s/Zenial/Xenial

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

Looks good to me. I have a question inline for Newell though.

For you Larry, have you run make lint and make test to ensure no tests are broken?

review: Approve
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Andres,

Replied to your inline question.

Revision history for this message
Larry Michel (lmic) wrote :

Andres, to answer your question, Newell had executed the unit tests during his review and communicated the results. I've made note to run it before submitting the MP next time.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/drivers/power/seamicro.py'
2--- src/provisioningserver/drivers/power/seamicro.py 2015-11-17 19:49:40 +0000
3+++ src/provisioningserver/drivers/power/seamicro.py 2016-01-10 08:31:42 +0000
4@@ -91,10 +91,10 @@
5 """Power query SeaMicro node."""
6 # Query the state.
7 # Only supported by REST v2.
8- ip, username, password, _, power_control = (
9+ ip, username, password, server_id, power_control = (
10 extract_seamicro_parameters(context))
11 if power_control == 'restapi2':
12 return power_query_seamicro15k_v2(
13- ip, username, password, system_id)
14+ ip, username, password, server_id)
15 else:
16 return 'unknown'

Subscribers

People subscribed via source and target branches