Merge lp:~lutostag/ubuntu/trusty/maas/1.5.4 into lp:ubuntu/trusty-proposed/maas

[Greg Lutostanski]

Proposed update to bring maas bugfix release 1.5.4 into trusty via SRU.

Builds and installs fine.

[Chuck Short (zulcss)]

review: Approve

[Greg Lutostanski (lutostag)]

For an SRU team member who may be looking at this, effected bugs fixed in SRU are:
1350235
1338851
1337437
1190986
1325759
1325640
1315154
1352273
1342302
1334401
1331982

[Greg Lutostanski (lutostag)]

New changelog that clearly shows supported releases for install.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-20 10:10:47 +0000
+++ debian/changelog	2014-08-29 19:22:35 +0000
@@ -1,3 +1,42 @@
+maas (1.5.4+bzr2294-0ubuntu1) trusty-proposed; urgency=medium
+
+  * New upstream bug fix release:
+    - Package fails to install when the default route is through an
+      aliased/tagged interface (LP: #1350235)
+    - ERROR Nonce already used (LP: #1190986)
+    - Add MAAS arm64/xgene support (LP: #1338851)
+    - Add utopic support (LP: #1337437)
+    - API documentation for nodegroup op=details missing parameter
+      (LP: #1331982)
+    - Reduce number of celery tasks emitted when updating a cluster controller
+      (LP: #1324944)
+    - Fix VirshSSH template which was referencing invalid attributes
+      (LP: #1324966)
+    - Fix a start up problems where a database lock was being taken outside of
+      a transaction (LP: #1325640, LP: #1325759)
+    - Reformat badly formatted Architecture error message (LP: #1301465)
+    - Final changes to support ppc64el (now known as PowerNV) (LP: #1315154)
+    - UI tweak to make navigation elements visible for documentation
+
+  [ Greg Lutostanski ]
+   * debian/control:
+    - maas-provisioningserver not maas-cluster-controller depends on
+      python-pexpect (LP: #1352273)
+
+  [ Gavin Panella ]
+   * debian/maas-cluster-controller.postinst
+    - Allow maas-pserv to bind to all IPv6 addresses too. (LP: #1342302) 
+
+  [ Diogo Matsubara ]
+   * debian/control:
+    - python-maas-provisioningserver depends on python-paramiko (LP: #1334401)
+
+  [ Raphaël Badin ]
+   * debian/extras/99-maas-sudoers:
+    - Add rule 'maas-dhcp-server stop' job.
+
+ -- Greg Lutostanski <[e-mail]>  Fri, 29 Aug 2014 13:27:34 -0500
+
 maas (1.5.2+bzr2282-0ubuntu0.2) trusty-proposed; urgency=medium
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2014-06-20 10:10:47 +0000
+++ debian/control	2014-08-29 19:22:35 +0000
@@ -99,6 +99,8 @@
          python-oops-amqp,
          python-oops-datedir-repo,
          python-oops-twisted,
+         python-paramiko,
+         python-pexpect,
          python-pyparsing,
          python-seamicroclient,
          python-simplestreams,
@@ -159,7 +161,6 @@
          python-maas-provisioningserver (=${binary:Version}),
          python-netaddr,
          python-oauth,
-         python-pexpect,
          python-tempita,
          python-twisted,
          python-zope.interface,

=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2013-06-03 16:53:14 +0000
+++ debian/extras/99-maas-sudoers	2014-08-29 19:22:35 +0000
@@ -1,3 +1,4 @@
 maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
+maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server stop
 maas ALL= NOPASSWD: /usr/sbin/maas-provision
 maas ALL= NOPASSWD: SETENV: /usr/sbin/maas-import-pxe-files

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-04-03 13:45:02 +0000
+++ debian/maas-cluster-controller.postinst	2014-08-29 19:22:35 +0000
@@ -103,6 +103,7 @@
         fi
     fi
     echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID
+    echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID
     chown maas:maas /etc/authbind/byuid/$MAAS_UID
     chmod 700 /etc/authbind/byuid/$MAAS_UID
 }

=== modified file 'docs/_templates/maas/layout.html'
--- docs/_templates/maas/layout.html	2014-04-15 14:41:32 +0000
+++ docs/_templates/maas/layout.html	2014-08-29 19:22:35 +0000
@@ -10,6 +10,12 @@
 <br/>
 {% endblock %}
 
+{# Remove 'modules' and 'index' from rellinks: they point to
+   autogenerated code documentation pages that we don't want
+   to advertise too much.
+#}
+{%- set rellinks = rellinks[2:] %}
+
 {%- block footer %}
 <footer class="global clearfix">
   <div class="legal clearfix">

=== modified file 'docs/_templates/maas/static/css/main.css'
--- docs/_templates/maas/static/css/main.css	2014-02-15 12:08:23 +0000
+++ docs/_templates/maas/static/css/main.css	2014-08-29 19:22:35 +0000
@@ -9,7 +9,7 @@
 
 div.document {
   width: 984px;
-  margin: 30px auto 0 auto;
+  margin: 10px auto 0 auto;
 }
 
 div.body h1 {

=== modified file 'docs/_templates/maas/static/flasky.css_t'
--- docs/_templates/maas/static/flasky.css_t	2013-10-10 17:07:51 +0000
+++ docs/_templates/maas/static/flasky.css_t	2014-08-29 19:22:35 +0000
@@ -25,7 +25,7 @@
 
 div.document {
     width: {{ page_width }};
-    margin: 30px auto 0 auto;
+    margin: 10px auto 0 auto;
 }
 
 div.documentwrapper {
@@ -69,6 +69,11 @@
 }
 
 div.related {
+    width: {{ page_width }};
+    margin: 10px auto 0 auto;
+}
+
+div.related h3 {
     display: none;
 }
 

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2014-06-02 11:57:58 +0000
+++ docs/changelog.rst	2014-08-29 19:22:35 +0000
@@ -2,6 +2,37 @@
 Changelog
 =========
 
+1.5.4
+=====
+
+Bug fix update
+--------------
+
+ - Package fails to install when the default route is through an
+   aliased/tagged interface (LP: #1350235)
+ - ERROR Nonce already used (LP: #1190986)
+ - Add MAAS arm64/xgene support (LP: #1338851)
+ - Add utopic support (LP: #1337437)
+ - API documentation for nodegroup op=details missing parameter
+   (LP: #1331982)
+
+
+1.5.3
+=====
+
+Bug fix update
+--------------
+
+ - Reduce number of celery tasks emitted when updating a cluster controller
+   (LP: #1324944)
+ - Fix VirshSSH template which was referencing invalid attributes
+   (LP: #1324966)
+ - Fix a start up problem where a database lock was being taken outside of
+   a transaction (LP: #1325759)
+ - Reformat badly formatted Architecture error message (LP: #1301465)
+ - Final changes to support ppc64el (now known as PowerNV) (LP: #1315154)
+
+
 1.5.2
 =====
 

=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_api_helper.py'
--- etc/maas/templates/commissioning-user-data/snippets/maas_api_helper.py	2013-10-10 17:07:51 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/maas_api_helper.py	2014-08-29 19:22:35 +0000
@@ -12,6 +12,7 @@
 import sys
 import time
 import urllib2
+import uuid
 
 import oauth.oauth as oauth
 import yaml
@@ -60,7 +61,7 @@
 
     params = {
         'oauth_version': "1.0",
-        'oauth_nonce': oauth.generate_nonce(),
+        'oauth_nonce': uuid.uuid4().get_hex(),
         'oauth_timestamp': timestamp,
         'oauth_token': token.key,
         'oauth_consumer_key': consumer.key,

=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
--- etc/maas/templates/dhcp/dhcpd.conf.template	2014-04-09 19:02:00 +0000
+++ etc/maas/templates/dhcp/dhcpd.conf.template	2014-08-29 19:22:35 +0000
@@ -6,6 +6,7 @@
 # the nodegroup's configuration in MAAS to trigger an update.
 
 option arch code 93 = unsigned integer 16; # RFC4578
+option path-prefix code 210 = text; #RFC5071
 {{for dhcp_subnet in dhcp_subnets}}
 subnet {{dhcp_subnet['subnet']}} netmask {{dhcp_subnet['subnet_mask']}} {
        {{bootloader}}

=== added file 'etc/maas/templates/power/mscm.template'
--- etc/maas/templates/power/mscm.template	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/power/mscm.template	2014-08-29 19:22:35 +0000
@@ -0,0 +1,15 @@
+# -*- mode: shell-script -*-
+#
+# Control a system via Moonshot HP iLO Chassis Manager (MSCM).
+
+{{py: from provisioningserver.utils import escape_py_literal}}
+python - << END
+from provisioningserver.drivers.hardware.mscm import power_control_mscm
+power_control_mscm(
+    {{escape_py_literal(power_address) | safe}},
+    {{escape_py_literal(power_user) | safe}},
+    {{escape_py_literal(power_pass) | safe}},
+    {{escape_py_literal(node_id) | safe}},
+    {{escape_py_literal(power_change) | safe}},
+)
+END

=== added symlink 'etc/maas/templates/pxe/config.commissioning.arm64.template'
=== target is u'config.commissioning.armhf.template'
=== added file 'etc/maas/templates/pxe/config.commissioning.ppc64el.template'
--- etc/maas/templates/pxe/config.commissioning.ppc64el.template	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/pxe/config.commissioning.ppc64el.template	2014-08-29 19:22:35 +0000
@@ -0,0 +1,6 @@
+DEFAULT execute
+
+LABEL execute
+  KERNEL {{kernel_params | kernel_path }}
+  INITRD {{kernel_params | initrd_path }}
+  APPEND {{kernel_params | kernel_command}}

=== added symlink 'etc/maas/templates/pxe/config.install.arm64.template'
=== target is u'config.install.armhf.template'
=== added file 'etc/maas/templates/pxe/config.install.ppc64el.template'
--- etc/maas/templates/pxe/config.install.ppc64el.template	1970-01-01 00:00:00 +0000
+++ etc/maas/templates/pxe/config.install.ppc64el.template	2014-08-29 19:22:35 +0000
@@ -0,0 +1,6 @@
+DEFAULT execute
+
+LABEL execute
+  KERNEL {{kernel_params | kernel_path }}
+  INITRD {{kernel_params | initrd_path }}
+  APPEND {{kernel_params | kernel_command}}

=== added symlink 'etc/maas/templates/pxe/config.xinstall.arm64.template'
=== target is u'config.xinstall.armhf.template'
=== added symlink 'etc/maas/templates/pxe/config.xinstall.ppc64el.template'
=== target is u'config.install.ppc64el.template'
=== modified file 'src/apiclient/maas_client.py'
--- src/apiclient/maas_client.py	2014-04-15 14:41:32 +0000
+++ src/apiclient/maas_client.py	2014-08-29 19:22:35 +0000
@@ -21,6 +21,7 @@
 import gzip
 from io import BytesIO
 import urllib2
+import uuid
 
 from apiclient.encode_json import encode_json_data
 from apiclient.multipart import encode_multipart_data
@@ -45,7 +46,8 @@
             with the signature.
         """
         oauth_request = oauth.OAuthRequest.from_consumer_and_token(
-            self.consumer_token, token=self.resource_token, http_url=url)
+            self.consumer_token, token=self.resource_token, http_url=url,
+            parameters={'oauth_nonce': uuid.uuid4().get_hex()})
         oauth_request.sign_request(
             oauth.OAuthSignatureMethod_PLAINTEXT(), self.consumer_token,
             self.resource_token)

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2014-06-04 14:31:41 +0000
+++ src/maasserver/api.py	2014-08-29 19:22:35 +0000
@@ -1580,6 +1580,8 @@
         Returns a ``{system_id: {detail_type: xml, ...}, ...}`` map,
         where ``detail_type`` is something like "lldp" or "lshw".
 
+        :param system_ids: System ids of nodes for which to get system details.
+
         Note that this is returned as BSON and not JSON. This is for
         efficiency, but mainly because JSON can't do binary content
         without applying additional encoding like base-64.
@@ -1761,6 +1763,30 @@
 
         return HttpResponse(status=httplib.OK)
 
+    @admin_method
+    @operation(idempotent=False)
+    def probe_and_enlist_mscm(self, request, uuid):
+        """Add the nodes from a Moonshot HP iLO Chassis Manager (MSCM).
+
+        :param host: IP Address for the MSCM.
+        :type host: unicode
+        :param username: The username for the MSCM.
+        :type username: unicode
+        :param password: The password for the MSCM.
+        :type password: unicode
+
+        """
+        nodegroup = get_object_or_404(NodeGroup, uuid=uuid)
+
+        host = get_mandatory_param(request.data, 'host')
+        username = get_mandatory_param(request.data, 'username')
+        password = get_mandatory_param(request.data, 'password')
+
+        nodegroup.enlist_nodes_from_mscm(host, username, password)
+
+        return HttpResponse(status=httplib.OK)
+
+
 DISPLAYED_NODEGROUPINTERFACE_FIELDS = (
     'ip', 'management', 'interface', 'subnet_mask',
     'broadcast_ip', 'ip_range_low', 'ip_range_high')

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2014-03-28 10:43:53 +0000
+++ src/maasserver/enum.py	2014-08-29 19:22:35 +0000
@@ -93,21 +93,19 @@
     #:
     precise = 'precise'
     #:
-    quantal = 'quantal'
-    #:
-    raring = 'raring'
-    #:
     saucy = 'saucy'
     #:
     trusty = 'trusty'
+    #:
+    utopic = 'utopic'
+
 
 DISTRO_SERIES_CHOICES = (
     (DISTRO_SERIES.default, 'Default Ubuntu Release'),
     (DISTRO_SERIES.precise, 'Ubuntu 12.04 LTS "Precise Pangolin"'),
-    (DISTRO_SERIES.quantal, 'Ubuntu 12.10 "Quantal Quetzal"'),
-    (DISTRO_SERIES.raring, 'Ubuntu 13.04 "Raring Ringtail"'),
     (DISTRO_SERIES.saucy, 'Ubuntu 13.10 "Saucy Salamander"'),
     (DISTRO_SERIES.trusty, 'Ubuntu 14.04 LTS "Trusty Tahr"'),
+    (DISTRO_SERIES.utopic, 'Ubuntu 14.10 "Utopic Unicorn"'),
 )
 
 

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2014-06-04 14:31:41 +0000
+++ src/maasserver/models/nodegroup.py	2014-08-29 19:22:35 +0000
@@ -42,6 +42,7 @@
     add_new_dhcp_host_map,
     add_seamicro15k,
     add_virsh,
+    enlist_nodes_from_mscm,
     enlist_nodes_from_ucsm,
     import_boot_images,
     report_boot_images,
@@ -307,6 +308,16 @@
         args = (url, username, password)
         enlist_nodes_from_ucsm.apply_async(queue=self.uuid, args=args)
 
+    def enlist_nodes_from_mscm(self, host, username, password):
+        """ Add the servers from a Moonshot HP iLO Chassis Manager.
+
+        :param host: IP address for the MSCM.
+        :param username: username for MSCM.
+        :param password: password for MSCM.
+        """
+        args = (host, username, password)
+        enlist_nodes_from_mscm.apply_async(queue=self.uuid, args=args)
+
     def add_dhcp_host_maps(self, new_leases):
         if len(new_leases) > 0 and len(self.get_managed_interfaces()) > 0:
             # XXX JeroenVermeulen 2012-08-21, bug=1039362: the DHCP

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-04-15 14:41:32 +0000
+++ src/maasserver/models/tests/test_node.py	2014-08-29 19:22:35 +0000
@@ -162,7 +162,7 @@
 
     def test_set_get_distro_series_returns_series(self):
         node = factory.make_node()
-        series = DISTRO_SERIES.quantal
+        series = DISTRO_SERIES.utopic
         node.set_distro_series(series)
         self.assertEqual(series, node.get_distro_series())
 
@@ -474,7 +474,7 @@
     def test_release_clears_distro_series(self):
         node = factory.make_node(
             status=NODE_STATUS.ALLOCATED, owner=factory.make_user())
-        node.set_distro_series(series=DISTRO_SERIES.quantal)
+        node.set_distro_series(series=DISTRO_SERIES.utopic)
         node.release()
         self.assertEqual("", node.distro_series)
 

=== modified file 'src/maasserver/rpc/regionservice.py'
--- src/maasserver/rpc/regionservice.py	2014-04-03 13:45:02 +0000
+++ src/maasserver/rpc/regionservice.py	2014-08-29 19:22:35 +0000
@@ -325,8 +325,8 @@
 
     @synchronous
     @synchronised(lock)
+    @transactional
     @synchronised(locks.eventloop)
-    @transactional
     def prepare(self):
         """Ensure that the ``eventloops`` table exists.
 

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2014-04-15 14:41:32 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2014-08-29 19:22:35 +0000
@@ -49,6 +49,7 @@
     common,
     exceptions,
     )
+from provisioningserver.rpc.interfaces import IConnection
 from provisioningserver.rpc.region import (
     Identify,
     ReportBootImages,
@@ -82,6 +83,7 @@
 from twisted.internet.threads import deferToThread
 from twisted.protocols import amp
 from twisted.python import log
+from zope.interface.verify import verifyObject
 
 
 class TestRegionProtocol_Identify(MAASTestCase):
@@ -195,10 +197,6 @@
         return d.addCallback(check)
 
 
-from provisioningserver.rpc.interfaces import IConnection
-from zope.interface.verify import verifyObject
-
-
 class TestRegionServer(MAASServerTestCase):
 
     def test_interfaces(self):

=== modified file 'src/maasserver/start_up.py'
--- src/maasserver/start_up.py	2014-04-09 19:02:00 +0000
+++ src/maasserver/start_up.py	2014-08-29 19:22:35 +0000
@@ -18,7 +18,10 @@
 
 from textwrap import dedent
 
-from django.db import connection
+from django.db import (
+    connection,
+    transaction,
+    )
 from maasserver import (
     eventloop,
     locks,
@@ -51,8 +54,9 @@
     but this method uses file-based locking to ensure that the methods it calls
     internally are not ran concurrently.
     """
-    with locks.startup:
-        inner_start_up()
+    with transaction.atomic():
+        with locks.startup:
+            inner_start_up()
 
     eventloop.start().wait(10)
 

=== modified file 'src/maasserver/testing/tests/test_rabbit.py'
--- src/maasserver/testing/tests/test_rabbit.py	2013-10-04 12:33:05 +0000
+++ src/maasserver/testing/tests/test_rabbit.py	2014-08-29 19:22:35 +0000
@@ -26,7 +26,8 @@
     def test_patch(self):
         config = RabbitServerResources(
             hostname=factory.getRandomString(),
-            port=factory.getRandomPort())
+            port=factory.getRandomPort(),
+            dist_port=factory.getRandomPort())
         self.useFixture(config)
         self.useFixture(RabbitServerSettings(config))
         self.assertEqual(

=== modified file 'src/maasserver/tests/test_api_nodegroup.py'
--- src/maasserver/tests/test_api_nodegroup.py	2014-04-15 14:41:32 +0000
+++ src/maasserver/tests/test_api_nodegroup.py	2014-08-29 19:22:35 +0000
@@ -460,6 +460,32 @@
         matcher = MockCalledOnceWith(queue=nodegroup.uuid, args=args)
         self.assertThat(mock.apply_async, matcher)
 
+    def test_probe_and_enlist_mscm_adds_mscm(self):
+        nodegroup = factory.make_node_group()
+        host = 'http://host'
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        self.become_admin()
+
+        mock = self.patch(nodegroup_module, 'enlist_nodes_from_mscm')
+
+        response = self.client.post(
+            reverse('nodegroup_handler', args=[nodegroup.uuid]),
+            {
+                'op': 'probe_and_enlist_mscm',
+                'host': host,
+                'username': username,
+                'password': password,
+            })
+
+        self.assertEqual(
+            httplib.OK, response.status_code,
+            explain_unexpected_response(httplib.OK, response))
+
+        args = (host, username, password)
+        matcher = MockCalledOnceWith(queue=nodegroup.uuid, args=args)
+        self.assertThat(mock.apply_async, matcher)
+
 
 class TestNodeGroupAPIAuth(MAASServerTestCase):
     """Authorization tests for nodegroup API."""

=== modified file 'src/maasserver/utils/dblocks.py'
--- src/maasserver/utils/dblocks.py	2014-04-03 13:45:02 +0000
+++ src/maasserver/utils/dblocks.py	2014-08-29 19:22:35 +0000
@@ -14,6 +14,8 @@
 __metaclass__ = type
 __all__ = [
     "DatabaseLock",
+    "DatabaseLockAttemptOutsideTransaction",
+    "DatabaseLockNotHeld",
 ]
 
 from contextlib import closing
@@ -26,6 +28,19 @@
 classid = 20120116
 
 
+class DatabaseLockAttemptOutsideTransaction(Exception):
+    """A locking attempt was made outside of a transaction.
+
+    :class:`DatabaseLock` should only be used within a transaction.
+    Django agressively closes connections outside of atomic blocks to
+    the extent that session-level locks are rendered unreliable at best.
+    """
+
+
+class DatabaseLockNotHeld(Exception):
+    """A particular lock was not held."""
+
+
 class DatabaseLock(tuple):
     """An advisory lock held in the database.
 
@@ -58,12 +73,16 @@
         return super(cls, DatabaseLock).__new__(cls, (classid, objid))
 
     def __enter__(self):
+        if not connection.in_atomic_block:
+            raise DatabaseLockAttemptOutsideTransaction(self)
         with closing(connection.cursor()) as cursor:
             cursor.execute("SELECT pg_advisory_lock(%s, %s)", self)
 
     def __exit__(self, *exc_info):
         with closing(connection.cursor()) as cursor:
             cursor.execute("SELECT pg_advisory_unlock(%s, %s)", self)
+            if cursor.fetchone() != (True,):
+                raise DatabaseLockNotHeld(self)
 
     def __repr__(self):
         return b"<%s classid=%d objid=%d>" % (
@@ -71,8 +90,18 @@
 
     def is_locked(self):
         stmt = (
-            "SELECT 1 FROM pg_locks"
-            " WHERE classid = %s AND objid = %s AND granted"
+            "SELECT 1 FROM pg_locks, pg_database"
+            " WHERE pg_locks.locktype = 'advisory'"
+            "   AND pg_locks.classid = %s"
+            "   AND pg_locks.objid = %s"
+            # objsubid is 2 when using the 2-argument version of the
+            # pg_advisory_* locking functions.
+            "   AND pg_locks.objsubid = 2"
+            "   AND pg_locks.granted"
+            # Advisory locks are local to each database so we join to
+            # pg_databases to discover the OID of the currrent database.
+            "   AND pg_locks.database = pg_database.oid"
+            "   AND pg_database.datname = current_database()"
         )
         with closing(connection.cursor()) as cursor:
             cursor.execute(stmt, self)

=== modified file 'src/maasserver/utils/tests/test_dblocks.py'
--- src/maasserver/utils/tests/test_dblocks.py	2014-03-28 10:43:53 +0000
+++ src/maasserver/utils/tests/test_dblocks.py	2014-08-29 19:22:35 +0000
@@ -16,7 +16,10 @@
 
 from contextlib import closing
 
-from django.db import connection
+from django.db import (
+    connection,
+    transaction,
+    )
 from maasserver.utils import dblocks
 from maastesting.testcase import MAASTestCase
 
@@ -40,6 +43,7 @@
         lock = dblocks.DatabaseLock(self.getUniqueInteger())
         self.assertEqual(lock, (lock.classid, lock.objid))
 
+    @transaction.atomic
     def test_lock_actually_locked(self):
         objid = self.getUniqueInteger()
         lock = dblocks.DatabaseLock(objid)
@@ -55,6 +59,7 @@
         locks_released = locks_held - locks_held_after
         self.assertEqual({objid}, locks_released)
 
+    @transaction.atomic
     def test_is_locked(self):
         objid = self.getUniqueInteger()
         lock = dblocks.DatabaseLock(objid)
@@ -64,6 +69,18 @@
             self.assertTrue(lock.is_locked())
         self.assertFalse(lock.is_locked())
 
+    def test_obtaining_lock_fails_when_outside_of_transaction(self):
+        objid = self.getUniqueInteger()
+        lock = dblocks.DatabaseLock(objid)
+        self.assertRaises(
+            dblocks.DatabaseLockAttemptOutsideTransaction,
+            lock.__enter__)
+
+    def test_releasing_lock_fails_when_lock_not_held(self):
+        objid = self.getUniqueInteger()
+        lock = dblocks.DatabaseLock(objid)
+        self.assertRaises(dblocks.DatabaseLockNotHeld, lock.__exit__)
+
     def test_repr(self):
         lock = dblocks.DatabaseLock(self.getUniqueInteger())
         self.assertEqual(

=== modified file 'src/maastesting/factory.py'
--- src/maastesting/factory.py	2014-03-28 10:43:53 +0000
+++ src/maastesting/factory.py	2014-08-29 19:22:35 +0000
@@ -35,6 +35,7 @@
 from uuid import uuid1
 
 from maastesting.fixtures import TempDirectory
+import mock
 from netaddr import (
     IPAddress,
     IPNetwork,
@@ -264,6 +265,14 @@
 
         return tarball
 
+    def make_streams(self, stdin=None, stdout=None, stderr=None):
+        """Make a fake return value for a SSHClient.exec_command."""
+        # stdout.read() is called so stdout can't be None.
+        if stdout is None:
+            stdout = mock.Mock()
+
+        return (stdin, stdout, stderr)
+
 
 # Create factory singleton.
 factory = Factory()

=== modified file 'src/metadataserver/address.py'
--- src/metadataserver/address.py	2013-10-10 17:07:51 +0000
+++ src/metadataserver/address.py	2014-08-29 19:22:35 +0000
@@ -63,13 +63,13 @@
     """
     route_lines = list(ip_route_output)
     for line in route_lines:
-        match = re.match('default\s+.*\sdev\s+(\w+)', line)
+        match = re.match('default\s+.*\sdev\s+([^\s]+)', line)
         if match is not None:
             return match.groups()[0]
 
     # Still nothing?  Try the first recognizable interface in the list.
     for line in route_lines:
-        match = re.match('\s*(?:\S+\s+)*dev\s+(\w+)', line)
+        match = re.match('\s*(?:\S+\s+)*dev\s+([^\s]+)', line)
         if match is not None:
             return match.groups()[0]
     return None

=== modified file 'src/metadataserver/tests/test_address.py'
--- src/metadataserver/tests/test_address.py	2013-10-10 17:07:51 +0000
+++ src/metadataserver/tests/test_address.py	2014-08-29 19:22:35 +0000
@@ -59,6 +59,26 @@
         self.assertEqual(
             'eth1', address.find_default_interface(sample_ip_route))
 
+    def test_find_default_interface_finds_default_tagged_interface(self):
+        sample_ip_route = [
+            "default via 10.20.64.1 dev eth0.2",
+            "10.14.0.0/16 dev br0  proto kernel  scope link  src 10.14.4.1",
+            "10.90.90.0/24 dev br0  proto kernel  scope link  src 10.90.90.1",
+            "169.254.0.0/16 dev br0  scope link  metric 1000",
+        ]
+        self.assertEqual(
+            'eth0.2', address.find_default_interface(sample_ip_route))
+
+    def test_find_default_interface_finds_default_aliased_interface(self):
+        sample_ip_route = [
+            "default via 10.20.64.1 dev eth0:2",
+            "10.14.0.0/16 dev br0  proto kernel  scope link  src 10.14.4.1",
+            "10.90.90.0/24 dev br0  proto kernel  scope link  src 10.90.90.1",
+            "169.254.0.0/16 dev br0  scope link  metric 1000",
+        ]
+        self.assertEqual(
+            'eth0:2', address.find_default_interface(sample_ip_route))
+
     def test_find_default_interface_makes_a_guess_if_no_default(self):
         sample_ip_route = [
             "10.0.0.0/24 dev eth2  proto kernel  scope link  src 10.0.0.11  "
@@ -69,6 +89,26 @@
         self.assertEqual(
             'eth2', address.find_default_interface(sample_ip_route))
 
+    def test_find_default_tagged_interface_makes_a_guess_if_no_default(self):
+        sample_ip_route = [
+            "10.0.0.0/24 dev eth2.4  proto kernel  scope link  src 10.0.0.11  "
+            "metric 2",
+            "10.1.0.0/24 dev virbr0  proto kernel  scope link  src 10.1.0.1",
+            "10.1.1.0/24 dev virbr1  proto kernel  scope link  src 10.1.1.1",
+            ]
+        self.assertEqual(
+            'eth2.4', address.find_default_interface(sample_ip_route))
+
+    def test_find_default_aliased_interface_makes_a_guess_if_no_default(self):
+        sample_ip_route = [
+            "10.0.0.0/24 dev eth2:4  proto kernel  scope link  src 10.0.0.11  "
+            "metric 2",
+            "10.1.0.0/24 dev virbr0  proto kernel  scope link  src 10.1.0.1",
+            "10.1.1.0/24 dev virbr1  proto kernel  scope link  src 10.1.1.1",
+            ]
+        self.assertEqual(
+            'eth2:4', address.find_default_interface(sample_ip_route))
+
     def test_find_default_interface_returns_None_on_failure(self):
         self.assertIsNone(address.find_default_interface([]))
 

=== modified file 'src/provisioningserver/boot/__init__.py'
--- src/provisioningserver/boot/__init__.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/boot/__init__.py	2014-08-29 19:22:35 +0000
@@ -99,6 +99,10 @@
 
     __metaclass__ = ABCMeta
 
+    # Path prefix that is used for the pxelinux.cfg. Used for
+    # the dhcpd.conf that is generated.
+    path_prefix = None
+
     @abstractproperty
     def name(self):
         """Name of the boot method."""
@@ -223,12 +227,14 @@
 from provisioningserver.boot.pxe import PXEBootMethod
 from provisioningserver.boot.uefi import UEFIBootMethod
 from provisioningserver.boot.powerkvm import PowerKVMBootMethod
+from provisioningserver.boot.powernv import PowerNVBootMethod
 
 
 builtin_boot_methods = [
     PXEBootMethod(),
     UEFIBootMethod(),
     PowerKVMBootMethod(),
+    PowerNVBootMethod(),
 ]
 for method in builtin_boot_methods:
     BootMethodRegistry.register_item(method.name, method)

=== added file 'src/provisioningserver/boot/powernv.py'
--- src/provisioningserver/boot/powernv.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/boot/powernv.py	2014-08-29 19:22:35 +0000
@@ -0,0 +1,158 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""PowerNV Boot Method"""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = [
+    'PowerNVBootMethod',
+    ]
+
+import re
+
+from provisioningserver.boot import (
+    BootMethod,
+    BytesReader,
+    get_parameters,
+    )
+from provisioningserver.boot.pxe import (
+    ARP_HTYPE,
+    re_mac_address,
+    )
+from provisioningserver.kernel_opts import compose_kernel_command_line
+from provisioningserver.utils import find_mac_via_arp
+from tftp.backend import FilesystemReader
+from twisted.python.context import get
+
+# The pxelinux.cfg path is prefixed with the architecture for the
+# PowerNV nodes. This prefix is set by the path-prefix dhcpd option.
+# We assume that the ARP HTYPE (hardware type) that PXELINUX sends is
+# always Ethernet.
+re_config_file = r'''
+    # Optional leading slash(es).
+    ^/*
+    ppc64el           # PowerNV pxe prefix, set by dhcpd
+    /
+    pxelinux[.]cfg    # PXELINUX expects this.
+    /
+    (?: # either a MAC
+        {htype:02x}    # ARP HTYPE.
+        -
+        (?P<mac>{re_mac_address.pattern})    # Capture MAC.
+    | # or "default"
+        default
+    )
+    $
+'''
+
+re_config_file = re_config_file.format(
+    htype=ARP_HTYPE.ETHERNET, re_mac_address=re_mac_address)
+re_config_file = re.compile(re_config_file, re.VERBOSE)
+
+
+def format_bootif(mac):
+    """Formats a mac address into the BOOTIF format, expected by
+    the linux kernel."""
+    mac = mac.replace(':', '-')
+    mac = mac.upper()
+    return '%02x-%s' % (ARP_HTYPE.ETHERNET, mac)
+
+
+class PowerNVBootMethod(BootMethod):
+
+    name = "powernv"
+    template_subdir = "pxe"
+    bootloader_path = "pxelinux.0"
+    arch_octet = "00:0E"
+    path_prefix = "ppc64el/"
+
+    def get_remote_mac(self):
+        """Gets the requestors MAC address from arp cache.
+
+        This is used, when the pxelinux.cfg is requested without the mac
+        address appended. This is needed to inject the BOOTIF into the
+        pxelinux.cfg that is returned to the node.
+        """
+        remote_host, remote_port = get("remote", (None, None))
+        return find_mac_via_arp(remote_host)
+
+    def get_params(self, backend, path):
+        """Gets the matching parameters from the requested path."""
+        match = re_config_file.match(path)
+        if match is not None:
+            return get_parameters(match)
+        if path.lstrip('/').startswith(self.path_prefix):
+            return {'path': path}
+        return None
+
+    def match_path(self, backend, path):
+        """Checks path for the configuration file that needs to be
+        generated.
+
+        :param backend: requesting backend
+        :param path: requested path
+        :returns: dict of match params from path, None if no match
+        """
+        params = self.get_params(backend, path)
+        if params is None:
+            return None
+        params['arch'] = "ppc64el"
+        if 'mac' not in params:
+            mac = self.get_remote_mac()
+            if mac is not None:
+                params['mac'] = mac
+        return params
+
+    def get_reader(self, backend, kernel_params, **extra):
+        """Render a configuration file as a unicode string.
+
+        :param backend: requesting backend
+        :param kernel_params: An instance of `KernelParameters`.
+        :param extra: Allow for other arguments. This is a safety valve;
+            parameters generated in another component (for example, see
+            `TFTPBackend.get_config_reader`) won't cause this to break.
+        """
+        # Due to the path prefix, all requested files from the client will
+        # contain that prefix. Removing the prefix from the path will return
+        # the correct path in the tftp root.
+        if 'path' in extra:
+            path = extra['path']
+            path = path.replace(self.path_prefix, '', 1)
+            target_path = backend.base.descendant(path.split('/'))
+            return FilesystemReader(target_path)
+
+        # Return empty config for PowerNV local. PowerNV fails to
+        # support the LOCALBOOT flag. Empty config will allow it
+        # to select the first device.
+        if kernel_params.purpose == 'local':
+            return BytesReader("".encode("utf-8"))
+
+        template = self.get_template(
+            kernel_params.purpose, kernel_params.arch,
+            kernel_params.subarch)
+        namespace = self.compose_template_namespace(kernel_params)
+
+        # Modify the kernel_command to inject the BOOTIF. PowerNV fails to
+        # support the IPAPPEND pxelinux flag.
+        def kernel_command(params):
+            cmd_line = compose_kernel_command_line(params)
+            if 'mac' in extra:
+                mac = extra['mac']
+                mac = format_bootif(mac)
+                return '%s BOOTIF=%s' % (cmd_line, mac)
+            return cmd_line
+
+        namespace['kernel_command'] = kernel_command
+        return BytesReader(template.substitute(namespace).encode("utf-8"))
+
+    def install_bootloader(self, destination):
+        """Does nothing. No extra boot files are required. All of the boot
+        files from PXEBootMethod will suffice."""

=== added file 'src/provisioningserver/boot/tests/test_powernv.py'
--- src/provisioningserver/boot/tests/test_powernv.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/boot/tests/test_powernv.py	2014-08-29 19:22:35 +0000
@@ -0,0 +1,337 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for `provisioningserver.boot.powernv`."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+import os
+import re
+
+from maastesting.factory import factory
+from maastesting.testcase import MAASTestCase
+from provisioningserver.boot import BytesReader
+from provisioningserver.boot.powernv import (
+    ARP_HTYPE,
+    format_bootif,
+    PowerNVBootMethod,
+    re_config_file,
+    )
+from provisioningserver.boot.tests.test_pxe import parse_pxe_config
+from provisioningserver.boot.tftppath import compose_image_path
+from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
+from provisioningserver.tftp import TFTPBackend
+from testtools.matchers import (
+    IsInstance,
+    MatchesAll,
+    MatchesRegex,
+    Not,
+    StartsWith,
+    )
+
+
+def compose_config_path(mac):
+    """Compose the TFTP path for a PowerNV PXE configuration file.
+
+    The path returned is relative to the TFTP root, as it would be
+    identified by clients on the network.
+
+    :param mac: A MAC address, in IEEE 802 hyphen-separated form,
+        corresponding to the machine for which this configuration is
+        relevant. This relates to PXELINUX's lookup protocol.
+    :return: Path for the corresponding PXE config file as exposed over
+        TFTP.
+    """
+    # Not using os.path.join: this is a TFTP path, not a native path. Yes, in
+    # practice for us they're the same. We always assume that the ARP HTYPE
+    # (hardware type) that PXELINUX sends is Ethernet.
+    return "ppc64el/pxelinux.cfg/{htype:02x}-{mac}".format(
+        htype=ARP_HTYPE.ETHERNET, mac=mac)
+
+
+def get_example_path_and_components():
+    """Return a plausible path and its components.
+
+    The path is intended to match `re_config_file`, and the components are
+    the expected groups from a match.
+    """
+    components = {"mac": factory.getRandomMACAddress("-")}
+    config_path = compose_config_path(components["mac"])
+    return config_path, components
+
+
+class TestPowerNVBootMethod(MAASTestCase):
+
+    def make_tftp_root(self):
+        """Set, and return, a temporary TFTP root directory."""
+        tftproot = self.make_dir()
+        self.useFixture(set_tftp_root(tftproot))
+        return tftproot
+
+    def test_compose_config_path_follows_maas_pxe_directory_layout(self):
+        name = factory.make_name('config')
+        self.assertEqual(
+            'ppc64el/pxelinux.cfg/%02x-%s' % (ARP_HTYPE.ETHERNET, name),
+            compose_config_path(name))
+
+    def test_compose_config_path_does_not_include_tftp_root(self):
+        tftproot = self.make_tftp_root()
+        name = factory.make_name('config')
+        self.assertThat(
+            compose_config_path(name),
+            Not(StartsWith(tftproot)))
+
+    def test_bootloader_path(self):
+        method = PowerNVBootMethod()
+        self.assertEqual('pxelinux.0', method.bootloader_path)
+
+    def test_bootloader_path_does_not_include_tftp_root(self):
+        tftproot = self.make_tftp_root()
+        method = PowerNVBootMethod()
+        self.assertThat(
+            method.bootloader_path,
+            Not(StartsWith(tftproot)))
+
+    def test_name(self):
+        method = PowerNVBootMethod()
+        self.assertEqual('powernv', method.name)
+
+    def test_template_subdir(self):
+        method = PowerNVBootMethod()
+        self.assertEqual('pxe', method.template_subdir)
+
+    def test_arch_octet(self):
+        method = PowerNVBootMethod()
+        self.assertEqual('00:0E', method.arch_octet)
+
+    def test_path_prefix(self):
+        method = PowerNVBootMethod()
+        self.assertEqual('ppc64el/', method.path_prefix)
+
+
+class TestPowerNVBootMethodMatchPath(MAASTestCase):
+    """Tests for
+    `provisioningserver.boot.powernv.PowerNVBootMethod.match_path`.
+    """
+
+    def test_match_path_pxe_config_with_mac(self):
+        method = PowerNVBootMethod()
+        config_path, expected = get_example_path_and_components()
+        params = method.match_path(None, config_path)
+        expected['arch'] = 'ppc64el'
+        self.assertEqual(expected, params)
+
+    def test_match_path_pxe_config_without_mac(self):
+        method = PowerNVBootMethod()
+        fake_mac = factory.getRandomMACAddress()
+        self.patch(method, 'get_remote_mac').return_value = fake_mac
+        config_path = 'ppc64el/pxelinux.cfg/default'
+        params = method.match_path(None, config_path)
+        expected = {
+            'arch': 'ppc64el',
+            'mac': fake_mac,
+            }
+        self.assertEqual(expected, params)
+
+    def test_match_path_pxe_prefix_request(self):
+        method = PowerNVBootMethod()
+        fake_mac = factory.getRandomMACAddress()
+        self.patch(method, 'get_remote_mac').return_value = fake_mac
+        file_path = 'ppc64el/file'
+        params = method.match_path(None, file_path)
+        expected = {
+            'arch': 'ppc64el',
+            'mac': fake_mac,
+            'path': file_path,
+            }
+        self.assertEqual(expected, params)
+
+
+class TestPowerNVBootMethodRenderConfig(MAASTestCase):
+    """Tests for
+    `provisioningserver.boot.powernv.PowerNVBootMethod.get_reader`
+    """
+
+    def test_get_reader_install(self):
+        # Given the right configuration options, the PXE configuration is
+        # correctly rendered.
+        method = PowerNVBootMethod()
+        params = make_kernel_parameters(self, purpose="install")
+        output = method.get_reader(backend=None, kernel_params=params)
+        # The output is a BytesReader.
+        self.assertThat(output, IsInstance(BytesReader))
+        output = output.read(10000)
+        # The template has rendered without error. PXELINUX configurations
+        # typically start with a DEFAULT line.
+        self.assertThat(output, StartsWith("DEFAULT "))
+        # The PXE parameters are all set according to the options.
+        image_dir = compose_image_path(
+            arch=params.arch, subarch=params.subarch,
+            release=params.release, label=params.label)
+        self.assertThat(
+            output, MatchesAll(
+                MatchesRegex(
+                    r'.*^\s+KERNEL %s/di-kernel$' % re.escape(image_dir),
+                    re.MULTILINE | re.DOTALL),
+                MatchesRegex(
+                    r'.*^\s+INITRD %s/di-initrd$' % re.escape(image_dir),
+                    re.MULTILINE | re.DOTALL),
+                MatchesRegex(
+                    r'.*^\s+APPEND .+?$',
+                    re.MULTILINE | re.DOTALL)))
+
+    def test_get_reader_with_extra_arguments_does_not_affect_output(self):
+        # get_reader() allows any keyword arguments as a safety valve.
+        method = PowerNVBootMethod()
+        options = {
+            "backend": None,
+            "kernel_params": make_kernel_parameters(self, purpose="install"),
+        }
+        # Capture the output before sprinking in some random options.
+        output_before = method.get_reader(**options).read(10000)
+        # Sprinkle some magic in.
+        options.update(
+            (factory.make_name("name"), factory.make_name("value"))
+            for _ in range(10))
+        # Capture the output after sprinking in some random options.
+        output_after = method.get_reader(**options).read(10000)
+        # The generated template is the same.
+        self.assertEqual(output_before, output_after)
+
+    def test_get_reader_with_local_purpose(self):
+        # If purpose is "local", output should be empty string.
+        method = PowerNVBootMethod()
+        options = {
+            "backend": None,
+            "kernel_params": make_kernel_parameters(purpose="local"),
+            }
+        output = method.get_reader(**options).read(10000)
+        self.assertIn("", output)
+
+    def test_get_reader_appends_bootif(self):
+        method = PowerNVBootMethod()
+        fake_mac = factory.getRandomMACAddress()
+        params = make_kernel_parameters(self, purpose="install")
+        output = method.get_reader(
+            backend=None, kernel_params=params, arch='ppc64el', mac=fake_mac)
+        output = output.read(10000)
+        config = parse_pxe_config(output)
+        expected = 'BOOTIF=%s' % format_bootif(fake_mac)
+        self.assertIn(expected, config['execute']['APPEND'])
+
+
+class TestPowerNVBootMethodPathPrefix(MAASTestCase):
+    """Tests for
+    `provisioningserver.boot.powernv.PowerNVBootMethod.get_reader`.
+    """
+
+    def test_get_reader_path_prefix(self):
+        data = factory.getRandomString().encode("ascii")
+        temp_file = self.make_file(name="example", contents=data)
+        temp_dir = os.path.dirname(temp_file)
+        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        method = PowerNVBootMethod()
+        options = {
+            'backend': backend,
+            'kernel_params': make_kernel_parameters(),
+            'path': 'ppc64el/example',
+        }
+        reader = method.get_reader(**options)
+        self.addCleanup(reader.finish)
+        self.assertEqual(len(data), reader.size)
+        self.assertEqual(data, reader.read(len(data)))
+        self.assertEqual(b"", reader.read(1))
+
+    def test_get_reader_path_prefix_only_removes_first_occurrence(self):
+        data = factory.getRandomString().encode("ascii")
+        temp_dir = self.make_dir()
+        temp_subdir = os.path.join(temp_dir, 'ppc64el')
+        os.mkdir(temp_subdir)
+        factory.make_file(temp_subdir, "example", data)
+        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        method = PowerNVBootMethod()
+        options = {
+            'backend': backend,
+            'kernel_params': make_kernel_parameters(),
+            'path': 'ppc64el/ppc64el/example',
+        }
+        reader = method.get_reader(**options)
+        self.addCleanup(reader.finish)
+        self.assertEqual(len(data), reader.size)
+        self.assertEqual(data, reader.read(len(data)))
+        self.assertEqual(b"", reader.read(1))
+
+
+class TestPowerNVBootMethodRegex(MAASTestCase):
+    """Tests for
+    `provisioningserver.boot.powernv.PowerNVBootMethod.re_config_file`.
+    """
+
+    def test_re_config_file_is_compatible_with_config_path_generator(self):
+        # The regular expression for extracting components of the file path is
+        # compatible with the PXE config path generator.
+        for iteration in range(10):
+            config_path, args = get_example_path_and_components()
+            match = re_config_file.match(config_path)
+            self.assertIsNotNone(match, config_path)
+            self.assertEqual(args, match.groupdict())
+
+    def test_re_config_file_with_leading_slash(self):
+        # The regular expression for extracting components of the file path
+        # doesn't care if there's a leading forward slash; the TFTP server is
+        # easy on this point, so it makes sense to be also.
+        config_path, args = get_example_path_and_components()
+        # Ensure there's a leading slash.
+        config_path = "/" + config_path.lstrip("/")
+        match = re_config_file.match(config_path)
+        self.assertIsNotNone(match, config_path)
+        self.assertEqual(args, match.groupdict())
+
+    def test_re_config_file_without_leading_slash(self):
+        # The regular expression for extracting components of the file path
+        # doesn't care if there's no leading forward slash; the TFTP server is
+        # easy on this point, so it makes sense to be also.
+        config_path, args = get_example_path_and_components()
+        # Ensure there's no leading slash.
+        config_path = config_path.lstrip("/")
+        match = re_config_file.match(config_path)
+        self.assertIsNotNone(match, config_path)
+        self.assertEqual(args, match.groupdict())
+
+    def test_re_config_file_matches_classic_pxelinux_cfg(self):
+        # The default config path is simply "pxelinux.cfg" (without
+        # leading slash).  The regex matches this.
+        mac = 'aa-bb-cc-dd-ee-ff'
+        match = re_config_file.match('ppc64el/pxelinux.cfg/01-%s' % mac)
+        self.assertIsNotNone(match)
+        self.assertEqual({'mac': mac}, match.groupdict())
+
+    def test_re_config_file_matches_pxelinux_cfg_with_leading_slash(self):
+        mac = 'aa-bb-cc-dd-ee-ff'
+        match = re_config_file.match('/ppc64el/pxelinux.cfg/01-%s' % mac)
+        self.assertIsNotNone(match)
+        self.assertEqual({'mac': mac}, match.groupdict())
+
+    def test_re_config_file_does_not_match_non_config_file(self):
+        self.assertIsNone(re_config_file.match('ppc64el/pxelinux.cfg/kernel'))
+
+    def test_re_config_file_does_not_match_file_in_root(self):
+        self.assertIsNone(re_config_file.match('01-aa-bb-cc-dd-ee-ff'))
+
+    def test_re_config_file_does_not_match_file_not_in_pxelinux_cfg(self):
+        self.assertIsNone(re_config_file.match('foo/01-aa-bb-cc-dd-ee-ff'))
+
+    def test_re_config_file_with_default(self):
+        match = re_config_file.match('ppc64el/pxelinux.cfg/default')
+        self.assertIsNotNone(match)
+        self.assertEqual({'mac': None}, match.groupdict())

=== modified file 'src/provisioningserver/dhcp/config.py'
--- src/provisioningserver/dhcp/config.py	2014-04-03 13:45:02 +0000
+++ src/provisioningserver/dhcp/config.py	2014-08-29 19:22:35 +0000
@@ -33,16 +33,22 @@
 
 # Used to generate the conditional bootloader behaviour
 CONDITIONAL_BOOTLOADER = """
-{behaviour} option arch = {arch_octet} {{
-          filename \"{bootloader}\";
-       }}
+{{behaviour}} option arch = {{arch_octet}} {
+          filename \"{{bootloader}}\";
+          {{if path_prefix}}
+          option path-prefix \"{{path_prefix}}\";
+          {{endif}}
+       }
 """
 
 # Used to generate the PXEBootLoader special case
 PXE_BOOTLOADER = """
-else {{
-          filename \"{bootloader}\";
-       }}
+else {
+          filename \"{{bootloader}}\";
+          {{if path_prefix}}
+          option path-prefix \"{{path_prefix}}\";
+          {{endif}}
+       }
 """
 
 
@@ -55,9 +61,13 @@
     behaviour = chain(["if"], repeat("elsif"))
     for name, method in BootMethodRegistry:
         if name != "pxe":
-            output += CONDITIONAL_BOOTLOADER.format(
-                behaviour=next(behaviour), arch_octet=method.arch_octet,
-                bootloader=method.bootloader_path).strip() + ' '
+            output += tempita.sub(
+                CONDITIONAL_BOOTLOADER,
+                behaviour=next(behaviour),
+                arch_octet=method.arch_octet,
+                bootloader=method.bootloader_path,
+                path_prefix=method.path_prefix,
+                ).strip() + ' '
 
     # The PXEBootMethod is used in an else statement for the generated
     # dhcpd config. This ensures that a booting node that does not
@@ -65,8 +75,11 @@
     # pxelinux can still boot.
     pxe_method = BootMethodRegistry.get_item('pxe')
     if pxe_method is not None:
-        output += PXE_BOOTLOADER.format(
-            bootloader=pxe_method.bootloader_path).strip()
+        output += tempita.sub(
+            PXE_BOOTLOADER,
+            bootloader=pxe_method.bootloader_path,
+            path_prefix=pxe_method.path_prefix,
+            ).strip()
     return output.strip()
 
 

=== modified file 'src/provisioningserver/driver/__init__.py'
--- src/provisioningserver/driver/__init__.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/driver/__init__.py	2014-08-29 19:22:35 +0000
@@ -134,12 +134,25 @@
     Architecture(name="i386/generic", description="i386"),
     Architecture(name="amd64/generic", description="amd64"),
     Architecture(
+        name="arm64/generic", description="arm64/generic",
+        pxealiases=["arm"]),
+    Architecture(
+        name="arm64/xgene-uboot", description="arm64/xgene-uboot",
+        pxealiases=["arm"]),
+    Architecture(
         name="armhf/highbank", description="armhf/highbank",
         pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
     Architecture(
         name="armhf/generic", description="armhf/generic",
         pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
-    Architecture(name="ppc64el/generic", description="ppc64el"),
+    # PPC64EL needs a rootdelay for PowerNV. The disk controller
+    # in the hardware, takes a little bit longer to come up then
+    # the initrd wants to wait. Set this to 60 seconds, just to
+    # give the booting machine enough time. This doesn't slow down
+    # the booting process, it just increases the timeout.
+    Architecture(
+        name="ppc64el/generic", description="ppc64el",
+        kernel_options=['rootdelay=60']),
 ]
 for arch in builtin_architectures:
     ArchitectureRegistry.register_item(arch.name, arch)

=== added directory 'src/provisioningserver/drivers'
=== added file 'src/provisioningserver/drivers/__init__.py'
=== added directory 'src/provisioningserver/drivers/hardware'
=== added file 'src/provisioningserver/drivers/hardware/__init__.py'
=== added file 'src/provisioningserver/drivers/hardware/mscm.py'
--- src/provisioningserver/drivers/hardware/mscm.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/drivers/hardware/mscm.py	2014-08-29 19:22:35 +0000
@@ -0,0 +1,187 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Support for managing nodes via the Moonshot HP iLO Chassis Manager CLI.
+
+This module provides support for interacting with HP Moonshot iLO Chassis
+Management (MSCM) CLI via SSH, and for using that support to allow MAAS to
+manage systems via iLO.
+"""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+str = None
+
+__metaclass__ = type
+__all__ = [
+    'power_control_mscm',
+    'probe_and_enlist_mscm',
+]
+
+import re
+
+from paramiko import (
+    AutoAddPolicy,
+    SSHClient,
+    )
+import provisioningserver.custom_hardware.utils as utils
+
+
+cartridge_mapping = {
+    'ProLiant Moonshot Cartridge': 'amd64/generic',
+    'ProLiant m300 Server Cartridge': 'amd64/generic',
+    'ProLiant m350 Server Cartridge': 'amd64/generic',
+    'ProLiant m400 Server Cartridge': 'arm64/xgene-uboot',
+    'ProLiant m500 Server Cartridge': 'amd64/generic',
+    'ProLiant m710 Server Cartridge': 'amd64/generic',
+    'ProLiant m800 Server Cartridge': 'armhf/keystone',
+    'Default': 'arm64/generic',
+}
+
+
+class MSCM_CLI_API(object):
+    """An API for interacting with the Moonshot iLO CM CLI."""
+
+    def __init__(self, host, username, password):
+        """MSCM_CLI_API Constructor."""
+        self.host = host
+        self.username = username
+        self.password = password
+        self._ssh = SSHClient()
+        self._ssh.set_missing_host_key_policy(AutoAddPolicy())
+
+    def _run_cli_command(self, command):
+        """Run a single command and return unparsed text from stdout."""
+        self._ssh.connect(
+            self.host, username=self.username, password=self.password)
+        try:
+            _, stdout, _ = self._ssh.exec_command(command)
+            output = stdout.read()
+        finally:
+            self._ssh.close()
+
+        return output
+
+    def discover_nodes(self):
+        """Discover all available nodes.
+
+        Example of stdout from running "show node list":
+
+        'show node list\r\r\nSlot ID    Proc Manufacturer
+        Architecture         Memory Power Health\r\n----
+        ----- ---------------------- --------------------
+        ------ ----- ------\r\n 01  c1n1  Intel Corporation
+        x86 Architecture     32 GB  On    OK \r\n 02  c2n1
+        N/A                    No Asset Information \r\n\r\n'
+
+        The regex 'c\d+n\d' is finding the node_id's c1-45n1-8
+        """
+        node_list = self._run_cli_command("show node list")
+        return re.findall(r'c\d+n\d', node_list)
+
+    def get_node_macaddr(self, node_id):
+        """Get node MAC address(es).
+
+        Example of stdout from running "show node macaddr <node_id>":
+
+        'show node macaddr c1n1\r\r\nSlot ID    NIC 1 (Switch A)
+        NIC 2 (Switch B)  NIC 3 (Switch A)  NIC 4 (Switch B)\r\n
+        ---- ----- ----------------- ----------------- -----------------
+        -----------------\r\n  1  c1n1  a0:1d:48:b5:04:34 a0:1d:48:b5:04:35
+        a0:1d:48:b5:04:36 a0:1d:48:b5:04:37\r\n\r\n\r\n'
+
+        The regex '[\:]'.join(['[0-9A-F]{1,2}'] * 6) is finding
+        the MAC Addresses for the given node_id.
+        """
+        macs = self._run_cli_command("show node macaddr %s" % node_id)
+        return re.findall(r':'.join(['[0-9a-f]{2}'] * 6), macs)
+
+    def get_node_arch(self, node_id):
+        """Get node architecture.
+
+        Example of stdout from running "show node info <node_id>":
+
+        'show node info c1n1\r\r\n\r\nCartridge #1 \r\n  Type: Compute\r\n
+        Manufacturer: HP\r\n  Product Name: ProLiant m500 Server Cartridge\r\n'
+
+        Parsing this retrieves 'ProLiant m500 Server Cartridge'
+        """
+        node_detail = self._run_cli_command("show node info %s" % node_id)
+        cartridge = node_detail.split('Product Name: ')[1].splitlines()[0]
+        if cartridge in cartridge_mapping:
+            return cartridge_mapping[cartridge]
+        else:
+            return cartridge_mapping['Default']
+
+    def get_node_power_status(self, node_id):
+        """Get power state of node (on/off).
+
+        Example of stdout from running "show node power <node_id>":
+
+        'show node power c1n1\r\r\n\r\nCartridge #1\r\n  Node #1\r\n
+        Power State: On\r\n'
+
+        Parsing this retrieves 'On'
+        """
+        power_state = self._run_cli_command("show node power %s" % node_id)
+        return power_state.split('Power State: ')[1].splitlines()[0]
+
+    def power_node_on(self, node_id):
+        """Power node on."""
+        return self._run_cli_command("set node power on %s" % node_id)
+
+    def power_node_off(self, node_id):
+        """Power node off."""
+        return self._run_cli_command("set node power off force %s" % node_id)
+
+    def configure_node_boot_m2(self, node_id):
+        """Configure HDD boot for node."""
+        return self._run_cli_command("set node boot M.2 %s" % node_id)
+
+    def configure_node_bootonce_pxe(self, node_id):
+        """Configure PXE boot for node once."""
+        return self._run_cli_command("set node bootonce pxe %s" % node_id)
+
+
+def power_control_mscm(host, username, password, node_id, power_change):
+    """Handle calls from the power template for nodes with a power type
+    of 'mscm'.
+    """
+    mscm = MSCM_CLI_API(host, username, password)
+    power_status = mscm.get_node_power_status(node_id)
+
+    if power_change == 'off':
+        mscm.power_node_off(node_id)
+        return
+
+    if power_change != 'on':
+        raise AssertionError('Unexpected maas power mode.')
+
+    if power_status == 'On':
+        mscm.power_node_off(node_id)
+
+    mscm.configure_node_bootonce_pxe(node_id)
+    mscm.power_node_on(node_id)
+
+
+def probe_and_enlist_mscm(host, username, password):
+    """ Extracts all of nodes from mscm, sets all of them to boot via HDD by,
+    default, sets them to bootonce via PXE, and then enlists them into MAAS.
+    """
+    mscm = MSCM_CLI_API(host, username, password)
+    nodes = mscm.discover_nodes()
+    for node_id in nodes:
+        # Set default boot to HDD
+        mscm.configure_node_boot_m2(node_id)
+        params = {
+            'power_address': host,
+            'power_user': username,
+            'power_pass': password,
+            'node_id': node_id,
+        }
+        arch = mscm.get_node_arch(node_id)
+        macs = mscm.get_node_macaddr(node_id)
+        utils.create_node(macs, arch, 'mscm', params)

=== added directory 'src/provisioningserver/drivers/hardware/tests'
=== added file 'src/provisioningserver/drivers/hardware/tests/test_mscm.py'
--- src/provisioningserver/drivers/hardware/tests/test_mscm.py	1970-01-01 00:00:00 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_mscm.py	2014-08-29 19:22:35 +0000
@@ -0,0 +1,259 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for ``provisioningserver.drivers.hardware.mscm``."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+from random import randint
+import re
+from StringIO import StringIO
+
+from maastesting.factory import factory
+from maastesting.matchers import MockCalledOnceWith
+from maastesting.testcase import MAASTestCase
+from mock import Mock
+from provisioningserver.drivers.hardware.mscm import (
+    cartridge_mapping,
+    MSCM_CLI_API,
+    power_control_mscm,
+    probe_and_enlist_mscm,
+    )
+import provisioningserver.custom_hardware.utils as utils
+
+
+def make_mscm_api():
+    """Make a MSCM_CLI_API object with randomized parameters."""
+    host = factory.make_hostname('mscm')
+    username = factory.make_name('user')
+    password = factory.make_name('password')
+    return MSCM_CLI_API(host, username, password)
+
+
+def make_node_id():
+    """Make a node_id."""
+    return 'c%sn%s' % (randint(1, 45), randint(1, 8))
+
+
+def make_show_node_list(length=10):
+    """Make a fake return value for discover_nodes."""
+    return re.findall(r'c\d+n\d', ''.join(make_node_id()
+                                          for _ in xrange(length)))
+
+
+def make_show_node_macaddr(length=10):
+    """Make a fake return value for get_node_macaddr."""
+    return ''.join((factory.getRandomMACAddress() + ' ')
+                   for _ in xrange(length))
+
+
+class TestRunCliCommand(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.run_cli_command``."""
+
+    def test_returns_output(self):
+        api = make_mscm_api()
+        ssh_mock = self.patch(api, '_ssh')
+        expected = factory.make_name('output')
+        stdout = StringIO(expected)
+        streams = factory.make_streams(stdout=stdout)
+        ssh_mock.exec_command = Mock(return_value=streams)
+        output = api._run_cli_command(factory.make_name('command'))
+        self.assertEqual(expected, output)
+
+    def test_connects_and_closes_ssh_client(self):
+        api = make_mscm_api()
+        ssh_mock = self.patch(api, '_ssh')
+        ssh_mock.exec_command = Mock(return_value=factory.make_streams())
+        api._run_cli_command(factory.make_name('command'))
+        self.assertThat(
+            ssh_mock.connect,
+            MockCalledOnceWith(
+                api.host, username=api.username, password=api.password))
+        self.assertThat(ssh_mock.close, MockCalledOnceWith())
+
+    def test_closes_when_exception_raised(self):
+        api = make_mscm_api()
+        ssh_mock = self.patch(api, '_ssh')
+
+        def fail():
+            raise Exception('fail')
+
+        ssh_mock.exec_command = Mock(side_effect=fail)
+        command = factory.make_name('command')
+        self.assertRaises(Exception, api._run_cli_command, command)
+        self.assertThat(ssh_mock.close, MockCalledOnceWith())
+
+
+class TestDiscoverNodes(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.discover_nodes``."""
+
+    def test_discover_nodes(self):
+        api = make_mscm_api()
+        ssh_mock = self.patch(api, '_ssh')
+        expected = make_show_node_list()
+        stdout = StringIO(expected)
+        streams = factory.make_streams(stdout=stdout)
+        ssh_mock.exec_command = Mock(return_value=streams)
+        output = api.discover_nodes()
+        self.assertEqual(expected, output)
+
+
+class TestNodeMACAddress(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.get_node_macaddr``."""
+
+    def test_get_node_macaddr(self):
+        api = make_mscm_api()
+        expected = make_show_node_macaddr()
+        cli_mock = self.patch(api, '_run_cli_command')
+        cli_mock.return_value = expected
+        node_id = make_node_id()
+        output = api.get_node_macaddr(node_id)
+        self.assertEqual(re.findall(r':'.join(['[0-9a-f]{2}'] * 6),
+                                    expected), output)
+
+
+class TestNodeArch(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.get_node_arch``."""
+
+    def test_get_node_arch(self):
+        api = make_mscm_api()
+        expected = '\r\n    Product Name: ProLiant Moonshot Cartridge\r\n'
+        cli_mock = self.patch(api, '_run_cli_command')
+        cli_mock.return_value = expected
+        node_id = make_node_id()
+        output = api.get_node_arch(node_id)
+        key = expected.split('Product Name: ')[1].splitlines()[0]
+        self.assertEqual(cartridge_mapping[key], output)
+
+
+class TestGetNodePowerStatus(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.get_node_power_status``."""
+
+    def test_get_node_power_status(self):
+        api = make_mscm_api()
+        expected = '\r\n  Node #1\r\n    Power State: On\r\n'
+        cli_mock = self.patch(api, '_run_cli_command')
+        cli_mock.return_value = expected
+        node_id = make_node_id()
+        output = api.get_node_power_status(node_id)
+        self.assertEqual(expected.split('Power State: ')[1].splitlines()[0],
+                         output)
+
+
+class TestPowerAndConfigureNode(MAASTestCase):
+    """Tests for ``MSCM_CLI_API.configure_node_bootonce_pxe,
+    MSCM_CLI_API.power_node_on, and MSCM_CLI_API.power_node_off``.
+    """
+
+    scenarios = [
+        ('power_node_on()',
+            dict(method='power_node_on')),
+        ('power_node_off()',
+            dict(method='power_node_off')),
+        ('configure_node_bootonce_pxe()',
+            dict(method='configure_node_bootonce_pxe')),
+    ]
+
+    def test_returns_expected_outout(self):
+        api = make_mscm_api()
+        ssh_mock = self.patch(api, '_ssh')
+        expected = factory.make_name('output')
+        stdout = StringIO(expected)
+        streams = factory.make_streams(stdout=stdout)
+        ssh_mock.exec_command = Mock(return_value=streams)
+        output = getattr(api, self.method)(make_node_id())
+        self.assertEqual(expected, output)
+
+
+class TestPowerControlMSCM(MAASTestCase):
+    """Tests for ``power_control_ucsm``."""
+
+    def test_power_control_mscm_on_on(self):
+        # power_change and power_status are both 'on'
+        host = factory.make_hostname('mscm')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        node_id = make_node_id()
+        bootonce_mock = self.patch(MSCM_CLI_API, 'configure_node_bootonce_pxe')
+        power_status_mock = self.patch(MSCM_CLI_API, 'get_node_power_status')
+        power_status_mock.return_value = 'On'
+        power_node_on_mock = self.patch(MSCM_CLI_API, 'power_node_on')
+        power_node_off_mock = self.patch(MSCM_CLI_API, 'power_node_off')
+
+        power_control_mscm(host, username, password, node_id,
+                           power_change='on')
+        self.assertThat(bootonce_mock, MockCalledOnceWith(node_id))
+        self.assertThat(power_node_off_mock, MockCalledOnceWith(node_id))
+        self.assertThat(power_node_on_mock, MockCalledOnceWith(node_id))
+
+    def test_power_control_mscm_on_off(self):
+        # power_change is 'on' and power_status is 'off'
+        host = factory.make_hostname('mscm')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        node_id = make_node_id()
+        bootonce_mock = self.patch(MSCM_CLI_API, 'configure_node_bootonce_pxe')
+        power_status_mock = self.patch(MSCM_CLI_API, 'get_node_power_status')
+        power_status_mock.return_value = 'Off'
+        power_node_on_mock = self.patch(MSCM_CLI_API, 'power_node_on')
+
+        power_control_mscm(host, username, password, node_id,
+                           power_change='on')
+        self.assertThat(bootonce_mock, MockCalledOnceWith(node_id))
+        self.assertThat(power_node_on_mock, MockCalledOnceWith(node_id))
+
+    def test_power_control_mscm_off_on(self):
+        # power_change is 'off' and power_status is 'on'
+        host = factory.make_hostname('mscm')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        node_id = make_node_id()
+        power_status_mock = self.patch(MSCM_CLI_API, 'get_node_power_status')
+        power_status_mock.return_value = 'On'
+        power_node_off_mock = self.patch(MSCM_CLI_API, 'power_node_off')
+
+        power_control_mscm(host, username, password, node_id,
+                           power_change='off')
+        self.assertThat(power_node_off_mock, MockCalledOnceWith(node_id))
+
+
+class TestProbeAndEnlistMSCM(MAASTestCase):
+    """Tests for ``probe_and_enlist_mscm``."""
+
+    def test_probe_and_enlist(self):
+        host = factory.make_hostname('mscm')
+        username = factory.make_name('user')
+        password = factory.make_name('password')
+        node_id = make_node_id()
+        macs = make_show_node_macaddr(4)
+        arch = 'arm64/xgene-uboot'
+        discover_nodes_mock = self.patch(MSCM_CLI_API, 'discover_nodes')
+        discover_nodes_mock.return_value = [node_id]
+        boot_m2_mock = self.patch(MSCM_CLI_API, 'configure_node_boot_m2')
+        node_arch_mock = self.patch(MSCM_CLI_API, 'get_node_arch')
+        node_arch_mock.return_value = arch
+        node_macs_mock = self.patch(MSCM_CLI_API, 'get_node_macaddr')
+        node_macs_mock.return_value = macs
+        create_node_mock = self.patch(utils, 'create_node')
+        probe_and_enlist_mscm(host, username, password)
+        self.assertThat(discover_nodes_mock, MockCalledOnceWith())
+        self.assertThat(boot_m2_mock, MockCalledOnceWith(node_id))
+        self.assertThat(node_arch_mock, MockCalledOnceWith(node_id))
+        self.assertThat(node_macs_mock, MockCalledOnceWith(node_id))
+        params = {
+            'power_address': host,
+            'power_user': username,
+            'power_pass': password,
+            'node_id': node_id,
+        }
+        self.assertThat(create_node_mock,
+                        MockCalledOnceWith(macs, arch, 'mscm', params))

=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
--- src/provisioningserver/power/tests/test_poweraction.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/power/tests/test_poweraction.py	2014-08-29 19:22:35 +0000
@@ -220,3 +220,14 @@
             power_user='bar', power_pass='baz',
             uuid=factory.getRandomUUID(), power_change='on')
         self.assertIn('power_control_ucsm', script)
+
+    def test_mscm_renders_template(self):
+        # I'd like to assert that escape_py_literal is being used here,
+        # but it's not obvious how to mock things in the template
+        # rendering namespace so I passed on that.
+        action = PowerAction('mscm')
+        script = action.render_template(
+            action.get_template(), power_address='foo',
+            power_user='bar', power_pass='baz',
+            node_id='c1n1', power_change='on')
+        self.assertIn('power_control_mscm', script)

=== modified file 'src/provisioningserver/power_schema.py'
--- src/provisioningserver/power_schema.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/power_schema.py	2014-08-29 19:22:35 +0000
@@ -255,4 +255,17 @@
             make_json_field('power_pass', "API password"),
         ],
     },
+    {
+        'name': 'mscm',
+        'description': "Moonshot HP iLO Chassis Manager",
+        'fields': [
+            make_json_field('power_address', "IP for MSCM CLI API"),
+            make_json_field('power_user', "MSCM CLI API user"),
+            make_json_field('power_pass', "MSCM CLI API password"),
+            make_json_field(
+                'node_id',
+                "Node ID - Must adhere to cXnY format "
+                "(X=cartridge number, Y=node number)."),
+        ],
+    },
 ]

=== modified file 'src/provisioningserver/tasks.py'
--- src/provisioningserver/tasks.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/tasks.py	2014-08-29 19:22:35 +0000
@@ -58,6 +58,7 @@
     set_up_options_conf,
     setup_rndc,
     )
+from provisioningserver.drivers.hardware.mscm import probe_and_enlist_mscm
 from provisioningserver.omshell import Omshell
 from provisioningserver.power.poweraction import (
     PowerAction,
@@ -493,5 +494,12 @@
 @task
 @log_exception_text
 def enlist_nodes_from_ucsm(url, username, password):
-    """ See `maasserver.api.NodeGroupsHandler.enlist_nodes_from_ucsm`. """
+    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_ucsm`. """
     probe_and_enlist_ucsm(url, username, password)
+
+
+@task
+@log_exception_text
+def enlist_nodes_from_mscm(host, username, password):
+    """ See `maasserver.api.NodeGroupHandler.enlist_nodes_from_mscm`. """
+    probe_and_enlist_mscm(host, username, password)

=== modified file 'src/provisioningserver/tests/test_tasks.py'
--- src/provisioningserver/tests/test_tasks.py	2014-06-02 11:57:58 +0000
+++ src/provisioningserver/tests/test_tasks.py	2014-08-29 19:22:35 +0000
@@ -73,6 +73,7 @@
 from provisioningserver.tags import MissingCredentials
 from provisioningserver.tasks import (
     add_new_dhcp_host_map,
+    enlist_nodes_from_mscm,
     enlist_nodes_from_ucsm,
     import_boot_images,
     Omshell,
@@ -661,3 +662,14 @@
         mock = self.patch(tasks, 'probe_and_enlist_ucsm')
         enlist_nodes_from_ucsm(url, username, password)
         self.assertThat(mock, MockCalledOnceWith(url, username, password))
+
+
+class TestAddMSCM(PservTestCase):
+
+    def test_enlist_nodes_from_mscm(self):
+        host = 'host'
+        username = 'username'
+        password = 'password'
+        mock = self.patch(tasks, 'probe_and_enlist_mscm')
+        enlist_nodes_from_mscm(host, username, password)
+        self.assertThat(mock, MockCalledOnceWith(host, username, password))

=== modified file 'src/provisioningserver/utils/__init__.py'
--- src/provisioningserver/utils/__init__.py	2014-04-15 14:41:32 +0000
+++ src/provisioningserver/utils/__init__.py	2014-08-29 19:22:35 +0000
@@ -829,3 +829,24 @@
         if len(columns) == 5 and columns[2] == mac:
             return columns[0]
     return None
+
+
+def find_mac_via_arp(ip):
+    """Find the MAC address for `ip` by reading the output of arp -n.
+
+    Returns `None` if the IP is not found.
+
+    We do this because we aren't necessarily the only DHCP server on the
+    network, so we can't check our own leases file and be guaranteed to find an
+    IP that matches.
+
+    :param ip: The ip address, e.g. '192.168.1.1'.
+    """
+
+    output = call_capture_and_check(['arp', '-n']).split('\n')
+
+    for line in sorted(output):
+        columns = line.split()
+        if len(columns) == 5 and columns[0] == ip:
+            return columns[2]
+    return None

=== modified file 'src/provisioningserver/utils/tests/test_utils.py'
--- src/provisioningserver/utils/tests/test_utils.py	2014-04-15 14:41:32 +0000
+++ src/provisioningserver/utils/tests/test_utils.py	2014-08-29 19:22:35 +0000
@@ -75,6 +75,7 @@
     ExternalProcessError,
     filter_dict,
     find_ip_via_arp,
+    find_mac_via_arp,
     get_all_interface_addresses,
     get_mtime,
     incremental_write,
@@ -1322,6 +1323,50 @@
         self.assertEqual("192.168.0.1", ip_address_observed)
 
 
+class TestFindMACViaARP(MAASTestCase):
+
+    def patch_call(self, output):
+        """Replace `call_capture_and_check` with one that returns `output`."""
+        fake = self.patch(provisioningserver.utils, 'call_capture_and_check')
+        fake.return_value = output
+        return fake
+
+    def test__resolves_IP_address_to_MAC(self):
+        sample = """\
+        Address HWtype  HWaddress Flags Mask            Iface
+        192.168.100.20 (incomplete)                              virbr1
+        192.168.0.104 (incomplete)                              eth0
+        192.168.0.5 (incomplete)                              eth0
+        192.168.0.2 (incomplete)                              eth0
+        192.168.0.100 (incomplete)                              eth0
+        192.168.122.20 ether   52:54:00:02:86:4b   C                     virbr0
+        192.168.0.4 (incomplete)                              eth0
+        192.168.0.1 ether   90:f6:52:f6:17:92   C                     eth0
+        """
+
+        call_capture_and_check = self.patch_call(sample)
+        mac_address_observed = find_mac_via_arp("192.168.122.20")
+        self.assertThat(
+            call_capture_and_check,
+            MockCalledOnceWith(['arp', '-n']))
+        self.assertEqual("52:54:00:02:86:4b", mac_address_observed)
+
+    def test__returns_consistent_output(self):
+        ip = factory.getRandomIPAddress()
+        macs = [
+            '52:54:00:02:86:4b',
+            '90:f6:52:f6:17:92',
+            ]
+        lines = ['%s ether %s C eth0' % (ip, mac) for mac in macs]
+        self.patch_call('\n'.join(lines))
+        one_result = find_mac_via_arp(ip)
+        self.patch_call('\n'.join(reversed(lines)))
+        other_result = find_mac_via_arp(ip)
+
+        self.assertIn(one_result, macs)
+        self.assertEqual(one_result, other_result)
+
+
 class TestAsynchronousDecorator(MAASTestCase):
 
     run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=5)

=== modified file 'versions.cfg'
--- versions.cfg	2014-03-28 10:43:53 +0000
+++ versions.cfg	2014-08-29 19:22:35 +0000
@@ -37,7 +37,7 @@
 nose = 1.3
 nose-subunit = 0.2
 python-subunit = 0.0.7
-rabbitfixture = 0.3.4
+rabbitfixture = 0.3.5
 sst = 0.2.2
 testresources = 0.2.5
 testscenarios = 0.4