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
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+286746@code.qastaging.launchpad.net

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_and_enlist_mscm).

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good. You could have made this branch smaller and less of a diff doing something like this.

bzr mv src/provisioningserver/drivers/power/mscm.py src/provisioningserver/drivers/power/mscm_old.py
bzr mv src/provisioningserver/drivers/hardware/mscm.py src/provisioningserver/drivers/power/mscm.py

Move the code from src/provisioningserver/drivers/power/mscm_old.py into src/provisioningserver/drivers/power/mscm.py

bzr rm src/provisioningserver/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.

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

Ah, didn't know that would make the diff look smaller. That would also
make the review better. Thanks for the heads up.

On Tue, Feb 23, 2016 at 9:15 AM, Blake Rouse <email address hidden>
wrote:

> Review: Approve
>
> Looks good. You could have made this branch smaller and less of a diff
> doing something like this.
>
> bzr mv src/provisioningserver/drivers/power/mscm.py
> src/provisioningserver/drivers/power/mscm_old.py
> bzr mv src/provisioningserver/drivers/hardware/mscm.py
> src/provisioningserver/drivers/power/mscm.py
>
> Move the code from src/provisioningserver/drivers/power/mscm_old.py into
> src/provisioningserver/drivers/power/mscm.py
>
> bzr rm src/provisioningserver/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.
> --
>
> https://code.launchpad.net/~newell-jensen/maas/mscm-merge-power-and-hardware-drivers/+merge/286746
> You are the owner of
> lp:~newell-jensen/maas/mscm-merge-power-and-hardware-drivers.
>

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1022.1 KiB)

The attempt to merge lp:~newell-jensen/maas/mscm-merge-power-and-hardware-drivers into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [95.8 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main Sources [1,107 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,720 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,440 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,350 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,893 kB]
Fetched 22.6 MB in 5s (4,297 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-seamicroclient python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
archdetect-deb is already the newest version (1.114ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
bind9utils is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.20-0ubuntu3).
dh-systemd is already the newest version (1.28ubuntu2).
distro-info is already the newest version (0.14build1).
dnsutils is alread...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.