Merge lp:~allenap/maas/revert-ipmi-power-driver into lp:~maas-committers/maas/trunk

[Gavin Panella]

Revert to the template-based IPMI power driver.

The new driver is not reliable yet. Once the cause is fixed this will be landed again.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~allenap/maas/revert-ipmi-power-driver into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [63.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [63.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [92.0 kB]
Get:6 http://security.ubuntu.com trusty-security/universe Sources [29.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [328 kB]
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
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [114 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [229 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 [133 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [599 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [308 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,961 kB in 3s (568 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 pyt...

=== added file 'etc/maas/templates/power/ipmi.conf'
--- etc/maas/templates/power/ipmi.conf	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/power/ipmi.conf	2015-08-17 16:53:58 +0000
@@ -0,0 +1,4 @@
+Section Chassis_Boot_Flags
+        Boot_Flags_Persistent                         No
+        Boot_Device                                   PXE
+EndSection

=== added file 'etc/maas/templates/power/ipmi.template'
--- etc/maas/templates/power/ipmi.template	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/power/ipmi.template	2015-08-17 16:53:58 +0000
@@ -0,0 +1,110 @@
+# -*- mode: shell-script -*-
+#
+# Control a system via ipmipower
+#
+
+# Parameters.
+# If power_change is 'query', echo the current state of the
+# machine: 'on' or 'off'.
+power_change={{power_change}}
+power_address={{power_address}}
+power_user={{power_user}}
+power_pass={{power_pass}}
+power_driver={{power_driver}}
+power_off_mode={{power_off_mode}}
+ipmipower={{ipmipower}}
+ipmi_chassis_config={{ipmi_chassis_config}}
+config={{config_dir}}/{{ipmi_config}}
+
+# If ip_address was supplied and power_address is not explicitly set then
+# use ip_address because it gets discovered on-the-fly based on mac_address.
+# We don't want to use it unilaterally because mac_address may be the host's
+# MAC, so only fall back if someone deliberately left power_address empty.
+{{if ip_address and not power_address}}
+power_address={{ip_address}}
+{{endif}}
+
+# This workaround is required on many BMCs, and should have no impact
+# on BMCs that don't require it.
+# See https://bugs.launchpad.net/maas/+bug/1287964
+workarounds="-W opensesspriv"
+
+# Determines the power command needed to execute the desired
+# action. This function receives ${power_change} as argument.
+formulate_power_command() {
+    case $1 in
+    'on') echo '--cycle --on-if-off' ;;
+    'off')
+        if [ "$power_off_mode" = "soft" ];
+        then
+            echo '--soft'
+        else
+            echo '--off'
+        fi ;;
+    'query') echo '--stat' ;;
+    *)
+        echo "Got unknown power state from ipmipower: '$1'" >&2
+        exit 1
+    esac
+}
+
+# Issue command to ipmipower, for the given system.
+issue_ipmi_command() {
+    # See https://launchpad.net/bugs/1053391 for details of this workaround
+    local driver_option="" user_option=""
+    if [ -n "$power_driver" ]
+        then
+          driver_option="--driver-type=${power_driver}"
+    fi
+    if [ -n "$power_user" ]
+        then
+          user_option="-u ${power_user}"
+    fi
+
+    if [ "$power_change" != "query" ]
+    then
+        # Use C locale to force English error messages.
+        result=$(echo workaround |\
+        LC_ALL=C ${ipmi_chassis_config} ${workarounds} ${driver_option} -h ${power_address} ${user_option} -p ${power_pass} --commit --filename ${config} 2>&1)
+
+        if echo $result | grep -q "password invalid"
+        then
+            echo "Invalid password" >&2
+            exit 2
+        fi
+    fi
+
+    # Use C locale to force English error messages.
+    result=$(echo workaround |\
+    LC_ALL=C ${ipmipower} ${workarounds} ${driver_option} -h ${power_address} ${user_option} -p ${power_pass} "$@")
+
+    exit_status=$?
+
+    if echo $result | grep -q "password invalid"
+    then
+        echo "Invalid password" >&2
+        exit 2
+    fi
+
+    if [ $exit_status -ne 0 ]; then
+        echo $result >&2
+        exit 2
+    fi
+
+    case "$result" in
+        *:* )
+                # Result looks like the usual IPMI output:
+                # <ipmi-ip-address>: <on/off>, just return the <on|off>
+                # part.
+                echo ${result} | cut -d ':' -f 2
+                ;;
+        * )
+                echo ${result};;
+    esac
+}
+ 
+# This script deliberately does not check the current power state
+# before issuing the requested power command. See bug 1171418 for an
+# explanation.
+power_command=$(formulate_power_command ${power_change})
+issue_ipmi_command ${power_command}

=== modified file 'src/provisioningserver/drivers/power/__init__.py'
--- src/provisioningserver/drivers/power/__init__.py	2015-08-06 00:36:14 +0000
+++ src/provisioningserver/drivers/power/__init__.py	2015-08-17 16:53:58 +0000
@@ -334,7 +334,6 @@
 
 from provisioningserver.drivers.power.apc import APCPowerDriver
 from provisioningserver.drivers.power.hmc import HMCPowerDriver
-from provisioningserver.drivers.power.ipmi import IPMIPowerDriver
 from provisioningserver.drivers.power.msftocs import MicrosoftOCSPowerDriver
 from provisioningserver.drivers.power.mscm import MSCMPowerDriver
 from provisioningserver.drivers.power.seamicro import SeaMicroPowerDriver
@@ -345,7 +344,6 @@
 builtin_power_drivers = [
     APCPowerDriver(),
     HMCPowerDriver(),
-    IPMIPowerDriver(),
     MicrosoftOCSPowerDriver(),
     MSCMPowerDriver(),
     SeaMicroPowerDriver(),

=== removed file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py	2015-08-11 01:13:20 +0000
+++ src/provisioningserver/drivers/power/ipmi.py	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""IPMI Power Driver."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-from subprocess import (
-    PIPE,
-    Popen,
-)
-from tempfile import NamedTemporaryFile
-
-from provisioningserver.drivers.power import (
-    PowerAuthError,
-    PowerDriver,
-    PowerFatalError,
-)
-from provisioningserver.utils.network import find_ip_via_arp
-from provisioningserver.utils.shell import (
-    call_and_check,
-    ExternalProcessError,
-)
-
-
-IPMI_CONFIG = """\
-Section Chassis_Boot_Flags
-        Boot_Flags_Persistent                         No
-        Boot_Device                                   PXE
-EndSection
-"""
-
-
-def is_set(setting):
-    return not (setting is None or setting == "" or setting.isspace())
-
-
-class IPMIPowerDriver(PowerDriver):
-
-    name = 'ipmi'
-    description = "IPMI Power Driver."
-    settings = []
-
-    @staticmethod
-    def _issue_ipmi_chassis_config_command(command, change, address):
-        with NamedTemporaryFile() as tmp_config:
-            # Write out the chassis configuration.
-            tmp_config.write(IPMI_CONFIG)
-            tmp_config.flush()
-            # Use it when running the chassis config command.
-            # XXX: Not using call_and_check here because we
-            # need to check stderr.
-            command = tuple(command) + ("--filename", tmp_config.name)
-            process = Popen(command, stdout=PIPE, stderr=PIPE)
-            stdout, stderr = process.communicate()
-            stderr = stderr.strip()
-        if "password invalid" in stderr:
-            raise PowerAuthError("Invalid password.")
-        if process.returncode != 0:
-            raise PowerFatalError(
-                "Failed to power %s %s: %s" % (change, address, stderr))
-
-    @staticmethod
-    def _issue_ipmi_power_command(command, change, address):
-        command = tuple(command)  # For consistency when testing.
-        try:
-            output = call_and_check(command)
-        except ExternalProcessError as e:
-            raise PowerFatalError(
-                "Failed to power %s %s: %s" % (
-                    change, address, e.output_as_unicode))
-        else:
-            if 'on' in output:
-                return 'on'
-            elif 'off' in output:
-                return 'off'
-            else:
-                return output
-
-    def _issue_ipmi_command(
-            self, power_change, power_address=None, power_user=None,
-            power_pass=None, power_driver=None, power_off_mode=None,
-            ipmipower=None, ipmi_chassis_config=None, mac_address=None,
-            **extra):
-        """Issue command to ipmipower, for the given system."""
-        # This script deliberately does not check the current power state
-        # before issuing the requested power command. See bug 1171418 for an
-        # explanation.
-
-        if is_set(mac_address) and not is_set(power_address):
-            power_address = find_ip_via_arp(mac_address)
-
-        # The `-W opensesspriv` workaround is required on many BMCs, and
-        # should have no impact on BMCs that don't require it.
-        # See https://bugs.launchpad.net/maas/+bug/1287964
-        ipmi_chassis_config_command = [
-            ipmi_chassis_config, '-W', 'opensesspriv']
-        ipmipower_command = [
-            ipmipower, '-W', 'opensesspriv']
-
-        # Arguments in common between chassis config and power control. See
-        # https://launchpad.net/bugs/1053391 for details of modifying the
-        # command for power_driver and power_user.
-        common_args = []
-        if is_set(power_driver):
-            common_args.extend(("--driver-type", power_driver))
-        common_args.extend(('-h', power_address))
-        if is_set(power_user):
-            common_args.extend(("-u", power_user))
-        common_args.extend(('-p', power_pass))
-
-        # Update the chassis config and power commands.
-        ipmi_chassis_config_command.extend(common_args)
-        ipmi_chassis_config_command.append('--commit')
-        ipmipower_command.extend(common_args)
-
-        # Before changing state run the chassis config command.
-        if power_change in ("on", "off"):
-            self._issue_ipmi_chassis_config_command(
-                ipmi_chassis_config_command, power_change, power_address)
-
-        # Additional arguments for the power command.
-        if power_change == 'on':
-            ipmipower_command.append('--cycle')
-            ipmipower_command.append('--on-if-off')
-        elif power_change == 'off':
-            if power_off_mode == 'soft':
-                ipmipower_command.append('--soft')
-            else:
-                ipmipower_command.append('--off')
-        elif power_change == 'query':
-            ipmipower_command.append('--stat')
-
-        # Update or query the power state.
-        return self._issue_ipmi_power_command(
-            ipmipower_command, power_change, power_address)
-
-    def power_on(self, system_id, **kwargs):
-        self._issue_ipmi_command('on', **kwargs)
-
-    def power_off(self, system_id, **kwargs):
-        self._issue_ipmi_command('off', **kwargs)
-
-    def power_query(self, system_id, **kwargs):
-        return self._issue_ipmi_command('query', **kwargs)

=== removed file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py	2015-08-11 03:56:48 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py	1970-01-01 00:00:00 +0000
@@ -1,312 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for `provisioningserver.drivers.power.ipmi`."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-import random
-from subprocess import PIPE
-
-from maastesting.factory import factory
-from maastesting.matchers import (
-    MockCalledOnceWith,
-    MockNotCalled,
-)
-from maastesting.testcase import MAASTestCase
-from mock import (
-    ANY,
-    sentinel,
-)
-from provisioningserver.drivers.power import (
-    ipmi as ipmi_module,
-    PowerAuthError,
-    PowerFatalError,
-)
-from provisioningserver.drivers.power.ipmi import (
-    IPMI_CONFIG,
-    IPMIPowerDriver,
-)
-from provisioningserver.utils.shell import ExternalProcessError
-from testtools.matchers import (
-    Contains,
-    Equals,
-)
-
-
-def make_parameters():
-    power_address = factory.make_name('power_address')
-    power_user = factory.make_name('power_user')
-    power_pass = factory.make_name('power_pass')
-    power_driver = factory.make_name('power_driver')
-    power_off_mode = factory.make_name('power_off_mode')
-    ipmipower = factory.make_name('ipmipower')
-    ipmi_chassis_config = factory.make_name('ipmi_chassis_config')
-    params = {
-        'power_address': power_address,
-        'power_user': power_user,
-        'power_pass': power_pass,
-        'power_driver': power_driver,
-        'power_off_mode': power_off_mode,
-        'ipmipower': ipmipower,
-        'ipmi_chassis_config': ipmi_chassis_config,
-    }
-
-    return (
-        power_address, power_user, power_pass, power_driver,
-        power_off_mode, ipmipower, ipmi_chassis_config, params
-    )
-
-
-def make_ipmi_chassis_config_command(
-        ipmi_chassis_config, power_address, power_pass,
-        power_driver, power_user, tmp_config_name):
-    print(tmp_config_name)
-    return (
-        ipmi_chassis_config, '-W', 'opensesspriv', "--driver-type",
-        power_driver, '-h', power_address, '-u', power_user, '-p', power_pass,
-        '--commit', '--filename', tmp_config_name
-    )
-
-
-def make_ipmipower_command(
-        ipmipower, power_address, power_pass,
-        power_driver, power_user):
-    return (
-        ipmipower, '-W', 'opensesspriv', "--driver-type", power_driver, '-h',
-        power_address, '-u', power_user, '-p', power_pass
-    )
-
-
-class TestIPMIPowerDriver(MAASTestCase):
-
-    def test__finds_power_address_from_mac_address(self):
-        (power_address, power_user, power_pass, power_driver, power_off_mode,
-         ipmipower, ipmi_chassis_config, params) = make_parameters()
-        params['mac_address'] = factory.make_mac_address()
-        params['power_address'] = random.choice((None, "", "   "))
-
-        ip_address = factory.make_ipv4_address()
-        find_ip_via_arp = self.patch(ipmi_module, 'find_ip_via_arp')
-        find_ip_via_arp.return_value = ip_address
-        power_change = random.choice(("on", "off"))
-
-        driver = IPMIPowerDriver()
-        self.patch_autospec(driver, "_issue_ipmi_chassis_config_command")
-        self.patch_autospec(driver, "_issue_ipmi_power_command")
-        driver._issue_ipmi_command(power_change, **params)
-
-        # The IP address is passed to _issue_ipmi_chassis_config_command.
-        self.assertThat(
-            driver._issue_ipmi_chassis_config_command,
-            MockCalledOnceWith(ANY, power_change, ip_address))
-        # The IP address is also within the command passed to
-        # _issue_ipmi_chassis_config_command.
-        self.assertThat(
-            driver._issue_ipmi_chassis_config_command.call_args[0],
-            Contains(ip_address))
-        # The IP address is passed to _issue_ipmi_power_command.
-        self.assertThat(
-            driver._issue_ipmi_power_command,
-            MockCalledOnceWith(ANY, power_change, ip_address))
-        # The IP address is also within the command passed to
-        # _issue_ipmi_power_command.
-        self.assertThat(
-            driver._issue_ipmi_power_command.call_args[0],
-            Contains(ip_address))
-
-    def test__chassis_config_written_to_temporary_file(self):
-        NamedTemporaryFile = self.patch(ipmi_module, "NamedTemporaryFile")
-        tmpfile = NamedTemporaryFile.return_value
-        tmpfile.__enter__.return_value = tmpfile
-        tmpfile.name = factory.make_name("filename")
-
-        IPMIPowerDriver._issue_ipmi_chassis_config_command(
-            ["true"], sentinel.change, sentinel.addr)
-
-        self.assertThat(NamedTemporaryFile, MockCalledOnceWith())
-        self.assertThat(tmpfile.__enter__, MockCalledOnceWith())
-        self.assertThat(tmpfile.write, MockCalledOnceWith(IPMI_CONFIG))
-        self.assertThat(tmpfile.flush, MockCalledOnceWith())
-        self.assertThat(tmpfile.__exit__, MockCalledOnceWith(None, None, None))
-
-    def test__issue_ipmi_command_issues_power_on(self):
-        (power_address, power_user, power_pass, power_driver, power_off_mode,
-         ipmipower, ipmi_chassis_config, params) = make_parameters()
-        ipmi_chassis_config_command = make_ipmi_chassis_config_command(
-            ipmi_chassis_config, power_address, power_pass, power_driver,
-            power_user, ANY)
-        ipmipower_command = make_ipmipower_command(
-            ipmipower, power_address, power_pass, power_driver, power_user)
-        ipmipower_command += ('--cycle', '--on-if-off')
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = 0
-        call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
-        call_and_check_mock.return_value = 'on'
-
-        result = ipmi_power_driver._issue_ipmi_command('on', **params)
-
-        self.expectThat(
-            popen_mock, MockCalledOnceWith(
-                ipmi_chassis_config_command, stdout=PIPE, stderr=PIPE))
-        self.expectThat(
-            call_and_check_mock, MockCalledOnceWith(ipmipower_command))
-        self.expectThat(result, Equals('on'))
-
-    def test__issue_ipmi_command_issues_power_off(self):
-        (power_address, power_user, power_pass, power_driver, power_off_mode,
-         ipmipower, ipmi_chassis_config, params) = make_parameters()
-        ipmi_chassis_config_command = make_ipmi_chassis_config_command(
-            ipmi_chassis_config, power_address, power_pass, power_driver,
-            power_user, ANY)
-        ipmipower_command = make_ipmipower_command(
-            ipmipower, power_address, power_pass, power_driver, power_user)
-        ipmipower_command += ('--off', )
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = 0
-        call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
-        call_and_check_mock.return_value = 'off'
-
-        result = ipmi_power_driver._issue_ipmi_command('off', **params)
-
-        self.expectThat(
-            popen_mock, MockCalledOnceWith(
-                ipmi_chassis_config_command, stdout=PIPE, stderr=PIPE))
-        self.expectThat(
-            call_and_check_mock, MockCalledOnceWith(ipmipower_command))
-        self.expectThat(result, Equals('off'))
-
-    def test__issue_ipmi_command_issues_power_off_soft_mode(self):
-        (power_address, power_user, power_pass, power_driver, power_off_mode,
-         ipmipower, ipmi_chassis_config, params) = make_parameters()
-        params['power_off_mode'] = 'soft'
-        ipmi_chassis_config_command = make_ipmi_chassis_config_command(
-            ipmi_chassis_config, power_address, power_pass, power_driver,
-            power_user, ANY)
-        ipmipower_command = make_ipmipower_command(
-            ipmipower, power_address, power_pass, power_driver, power_user)
-        ipmipower_command += ('--soft', )
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = 0
-        call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
-        call_and_check_mock.return_value = 'off'
-
-        result = ipmi_power_driver._issue_ipmi_command('off', **params)
-
-        self.expectThat(
-            popen_mock, MockCalledOnceWith(
-                ipmi_chassis_config_command, stdout=PIPE, stderr=PIPE))
-        self.expectThat(
-            call_and_check_mock, MockCalledOnceWith(ipmipower_command))
-        self.expectThat(result, Equals('off'))
-
-    def test__issue_ipmi_command_issues_power_query(self):
-        (power_address, power_user, power_pass, power_driver, power_off_mode,
-         ipmipower, ipmi_chassis_config, params) = make_parameters()
-        ipmipower_command = make_ipmipower_command(
-            ipmipower, power_address, power_pass, power_driver, power_user)
-        ipmipower_command += ('--stat', )
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = 0
-        call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
-        call_and_check_mock.return_value = 'other'
-
-        result = ipmi_power_driver._issue_ipmi_command('query', **params)
-
-        self.expectThat(popen_mock, MockNotCalled())
-        self.expectThat(
-            call_and_check_mock, MockCalledOnceWith(ipmipower_command))
-        self.expectThat(result, Equals('other'))
-
-    def test__issue_ipmi_command_issues_raises_power_auth_error(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, 'password invalid')
-        process.returncode = 0
-
-        self.assertRaises(
-            PowerAuthError, ipmi_power_driver._issue_ipmi_command,
-            'on', **params)
-
-    def test__issue_ipmi_command_issues_raises_power_fatal_error(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = -1
-
-        self.assertRaises(
-            PowerFatalError, ipmi_power_driver._issue_ipmi_command,
-            'on', **params)
-
-    def test__issue_ipmi_command_issues_catches_external_process_error(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        popen_mock = self.patch(ipmi_module, 'Popen')
-        process = popen_mock.return_value
-        process.communicate.return_value = (None, '')
-        process.returncode = 0
-        call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
-        call_and_check_mock.side_effect = (
-            ExternalProcessError(1, "ipmipower something"))
-
-        self.assertRaises(
-            PowerFatalError, ipmi_power_driver._issue_ipmi_command,
-            'on', **params)
-
-    def test_power_on_calls__issue_ipmi_command(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        _issue_ipmi_command_mock = self.patch(
-            ipmi_power_driver, '_issue_ipmi_command')
-        system_id = factory.make_name('system_id')
-        ipmi_power_driver.power_on(system_id, **params)
-
-        self.assertThat(
-            _issue_ipmi_command_mock, MockCalledOnceWith('on', **params))
-
-    def test_power_off_calls__issue_ipmi_command(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        _issue_ipmi_command_mock = self.patch(
-            ipmi_power_driver, '_issue_ipmi_command')
-        system_id = factory.make_name('system_id')
-        ipmi_power_driver.power_off(system_id, **params)
-
-        self.assertThat(
-            _issue_ipmi_command_mock, MockCalledOnceWith('off', **params))
-
-    def test_power_query_calls__issue_ipmi_command(self):
-        _, _, _, _, _, _, _, params = make_parameters()
-        ipmi_power_driver = IPMIPowerDriver()
-        _issue_ipmi_command_mock = self.patch(
-            ipmi_power_driver, '_issue_ipmi_command')
-        system_id = factory.make_name('system_id')
-        ipmi_power_driver.power_query(system_id, **params)
-
-        self.assertThat(
-            _issue_ipmi_command_mock, MockCalledOnceWith('query', **params))

=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
--- src/provisioningserver/power/tests/test_poweraction.py	2015-08-06 00:36:14 +0000
+++ src/provisioningserver/power/tests/test_poweraction.py	2015-08-17 16:53:58 +0000
@@ -202,6 +202,21 @@
             locate_config('templates/power'),
             PowerAction(power_type).get_config_basedir())
 
+    def test_ipmi_script_includes_config_dir(self):
+        conf_dir = factory.make_name('power_config_dir')
+        self.configure_power_config_dir(conf_dir)
+        action = PowerAction('ipmi')
+        script = action.render_template(
+            action.get_template(),
+            action.update_context(dict(
+                power_change='on', power_address='mystystem',
+                power_user='me', power_pass='me', ipmipower='echo',
+                ipmi_chassis_config='echo', config_dir='dir',
+                ipmi_config='file.conf', power_driver='LAN',
+                ip_address='', power_off_mode='hard')),
+        )
+        self.assertIn(conf_dir, script)
+
     def test_moonshot_checks_state(self):
         # We can't test the moonshot template in detail (and it may be
         # customized), but by making it use "echo" instead of a real
@@ -223,7 +238,7 @@
 class TestTemplateContext(MAASTestCase):
 
     def make_stubbed_power_action(self):
-        power_action = PowerAction("moonshot")
+        power_action = PowerAction("ipmi")
         render_template = self.patch(power_action, "render_template")
         render_template.return_value = "echo done"
         return power_action