Merge lp:~newell-jensen/maas/2.1-fix-ipmi-chassis-config-timeout into lp:maas/2.1

[Newell Jensen]

Backport trunk r5565: Fix IPMI chassis config session timeout issue when configuring the boot device that is a cause some errors in older HP Proliant BMCs. Only error on PowerAuthErrors when configuring the IPMI chassis boot order.

[Newell Jensen (newell-jensen)]

Self approved backport.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~newell-jensen/maas/2.1-fix-ipmi-chassis-config-timeout into lp:maas/2.1 failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Get:3 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [92.2 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Sources [206 kB]
Get:6 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Sources [109 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [426 kB]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [365 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Translation-en [132 kB]
Fetched 1,520 kB in 0s (2,212 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr 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 isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools 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-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1u...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-11-22 14:48:23 +0000
+++ docs/changelog.rst	2016-11-22 23:18:12 +0000
@@ -8,6 +8,8 @@
 Bugs fixed in this release
 --------------------------
 
+LP: #1516065    Fix IPMI chassis config session timeout issue when configuring the boot device.  Only error on PowerAuthErrors when configuring the IPMI chassis boot order.
+
 LP: #1642996    2.x preseeds with {{escape.shell}} fail if not upgraded at 2.1.1
 
 LP: #1643057    juju2 with maas 2.1.1 LXD containers get wrong ip addresses

=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py	2016-05-20 12:40:13 +0000
+++ src/provisioningserver/drivers/power/ipmi.py	2016-11-22 23:18:12 +0000
@@ -176,7 +176,14 @@
             process = Popen(command, stdout=PIPE, stderr=PIPE, env=env)
             _, stderr = process.communicate()
         stderr = stderr.decode("utf-8").strip()
-        for error, error_info in IPMI_ERRORS.items():
+        # XXX newell 2016-11-21 bug=1516065: Some IPMI hardware have timeout
+        # issues when trying to set the boot order to PXE.  We want to
+        # continue and not raise an error here.
+        ipmi_errors = {
+            key: IPMI_ERRORS[key] for key in IPMI_ERRORS
+            if IPMI_ERRORS[key]['exception'] == PowerAuthError
+        }
+        for error, error_info in ipmi_errors.items():
             if error in stderr:
                 raise error_info.get('exception')(error_info.get('message'))
         if process.returncode != 0:

=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py	2016-05-18 08:37:24 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py	2016-11-22 23:18:12 +0000
@@ -21,6 +21,7 @@
 from maastesting.testcase import MAASTestCase
 from provisioningserver.drivers.power import (
     ipmi as ipmi_module,
+    PowerAuthError,
     PowerError,
 )
 from provisioningserver.drivers.power.ipmi import (
@@ -138,8 +139,12 @@
         self.assertThat(tmpfile.flush, MockCalledOnceWith())
         self.assertThat(tmpfile.__exit__, MockCalledOnceWith(None, None, None))
 
-    def test__issue_ipmi_chassis_config_command_raises_power_error(self):
-        for error, error_info in IPMI_ERRORS.items():
+    def test__issue_ipmi_chassis_config_command_raises_power_auth_error(self):
+        ipmi_errors = {
+            key: IPMI_ERRORS[key] for key in IPMI_ERRORS
+            if IPMI_ERRORS[key]['exception'] == PowerAuthError
+        }
+        for error, error_info in ipmi_errors.items():
             popen_mock = self.patch(ipmi_module, 'Popen')
             process = popen_mock.return_value
             process.communicate.return_value = (b'', error.encode('utf-8'))