Merge lp://qastaging/~newell-jensen/maas/mscm-merge-power-and-hardware-drivers into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Newell Jensen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Newell Jensen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4677 | ||||
Proposed branch: | lp://qastaging/~newell-jensen/maas/mscm-merge-power-and-hardware-drivers | ||||
Merge into: | lp://qastaging/~maas-committers/maas/trunk | ||||
Diff against target: |
1201 lines (+453/-670) 5 files modified
src/provisioningserver/drivers/hardware/mscm.py (+0/-217) src/provisioningserver/drivers/hardware/tests/test_mscm.py (+0/-366) src/provisioningserver/drivers/power/mscm.py (+185/-26) src/provisioningserver/drivers/power/tests/test_mscm.py (+267/-60) src/provisioningserver/rpc/clusterservice.py (+1/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~newell-jensen/maas/mscm-merge-power-and-hardware-drivers | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email:
|
Commit message
This branch fixes the linked bug and also migrates the MSCM power and hardware drivers into one.
Description of the change
This branch was tested on the MSCM Chassis in 1ss by adding the Chassis (probe_
To post a comment you must log in.
Looks good. You could have made this branch smaller and less of a diff doing something like this.
bzr mv src/provisionin gserver/ drivers/ power/mscm. py src/provisionin gserver/ drivers/ power/mscm_ old.py gserver/ drivers/ hardware/ mscm.py src/provisionin gserver/ drivers/ power/mscm. py
bzr mv src/provisionin
Move the code from src/provisionin gserver/ drivers/ power/mscm_ old.py into src/provisionin gserver/ drivers/ power/mscm. py
bzr rm src/provisionin gserver/ drivers/ power/mscm_ old.py
Could have done the same for the test files. The way you have it now makes it look like all new code which is not the case.