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

[Larry Michel]

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

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

[Newell Jensen (newell-jensen)]

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

[Larry Michel (lmic)]

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

[Newell Jensen (newell-jensen)]

Larry,

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

[Mike Pontillo (mpontillo)]

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?

[Andres Rodriguez (andreserl)]

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

[Larry Michel (lmic)]

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

[Larry Michel (lmic)]

Correction in previous comment: s/Zenial/Xenial

[Andres Rodriguez (andreserl)]

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

[Newell Jensen (newell-jensen)]

Andres,

Replied to your inline question.

[Larry Michel (lmic)]

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.

=== modified file 'src/provisioningserver/drivers/power/seamicro.py'
--- src/provisioningserver/drivers/power/seamicro.py	2015-11-17 19:49:40 +0000
+++ src/provisioningserver/drivers/power/seamicro.py	2016-01-10 08:31:42 +0000
@@ -91,10 +91,10 @@
         """Power query SeaMicro node."""
         # Query the state.
         # Only supported by REST v2.
-        ip, username, password, _, power_control = (
+        ip, username, password, server_id, power_control = (
             extract_seamicro_parameters(context))
         if power_control == 'restapi2':
             return power_query_seamicro15k_v2(
-                ip, username, password, system_id)
+                ip, username, password, server_id)
         else:
             return 'unknown'