Merge lp:~andreserl/maas/lp1485677 into lp:~maas-committers/maas/trunk

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4212
Proposed branch: lp:~andreserl/maas/lp1485677
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 15 lines (+0/-5)
1 file modified
src/provisioningserver/rpc/power.py (+0/-5)
To merge this branch: bzr merge lp:~andreserl/maas/lp1485677
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+268726@code.launchpad.net

Commit message

LP: #1485677: Fix checking of the power state after a power action (on, off) has been performed

Description of the change

After a power action has been performed, a power state query is performed in order to verify whether the power state of the actual machine changed. This fix, removes a validation that was preventing this check from being performed when using the Python Power Drivers

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

If this works, cool. It's a pragmatic fix, not where we want to get to ultimately.

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

The attempt to merge lp:~andreserl/maas/lp1485677 into lp:maas failed. Below is the output from the failed tests.

Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Get:3 http://security.ubuntu.com trusty-security Release [63.5 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [63.5 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:5 http://security.ubuntu.com trusty-security/main Sources [92.2 kB]
Get:6 http://security.ubuntu.com trusty-security/universe Sources [29.8 kB]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [333 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [230 kB]
Get:9 http://security.ubuntu.com trusty-security/universe amd64 Packages [114 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [134 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [606 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [309 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,976 kB in 3s (614 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 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 pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl p...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/rpc/power.py'
2--- src/provisioningserver/rpc/power.py 2015-07-20 17:47:50 +0000
3+++ src/provisioningserver/rpc/power.py 2015-08-21 10:39:13 +0000
4@@ -314,11 +314,6 @@
5 if new_power_state == "unknown" or new_power_state == power_change:
6 yield power_change_success(system_id, hostname, power_change)
7 return
8- # Retry logic is handled by power driver
9- # Once all power types have had templates converted to power drivers
10- # this method will need to be re-factored.
11- if is_power_driver_available(power_type):
12- return
13
14 # Failure: the power state of the node hasn't changed: mark it as
15 # broken.