Merge lp:~ltrager/maas/clean_api into lp:~maas-committers/maas/trunk

[Lee Trager]

Clean up the API

Sorry for posting such a large review, much of this is just renames and moving some code around.

* Update the API docs to use machine consistently where only a machine node type can be used.
* Clean up duplicated tests. A number of the tests in TestNodeAPI were checking the output of a given machine. As the output code is handled by the Machine API this is already tested in TestMachineAPI.
* Limit the amount of items outputted for rack controllers, see http://paste.ubuntu.com/15265877/
* Base Device and RackController API off of Node API.
* I created an update method for node which now rack controller uses as well.
* To facilitate the new base update method I split NodeForm into NodeForm and MachineForm. NodeForm is a basic form which allows setting general options(hostname, domain, disable_ipv4, swap_size). DeviceForm and MachineForm inherit from NodeForm and expand on those options. This allows us to have a consistent set of options throughout all node types while removing duplicated code.
* The API has been updated so that all node types output only the hostname in the hostname field. The domain and fqdn fields have been added to the output as well.
* Domains can now be specified when creating devices, nodes, or adding chassis. The domain field can be changed with any end points update method.

[Blake Rouse (blake-rouse)]

This branch is so large I am not going to even look through it. I did look for specifics that I know needed to be fixed. I commented inline about "status" showing on rack controller, I don't think this should be the case. It will even be removed from the WebUI as well, so lets please remove status.

Also as discussed in the hangout remove "update" on node and on rack controllers. We can add those later if really needed and once that has been fully nailed down and supported.

You need to work on making the branches smaller, because this is impossible to review. You could have split this up into different pieces to make it easier on the reviewer. I am being nice today because we need this for alpha1, but if it was not for that I would probably give this a "Disapprove."

Here is a breakdown on how this could have been a few branches:

1. Update license headers.
2. Rename node to machine.
3. Fix fields shown for rack controllers.
4. Other extra fixes (if needed).

Another thing you need to work on is the commit message. The commit message is what shows up in the bzr log. The description is just for the review to read to know what you have done (only if the commit message can not tell them). So update your commit message as well to include a better idea of what this branch did to MAAS when it was merged.

Marking "approved" since this is needed for alpha1 and since we discussed it during the standup. Please, please, please next time split the work out to make it smaller. It really doesn't make it hard on you, if anything it helps you get eyes on the code sooner as you can go work on the next piece of work.

review: Approve

[Andres Rodriguez (andreserl)]

review: Needs Information

[Lee Trager (ltrager)]

I apologize for such a huge branch, I kept adding just one more thing to get into alpha 1 which caused this to blow up. I'll make my branches smaller in the future.

I answered this inline but the reason the Device API has a number of methods removed is because its now based on the NodesHandler class. This brings consistency to the specifiers we can pass to our read methods and removed a bunch of duplicated code.

[Andres Rodriguez (andreserl)]

go for it!

review: Approve

=== modified file 'src/maasserver/api/account.py'
--- src/maasserver/api/account.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/account.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handler: `Account`."""

=== modified file 'src/maasserver/api/auth.py'
--- src/maasserver/api/auth.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/auth.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """OAuth authentication for the various APIs."""

=== modified file 'src/maasserver/api/bcache.py'
--- src/maasserver/api/bcache.py	2015-12-16 00:01:56 +0000
+++ src/maasserver/api/bcache.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Bcache`."""
@@ -38,7 +38,7 @@
 
 
 class BcachesHandler(OperationsHandler):
-    """Manage bcache devices on a node."""
+    """Manage bcache devices on a machine."""
     api_doc_section_name = "Bcache Devices"
     update = delete = None
     fields = DISPLAYED_BCACHE_FIELDS
@@ -49,7 +49,7 @@
         return ('bcache_devices_handler', ["system_id"])
 
     def read(self, request, system_id):
-        """List all bcache devices belonging to node.
+        """List all bcache devices belonging to a machine.
 
         Returns 404 if the machine is not found.
         """
@@ -77,7 +77,7 @@
             system_id, request.user, NODE_PERMISSION.ADMIN)
         if machine.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot create Bcache because node is not Ready.")
+                "Cannot create Bcache because the machine is not Ready.")
         form = CreateBcacheForm(machine, data=request.data)
         if form.is_valid():
             return form.save()
@@ -86,7 +86,7 @@
 
 
 class BcacheHandler(OperationsHandler):
-    """Manage bcache device on a node."""
+    """Manage bcache device on a machine."""
     api_doc_section_name = "Bcache Device"
     create = None
     model = Bcache
@@ -123,30 +123,30 @@
         return bcache.get_bcache_backing_filesystem().get_parent()
 
     def read(self, request, system_id, bcache_id):
-        """Read bcache device on node.
+        """Read bcache device on a machine.
 
-        Returns 404 if the node or bcache is not found.
+        Returns 404 if the machine or bcache is not found.
         """
         return Bcache.objects.get_object_or_404(
             system_id, bcache_id, request.user, NODE_PERMISSION.VIEW)
 
     def delete(self, request, system_id, bcache_id):
-        """Delete bcache on node.
+        """Delete bcache on a machine.
 
-        Returns 404 if the node or bcache is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or bcache is not found.
+        Returns 409 if the machine is not Ready.
         """
         bcache = Bcache.objects.get_object_or_404(
             system_id, bcache_id, request.user, NODE_PERMISSION.ADMIN)
         node = bcache.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete Bcache because the node is not Ready.")
+                "Cannot delete Bcache because the machine is not Ready.")
         bcache.delete()
         return rc.DELETED
 
     def update(self, request, system_id, bcache_id):
-        """Delete bcache on node.
+        """Delete bcache on a machine.
 
         :param name: Name of the Bcache.
         :param uuid: UUID of the Bcache.
@@ -158,15 +158,15 @@
         Specifying both a device and a partition for a given role (cache or
         backing) is not allowed.
 
-        Returns 404 if the node or the bcache is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or the bcache is not found.
+        Returns 409 if the machine is not Ready.
         """
         bcache = Bcache.objects.get_object_or_404(
             system_id, bcache_id, request.user, NODE_PERMISSION.ADMIN)
         node = bcache.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update Bcache because the node is not Ready.")
+                "Cannot update Bcache because the machine is not Ready.")
         form = UpdateBcacheForm(bcache, data=request.data)
         if form.is_valid():
             return form.save()

=== modified file 'src/maasserver/api/bcache_cacheset.py'
--- src/maasserver/api/bcache_cacheset.py	2015-12-16 00:01:56 +0000
+++ src/maasserver/api/bcache_cacheset.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `CacheSet`."""
@@ -32,7 +32,7 @@
 
 
 class BcacheCacheSetsHandler(OperationsHandler):
-    """Manage bcache cache sets on a node."""
+    """Manage bcache cache sets on a machine."""
     api_doc_section_name = "Bcache Cache Sets"
     update = delete = None
     fields = DISPLAYED_CACHE_SET_FIELDS
@@ -43,7 +43,7 @@
         return ('bcache_cache_sets_handler', ["system_id"])
 
     def read(self, request, system_id):
-        """List all bcache cache sets belonging to node.
+        """List all bcache cache sets belonging to a machine.
 
         Returns 404 if the machine is not found.
         """
@@ -75,7 +75,7 @@
 
 
 class BcacheCacheSetHandler(OperationsHandler):
-    """Manage bcache cache set on a node."""
+    """Manage bcache cache set on a machine."""
     api_doc_section_name = "Bcache Cache Set"
     create = None
     model = CacheSet
@@ -99,26 +99,26 @@
         return cache_set.get_device()
 
     def read(self, request, system_id, cache_set_id):
-        """Read bcache cache set on node.
+        """Read bcache cache set on a machine.
 
-        Returns 404 if the node or cache set is not found.
+        Returns 404 if the machine or cache set is not found.
         """
         return CacheSet.objects.get_cache_set_or_404(
             system_id, cache_set_id, request.user, NODE_PERMISSION.VIEW)
 
     def delete(self, request, system_id, cache_set_id):
-        """Delete cache set on node.
+        """Delete cache set on a machine.
 
         Returns 400 if the cache set is in use.
-        Returns 404 if the node or cache set is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or cache set is not found.
+        Returns 409 if the machine is not Ready.
         """
         cache_set = CacheSet.objects.get_cache_set_or_404(
             system_id, cache_set_id, request.user, NODE_PERMISSION.ADMIN)
         node = cache_set.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete cache set because the node is not Ready.")
+                "Cannot delete cache set because the machine is not Ready.")
         if cache_set.filesystemgroup_set.exists():
             raise MAASAPIBadRequest(
                 "Cannot delete cache set; it's currently in use.")
@@ -127,22 +127,22 @@
             return rc.DELETED
 
     def update(self, request, system_id, cache_set_id):
-        """Delete bcache on node.
+        """Delete bcache on a machine.
 
         :param cache_device: Cache block device to replace current one.
         :param cache_partition: Cache partition to replace current one.
 
         Specifying both a cache_device and a cache_partition is not allowed.
 
-        Returns 404 if the node or the cache set is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or the cache set is not found.
+        Returns 409 if the machine is not Ready.
         """
         cache_set = CacheSet.objects.get_cache_set_or_404(
             system_id, cache_set_id, request.user, NODE_PERMISSION.ADMIN)
         node = cache_set.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update cache set because the node is not Ready.")
+                "Cannot update cache set because the machine is not Ready.")
         form = UpdateCacheSetForm(cache_set, data=request.data)
         if form.is_valid():
             return form.save()

=== modified file 'src/maasserver/api/blockdevices.py'
--- src/maasserver/api/blockdevices.py	2016-03-01 16:02:44 +0000
+++ src/maasserver/api/blockdevices.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `BlockDevice`."""
@@ -61,16 +61,16 @@
         node, user, operation):
     if node.status not in [NODE_STATUS.READY, NODE_STATUS.ALLOCATED]:
         raise NodeStateViolation(
-            "Cannot %s block device because the node is not Ready "
+            "Cannot %s block device because the machine is not Ready "
             "or Allocated." % operation)
     if node.status == NODE_STATUS.READY and not user.is_superuser:
         raise PermissionDenied(
             "Cannot %s block device because you don't have the "
-            "permissions on a Ready node." % operation)
+            "permissions on a Ready machine." % operation)
 
 
 class BlockDevicesHandler(OperationsHandler):
-    """Manage block devices on a node."""
+    """Manage block devices on a machine."""
     api_doc_section_name = "Block devices"
     replace = update = delete = None
     fields = DISPLAYED_BLOCKDEVICE_FIELDS
@@ -80,7 +80,7 @@
         return ('blockdevices_handler', ["system_id"])
 
     def read(self, request, system_id):
-        """List all block devices belonging to node.
+        """List all block devices belonging to a machine.
 
         Returns 404 if the machine is not found.
         """
@@ -113,7 +113,7 @@
 
 
 class BlockDeviceHandler(OperationsHandler):
-    """Manage a block device on a node."""
+    """Manage a block device on a machine."""
     api_doc_section_name = "Block device"
     create = replace = None
     model = BlockDevice
@@ -203,29 +203,29 @@
     def read(self, request, system_id, device_id):
         """Read block device on node.
 
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         """
         return BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.VIEW)
 
     def delete(self, request, system_id, device_id):
-        """Delete block device on node.
+        """Delete block device on a machine.
 
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         Returns 403 if the user is not allowed to delete the block device.
-        Returns 409 if the node is not Ready.
+        Returns 409 if the machine is not Ready.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete block device because the node is not Ready.")
+                "Cannot delete block device because the machine is not Ready.")
         device.delete()
         return rc.DELETED
 
     def update(self, request, system_id, device_id):
-        """Update block device on node.
+        """Update block device on a machine.
 
         Fields for physical block device:
         :param name: Name of the block device.
@@ -243,16 +243,16 @@
         :param size: Size of the block device. (Only allowed for logical \
             volumes.)
 
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         Returns 403 if the user is not allowed to update the block device.
-        Returns 409 if the node is not Ready.
+        Returns 409 if the machine is not Ready.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update block device because the node is not Ready.")
+                "Cannot update block device because the machine is not Ready.")
         if device.type == 'physical':
             form = UpdatePhysicalBlockDeviceForm(
                 instance=device, data=request.data)
@@ -269,40 +269,40 @@
 
     @operation(idempotent=True)
     def add_tag(self, request, system_id, device_id):
-        """Add a tag to block device on node.
+        """Add a tag to block device on a machine.
 
         :param tag: The tag being added.
 
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         Returns 403 if the user is not allowed to update the block device.
-        Returns 409 if the node is not Ready.
+        Returns 409 if the machine is not Ready.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update block device because the node is not Ready.")
+                "Cannot update block device because the machine is not Ready.")
         device.add_tag(get_mandatory_param(request.GET, 'tag'))
         device.save()
         return device
 
     @operation(idempotent=True)
     def remove_tag(self, request, system_id, device_id):
-        """Remove a tag from block device on node.
+        """Remove a tag from block device on a machine.
 
         :param tag: The tag being removed.
 
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         Returns 403 if the user is not allowed to update the block device.
-        Returns 409 if the node is not Ready.
+        Returns 409 if the machine is not Ready.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update block device because the node is not Ready.")
+                "Cannot update block device because the machine is not Ready.")
         device.remove_tag(get_mandatory_param(request.GET, 'tag'))
         device.save()
         return device
@@ -316,8 +316,8 @@
 
         Returns 403 when the user doesn't have the ability to format the \
             block device.
-        Returns 404 if the node or block device is not found.
-        Returns 409 if the node is not Ready or Allocated.
+        Returns 404 if the machine or block device is not found.
+        Returns 409 if the machine is not Ready or Allocated.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.EDIT)
@@ -338,8 +338,8 @@
             or part of a filesystem group.
         Returns 403 when the user doesn't have the ability to unformat the \
             block device.
-        Returns 404 if the node or block device is not found.
-        Returns 409 if the node is not Ready or Allocated.
+        Returns 404 if the machine or block device is not found.
+        Returns 409 if the machine is not Ready or Allocated.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.EDIT)
@@ -371,8 +371,8 @@
 
         Returns 403 when the user doesn't have the ability to mount the \
             block device.
-        Returns 404 if the node or block device is not found.
-        Returns 409 if the node is not Ready or Allocated.
+        Returns 404 if the machine or block device is not found.
+        Returns 409 if the machine is not Ready or Allocated.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.EDIT)
@@ -394,8 +394,8 @@
             mounted.
         Returns 403 when the user doesn't have the ability to unmount the \
             block device.
-        Returns 404 if the node or block device is not found.
-        Returns 409 if the node is not Ready or Allocated.
+        Returns 404 if the machine or block device is not found.
+        Returns 409 if the machine is not Ready or Allocated.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.EDIT)
@@ -414,19 +414,19 @@
 
     @operation(idempotent=False)
     def set_boot_disk(self, request, system_id, device_id):
-        """Set this block device as the boot disk for the node.
+        """Set this block device as the boot disk for the machine.
 
         Returns 400 if the block device is a virtual block device.
-        Returns 404 if the node or block device is not found.
+        Returns 404 if the machine or block device is not found.
         Returns 403 if the user is not allowed to update the block device.
-        Returns 409 if the node is not Ready or Allocated.
+        Returns 409 if the machine is not Ready or Allocated.
         """
         device = BlockDevice.objects.get_block_device_or_404(
             system_id, device_id, request.user, NODE_PERMISSION.ADMIN)
         node = device.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot set as boot disk because the node is not Ready.")
+                "Cannot set as boot disk because the machine is not Ready.")
         if not isinstance(device, PhysicalBlockDevice):
             raise MAASAPIBadRequest(
                 "Cannot set a %s block device as the boot disk." % device.type)

=== modified file 'src/maasserver/api/boot_resources.py'
--- src/maasserver/api/boot_resources.py	2016-02-19 08:38:36 +0000
+++ src/maasserver/api/boot_resources.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `BootResouce`."""

=== modified file 'src/maasserver/api/boot_source_selections.py'
--- src/maasserver/api/boot_source_selections.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/boot_source_selections.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `BootSourceSelection`"""

=== modified file 'src/maasserver/api/boot_sources.py'
--- src/maasserver/api/boot_sources.py	2015-12-11 20:45:50 +0000
+++ src/maasserver/api/boot_sources.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `BootSource`."""

=== modified file 'src/maasserver/api/commissioning_scripts.py'
--- src/maasserver/api/commissioning_scripts.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/commissioning_scripts.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `CommissioningScript`."""
@@ -49,7 +49,7 @@
         so opens you up to risks w.r.t. encoding and ordering.  The name must
         not contain any whitespace, quotes, or apostrophes.
 
-        A commissioning node will run each of the scripts in lexicographical
+        A commissioning machine will run each of the scripts in lexicographical
         order.  There are no promises about how non-ASCII characters are
         sorted, or even how upper-case letters are sorted relative to
         lower-case letters.  So where ordering matters, use unique numbers.
@@ -61,7 +61,7 @@
         script should be ASCII text to avoid any confusion over encoding.  But
         in some cases a commissioning script might consist of a binary tool
         provided by a hardware vendor.  Either way, the script gets passed to
-        the commissioning node in the exact form in which it was uploaded.
+        the commissioning machine in the exact form in which it was uploaded.
 
         :param name: Unique identifying name for the script.  Names should
             follow the pattern of "25-burn-in-hard-disk" (all ASCII, and with

=== modified file 'src/maasserver/api/devices.py'
--- src/maasserver/api/devices.py	2016-02-18 00:34:58 +0000
+++ src/maasserver/api/devices.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -7,17 +7,13 @@
     ]
 
 from maasserver.api.logger import maaslog
-from maasserver.api.support import (
-    operation,
-    OperationsHandler,
-)
-from maasserver.api.utils import get_optional_list
-from maasserver.enum import (
-    NODE_PERMISSION,
-    NODE_TYPE_CHOICES,
-)
+from maasserver.api.nodes import (
+    NodeHandler,
+    NodesHandler,
+)
+from maasserver.api.support import operation
+from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.fields import MAC_RE
 from maasserver.forms import (
     DeviceForm,
     DeviceWithMACsForm,
@@ -29,6 +25,8 @@
 DISPLAYED_DEVICE_FIELDS = (
     'system_id',
     'hostname',
+    'domain',
+    'fqdn',
     'owner',
     'macaddress_set',
     'parent',
@@ -40,7 +38,7 @@
     )
 
 
-class DeviceHandler(OperationsHandler):
+class DeviceHandler(NodeHandler):
     """Manage an individual device.
 
     The device is identified by its system_id.
@@ -59,52 +57,28 @@
         else:
             return node.parent.system_id
 
-    @classmethod
-    def hostname(handler, node):
-        """Override the 'hostname' field so that it returns the FQDN."""
-        return node.fqdn
-
-    @classmethod
-    def owner(handler, node):
-        """Override 'owner' so it emits the owner's name rather than a
-        full nested user object."""
-        if node.owner is None:
-            return None
-        return node.owner.username
-
-    @classmethod
-    def macaddress_set(handler, device):
-        return [
-            {"mac_address": "%s" % interface.mac_address}
-            for interface in device.interface_set.all()
-            if interface.mac_address
-        ]
-
-    @classmethod
-    def node_type_name(handler, node):
-        return NODE_TYPE_CHOICES[node.node_type][1]
-
-    def read(self, request, system_id):
-        """Read a specific device.
-
-        Returns 404 if the device is not found.
-        """
-        return Device.objects.get_node_or_404(
-            system_id=system_id, user=request.user, perm=NODE_PERMISSION.VIEW)
-
     def update(self, request, system_id):
         """Update a specific device.
 
         :param hostname: The new hostname for this device.
+        :type hostname: unicode
+
+        :param domain: The domain for this device.
+        :type domain: unicode
+
         :param parent: Optional system_id to indicate this device's parent.
             If the parent is already set and this parameter is omitted,
             the parent will be unchanged.
-        :type hostname: unicode
+        :type parent: unicode
+
+        :param zone: Name of a valid physical zone in which to place this
+            node.
+        :type zone: unicode
 
         Returns 404 if the device is not found.
         Returns 403 if the user does not have permission to update the device.
         """
-        device = Device.objects.get_node_or_404(
+        device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
         form = DeviceForm(data=request.data, instance=device)
 
@@ -120,7 +94,7 @@
         Returns 403 if the user does not have permission to delete the device.
         Returns 204 if the device is successfully deleted.
         """
-        device = Device.objects.get_node_or_404(
+        device = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user,
             perm=NODE_PERMISSION.EDIT)
         device.delete()
@@ -139,18 +113,28 @@
         return ('device_handler', (device_system_id,))
 
 
-class DevicesHandler(OperationsHandler):
+class DevicesHandler(NodesHandler):
     """Manage the collection of all the devices in the MAAS."""
     api_doc_section_name = "Devices"
     update = delete = None
+    base_model = Device
 
     @operation(idempotent=False)
     def create(self, request):
         """Create a new device.
 
+        :param hostname: A hostname. If not given, one will be generated.
+        :type hostname: unicode
+
+        :param domain: The domain of the device. If not given the default
+            domain is used.
+        :type domain: unicode
+
         :param mac_addresses: One or more MAC addresses for the device.
-        :param hostname: A hostname. If not given, one will be generated.
+        :type mac_addresses: unicode
+
         :param parent: The system id of the parent.  Optional.
+        :type parent: unicode
         """
         form = DeviceWithMACsForm(data=request.data, request=request)
         if form.is_valid():
@@ -163,46 +147,6 @@
         else:
             raise MAASAPIValidationError(form.errors)
 
-    def read(self, request):
-        """List devices visible to the user, optionally filtered by criteria.
-
-        :param hostname: An optional list of hostnames.  Only devices with
-            matching hostnames will be returned.
-        :type hostname: iterable
-        :param mac_address: An optional list of MAC addresses.  Only
-            devices with matching MAC addresses will be returned.
-        :type mac_address: iterable
-        :param id: An optional list of system ids.  Only devices with
-            matching system ids will be returned.
-        :type id: iterable
-        """
-        # Get filters from request.
-        match_ids = get_optional_list(request.GET, 'id')
-        match_macs = get_optional_list(request.GET, 'mac_address')
-        if match_macs is not None:
-            invalid_macs = [
-                mac for mac in match_macs if MAC_RE.match(mac) is None]
-            if len(invalid_macs) != 0:
-                raise MAASAPIValidationError(
-                    "Invalid MAC address(es): %s" % ", ".join(invalid_macs))
-
-        # Fetch nodes and apply filters.
-        devices = Device.objects.get_nodes(
-            request.user, NODE_PERMISSION.VIEW, ids=match_ids)
-        if match_macs is not None:
-            devices = devices.filter(interface__mac_address__in=match_macs)
-        match_hostnames = get_optional_list(request.GET, 'hostname')
-        if match_hostnames is not None:
-            devices = devices.filter(hostname__in=match_hostnames)
-
-        # Prefetch related objects that are needed for rendering the result.
-        devices = devices.prefetch_related('interface_set__node')
-        devices = devices.prefetch_related('interface_set__ip_addresses')
-        devices = devices.prefetch_related('tags')
-        devices = devices.prefetch_related('zone')
-        devices = devices.prefetch_related('domain')
-        return devices.order_by('id')
-
     @classmethod
     def resource_uri(cls, *args, **kwargs):
         return ('devices_handler', [])

=== modified file 'src/maasserver/api/dnsresourcerecords.py'
--- src/maasserver/api/dnsresourcerecords.py	2016-02-11 18:11:40 +0000
+++ src/maasserver/api/dnsresourcerecords.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015,2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `DNSData`."""

=== modified file 'src/maasserver/api/dnsresources.py'
--- src/maasserver/api/dnsresources.py	2016-01-25 15:11:21 +0000
+++ src/maasserver/api/dnsresources.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015,2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `DNSResource`."""

=== modified file 'src/maasserver/api/doc.py'
--- src/maasserver/api/doc.py	2016-02-10 20:24:35 +0000
+++ src/maasserver/api/doc.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Utilities to help document/describe the public facing API."""

=== modified file 'src/maasserver/api/doc_handler.py'
--- src/maasserver/api/doc_handler.py	2016-02-11 15:06:36 +0000
+++ src/maasserver/api/doc_handler.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Restful MAAS API.
@@ -43,7 +43,7 @@
 methods will take one special parameter, called `op`, to indicate what it is
 you want to do.
 
-For example, to list all nodes, you might GET "/api/2.0/nodes/?op=list".
+For example, to list all machines, you might GET "/api/2.0/machines".
 """
 
 __all__ = [

=== modified file 'src/maasserver/api/domains.py'
--- src/maasserver/api/domains.py	2016-01-22 00:02:37 +0000
+++ src/maasserver/api/domains.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Domain`."""

=== modified file 'src/maasserver/api/events.py'
--- src/maasserver/api/events.py	2016-01-28 21:47:31 +0000
+++ src/maasserver/api/events.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [

=== modified file 'src/maasserver/api/fabrics.py'
--- src/maasserver/api/fabrics.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/fabrics.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Fabric`."""

=== modified file 'src/maasserver/api/fannetworks.py'
--- src/maasserver/api/fannetworks.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/fannetworks.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Fan Network`."""

=== modified file 'src/maasserver/api/files.py'
--- src/maasserver/api/files.py	2016-02-18 01:32:50 +0000
+++ src/maasserver/api/files.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `File`."""

=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2015-12-16 00:01:56 +0000
+++ src/maasserver/api/interfaces.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Interface`."""
@@ -72,7 +72,7 @@
 
 
 class InterfacesHandler(OperationsHandler):
-    """Manage interfaces on a node or device."""
+    """Manage interfaces on a node."""
     api_doc_section_name = "Interfaces"
     create = update = delete = None
     fields = DISPLAYED_INTERFACE_FIELDS

=== modified file 'src/maasserver/api/ip_addresses.py'
--- src/maasserver/api/ip_addresses.py	2016-02-17 18:21:13 +0000
+++ src/maasserver/api/ip_addresses.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handler: `StaticIPAddress`."""

=== modified file 'src/maasserver/api/license_keys.py'
--- src/maasserver/api/license_keys.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/license_keys.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `LicenseKey`."""

=== modified file 'src/maasserver/api/logger.py'
--- src/maasserver/api/logger.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/logger.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API logger."""

=== modified file 'src/maasserver/api/maas.py'
--- src/maasserver/api/maas.py	2016-02-11 15:06:36 +0000
+++ src/maasserver/api/maas.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handler: MAAS."""

=== modified file 'src/maasserver/api/machines.py'
--- src/maasserver/api/machines.py	2016-03-02 02:22:45 +0000
+++ src/maasserver/api/machines.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -59,12 +59,13 @@
     Unauthorized,
 )
 from maasserver.forms import (
-    get_node_create_form,
-    get_node_edit_form,
+    get_machine_create_form,
+    get_machine_edit_form,
 )
 from maasserver.forms_commission import CommissionForm
 from maasserver.models import (
     Config,
+    Domain,
     Machine,
     RackController,
 )
@@ -91,6 +92,8 @@
 DISPLAYED_MACHINE_FIELDS = (
     'system_id',
     'hostname',
+    'domain',
+    'fqdn',
     'owner',
     'macaddress_set',
     'boot_interface',
@@ -191,17 +194,25 @@
 
         :param hostname: The new hostname for this machine.
         :type hostname: unicode
+
+        :param domain: The domain for this machine. If not given the default
+            domain is used.
+        :type domain: unicode
+
         :param architecture: The new architecture for this machine.
         :type architecture: unicode
+
         :param min_hwe_kernel: A string containing the minimum kernel version
             allowed to be ran on this machine.
         :type min_hwe_kernel: unicode
+
         :param power_type: The new power type for this machine. If you use the
             default value, power_parameters will be set to the empty string.
             Available to admin users.
             See the `Power types`_ section for a list of the available power
             types.
         :type power_type: unicode
+
         :param power_parameters_{param1}: The new value for the 'param1'
             power parameter.  Note that this is dynamic as the available
             parameters depend on the selected value of the Machine's
@@ -209,19 +220,32 @@
             section for a list of the available power parameters for each
             power type.
         :type power_parameters_{param1}: unicode
+
         :param power_parameters_skip_check: Whether or not the new power
             parameters for this machine should be checked against the expected
             power parameters for the machine's power type ('true' or 'false').
             The default is 'false'.
         :type power_parameters_skip_check: unicode
+
         :param zone: Name of a valid physical zone in which to place this
-            machine
+            machine.
         :type zone: unicode
+
         :param swap_size: Specifies the size of the swap file, in bytes. Field
             accept K, M, G and T suffixes for values expressed respectively in
             kilobytes, megabytes, gigabytes and terabytes.
         :type swap_size: unicode
 
+        :param disable_ipv4: Whether or not IPv4 should be enabled on the
+            machine.
+        :type disable_ipv4: boolean
+
+        :param cpu_count: The amount of CPU cores the machine has.
+        :type cpu_count: integer
+
+        :param memory: How much memory the machine has.
+        :type memory: unicode
+
         Returns 404 if the machine is not found.
         Returns 403 if the user does not have permission to update the machine.
         """
@@ -234,7 +258,7 @@
         if 'power_type' not in request.data:
             altered_query_data['power_type'] = machine.power_type
 
-        Form = get_node_edit_form(request.user)
+        Form = get_machine_edit_form(request.user)
         form = Form(data=altered_query_data, instance=machine)
 
         if form.is_valid():
@@ -325,7 +349,7 @@
         if not machine.distro_series and not series:
             series = Config.objects.get_config('default_distro_series')
         if None in (series, license_key, hwe_kernel):
-            Form = get_node_edit_form(request.user)
+            Form = get_machine_edit_form(request.user)
             form = Form(instance=machine)
             if series is not None:
                 form.set_distro_series(series=series)
@@ -375,7 +399,7 @@
             machine.start(request.user, user_data=user_data, comment=comment)
         except StaticIPAddressExhaustion:
             # The API response should contain error text with the
-            # system_id in it, as that is the primary API key to a node.
+            # system_id in it, as that is the primary API key to a machine.
             raise StaticIPAddressExhaustion(
                 "%s: Unable to allocate static IP due to address"
                 " exhaustion." % system_id)
@@ -383,7 +407,7 @@
 
     @operation(idempotent=False)
     def release(self, request, system_id):
-        """Release a node. Opposite of `Machines.allocate`.
+        """Release a machine. Opposite of `Machines.allocate`.
 
         :param comment: Optional comment for the event log.
         :type comment: unicode
@@ -396,7 +420,7 @@
         machine = self.model.objects.get_node_or_404(
             system_id=system_id, user=request.user, perm=NODE_PERMISSION.EDIT)
         if machine.status in (NODE_STATUS.RELEASING, NODE_STATUS.READY):
-            # Nothing to do if this node is already releasing, otherwise
+            # Nothing to do if this machine is already releasing, otherwise
             # this may be a redundant retry, and the
             # postcondition is achieved, so call this success.
             pass
@@ -536,7 +560,7 @@
 
         If the default gateways need to be specific for this machine you can
         set which interface and subnet's gateway to use when this machine is
-        deployed with the `node-interfaces set-default-gateway` API.
+        deployed with the `interfaces set-default-gateway` API.
 
         Returns 404 if the machine could not be found.
         Returns 403 if the user does not have permission to clear the default
@@ -579,17 +603,17 @@
         user is not one.
 
         This returns the power parameters, if any, configured for a
-        node. For some types of power control this will include private
+        machine. For some types of power control this will include private
         information such as passwords and secret keys.
 
-        Returns 404 if the node is not found.
+        Returns 404 if the machine is not found.
         """
         machine = get_object_or_404(self.model, system_id=system_id)
         return machine.power_parameters
 
     @operation(idempotent=True)
     def query_power_state(self, request, system_id):
-        """Query the power state of a node.
+        """Query the power state of a machine.
 
         Send a request to the machine's power controller which asks it about
         the machine's state.  The reply to this could be delayed by up to
@@ -663,7 +687,7 @@
 
     The machine will be in the New state.
 
-    :param request: The http request for this node to be created.
+    :param request: The http request for this machine to be created.
     :return: A `Machine`.
     :rtype: :class:`maasserver.models.Machine`.
     :raises: ValidationError
@@ -710,7 +734,7 @@
             raise MAASAPIValidationError(
                 'min_hwe_kernel must be in the form of hwe-<LETTER>.')
 
-    Form = get_node_create_form(request.user)
+    Form = get_machine_create_form(request.user)
     form = Form(data=altered_query_data, request=request)
     if form.is_valid():
         machine = form.save()
@@ -745,18 +769,33 @@
         :param architecture: A string containing the architecture type of
             the machine. (For example, "i386", or "amd64".) To determine the
             supported architectures, use the boot-resources endpoint.
+        :type architecture: unicode
+
         :param min_hwe_kernel: A string containing the minimum kernel version
             allowed to be ran on this machine.
+        :type min_hwe_kernel: unicode
+
         :param subarchitecture: A string containing the subarchitecture type
             of the machine. (For example, "generic" or "hwe-t".) To determine
             the supported subarchitectures, use the boot-resources endpoint.
+        :type subarchitecture: unicode
+
         :param mac_addresses: One or more MAC addresses for the machine. To
             specify more than one MAC address, the parameter must be specified
             twice. (such as "machines new mac_addresses=01:02:03:04:05:06
             mac_addresses=02:03:04:05:06:07")
+        :type mac_addresses: unicode
+
         :param hostname: A hostname. If not given, one will be generated.
+        :type hostname: unicode
+
+        :param domain: The domain of the machine. If not given the default
+            domain is used.
+        :type domain: unicode
+
         :param power_type: A power management type, if applicable (e.g.
             "virsh", "ipmi").
+        :type power_type:unicode
         """
         return create_machine(request)
 
@@ -774,7 +813,7 @@
 
 
 class MachinesHandler(NodesHandler):
-    """Manage the collection of all the nodes in the MAAS."""
+    """Manage the collection of all the machines in the MAAS."""
     api_doc_section_name = "Machines"
     anonymous = AnonMachinesHandler
     base_model = Machine
@@ -798,18 +837,33 @@
         :param architecture: A string containing the architecture type of
             the machine. (For example, "i386", or "amd64".) To determine the
             supported architectures, use the boot-resources endpoint.
+        :type architecture: unicode
+
         :param min_hwe_kernel: A string containing the minimum kernel version
             allowed to be ran on this machine.
+        :type min_hwe_kernel: unicode
+
         :param subarchitecture: A string containing the subarchitecture type
             of the machine. (For example, "generic" or "hwe-t".) To determine
             the supported subarchitectures, use the boot-resources endpoint.
+        :type subarchitecture: unicode
+
         :param mac_addresses: One or more MAC addresses for the machine. To
             specify more than one MAC address, the parameter must be specified
             twice. (such as "machines new mac_addresses=01:02:03:04:05:06
             mac_addresses=02:03:04:05:06:07")
+        :type mac_addresses: unicode
+
         :param hostname: A hostname. If not given, one will be generated.
+        :type hostname: unicode
+
+        :param domain: The domain of the machine. If not given the default
+            domain is used.
+        :type domain: unicode
+
         :param power_type: A power management type, if applicable (e.g.
             "virsh", "ipmi").
+        :type power_type: unicode
         """
         machine = create_machine(request)
         if request.user.is_superuser:
@@ -857,7 +911,7 @@
         Returns 403 if the user is not an admin.
         """
         system_ids = set(request.POST.getlist('machines'))
-        # Check the existence of these nodes first.
+        # Check the existence of these machines first.
         self._check_system_ids_exist(system_ids)
         # Make sure that the user has the required permission.
         machines = self.base_model.objects.get_nodes(
@@ -1045,7 +1099,7 @@
             if machine is None:
                 constraints = form.describe_constraints()
                 if constraints == '':
-                    # No constraints. That means no nodes at all were
+                    # No constraints. That means no machines at all were
                     # available.
                     message = "No machine available."
                 else:
@@ -1140,7 +1194,7 @@
             chassis types.
         :type password: unicode
 
-        :param accept_all: If true, all enlisted nodes will be
+        :param accept_all: If true, all enlisted machines will be
             commissioned.
         :type accept_all: unicode
 
@@ -1149,6 +1203,9 @@
             automatically determine the rack controller to use.
         :type rack_controller: unicode
 
+        :param domain: The domain that each new machine added should use.
+        :type domain: unicode
+
         The following are optional if you are adding a virsh, vmware, or
         powerkvm chassis:
 
@@ -1242,6 +1299,19 @@
                 chassis_type, content_type=(
                     "text/plain; charset=%s" % settings.DEFAULT_CHARSET))
 
+        # If given a domain make sure it exists first
+        domain_name = get_optional_param(request.POST, 'domain')
+        if domain_name is not None:
+            try:
+                domain = Domain.objects.get(id=int(domain_name))
+            except ValueError:
+                try:
+                    domain = Domain.objects.get(name=domain_name)
+                except Domain.DoesNotExist:
+                    return HttpResponseNotFound(
+                        "Unable to find specified domain %s" % domain_name)
+            domain_name = domain.name
+
         rack_controller = get_optional_param(request.POST, 'rack_controller')
         if rack_controller is None:
             rack = RackController.objects.get_accessible_by_url(hostname)
@@ -1262,7 +1332,8 @@
 
         rack.add_chassis(
             request.user.username, chassis_type, hostname, username, password,
-            accept_all, prefix_filter, power_control, port, protocol)
+            accept_all, domain_name, prefix_filter, power_control, port,
+            protocol)
 
         return HttpResponse(
             "Asking %s to add machines from chassis %s" % (

=== modified file 'src/maasserver/api/networks.py'
--- src/maasserver/api/networks.py	2016-02-17 16:12:30 +0000
+++ src/maasserver/api/networks.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Network`."""

=== modified file 'src/maasserver/api/nodes.py'
--- src/maasserver/api/nodes.py	2016-02-22 18:49:58 +0000
+++ src/maasserver/api/nodes.py	2016-03-02 18:21:51 +0000
@@ -136,15 +136,10 @@
     """
     api_doc_section_name = "Node"
 
-    create = None  # Disable create.
+    # Disable create and update
+    create = update = None
     model = Node
 
-    # Override the 'hostname' field so that it returns the FQDN instead as
-    # this is used by Juju to reach that node.
-    @classmethod
-    def hostname(handler, node):
-        return node.fqdn
-
     # Override 'owner' so it emits the owner's name rather than a
     # full nested user object.
     @classmethod
@@ -315,7 +310,37 @@
     base_model = Node
 
     def read(self, request):
-        """List all nodes."""
+        """List Nodes visible to the user, optionally filtered by criteria.
+
+        Nodes are sorted by id (i.e. most recent last) and grouped by type.
+
+        :param hostname: An optional hostname. Only nodes relating to the node
+            with the matching hostname will be returned. This can be specified
+            multiple times to see multiple nodes.
+        :type hostname: unicode
+
+        :param mac_address: An optional MAC address. Only nodes relating to the
+            node owning the specified MAC address will be returned. This can be
+            specified multiple times to see multiple nodes.
+        :type mac_address: unicode
+
+        :param id: An optional list of system ids.  Only nodes relating to the
+            nodes with matching system ids will be returned.
+        :type id: unicode
+
+        :param domain: An optional name for a dns domain. Only nodes relating
+            to the nodes in the domain will be returned.
+        :type domain: unicode
+
+        :param zone: An optional name for a physical zone. Only nodes relating
+            to the nodes in the zone will be returned.
+        :type zone: unicode
+
+        :param agent_name: An optional agent name.  Only nodes relating to the
+            nodes with matching agent names will be returned.
+        :type agent_name: unicode
+        """
+
         if self.base_model == Node:
             # Avoid circular dependencies
             from maasserver.api.devices import DevicesHandler

=== modified file 'src/maasserver/api/not_found.py'
--- src/maasserver/api/not_found.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/not_found.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Not found API handler."""

=== modified file 'src/maasserver/api/pxeconfig.py'
--- src/maasserver/api/pxeconfig.py	2016-02-11 15:06:36 +0000
+++ src/maasserver/api/pxeconfig.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handler: `pxeconfig`."""

=== modified file 'src/maasserver/api/rackcontrollers.py'
--- src/maasserver/api/rackcontrollers.py	2016-02-19 08:38:36 +0000
+++ src/maasserver/api/rackcontrollers.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -8,9 +8,9 @@
 
 from django.conf import settings
 from django.http import HttpResponse
-from maasserver.api.machines import (
-    MachineHandler,
-    MachinesHandler,
+from maasserver.api.nodes import (
+    NodeHandler,
+    NodesHandler,
 )
 from maasserver.api.support import (
     admin_method,
@@ -27,15 +27,14 @@
 DISPLAYED_RACK_CONTROLLER_FIELDS = (
     'system_id',
     'hostname',
+    'domain',
+    'fqdn',
     'architecture',
     'cpu_count',
     'memory',
     'swap_size',
-    'status',
     'osystem',
     'distro_series',
-    'power_type',
-    'power_state',
     'ip_addresses',
     ('interface_set', (
         'id',
@@ -54,14 +53,12 @@
         )),
     'zone',
     'status_action',
-    'status_message',
-    'status_name',
     'node_type',
     'node_type_name',
 )
 
 
-class RackControllerHandler(MachineHandler):
+class RackControllerHandler(NodeHandler):
     """Manage an individual rack controller.
 
     The rack controller is identified by its system_id.
@@ -75,7 +72,7 @@
     def refresh(self, request, system_id):
         """Refresh the hardware information for a specific rack controller.
 
-        Returns 404 if the node is not found.
+        Returns 404 if the rack-controller is not found.
         Returns 403 if the user does not have permission to refresh the rack.
         """
         rack = self.model.objects.get_node_or_404(
@@ -110,7 +107,7 @@
         return ('rackcontroller_handler', (rackcontroller_id, ))
 
 
-class RackControllersHandler(MachinesHandler):
+class RackControllersHandler(NodesHandler):
     """Manage the collection of all rack controllers in MAAS."""
     api_doc_section_name = "RackControllers"
     base_model = RackController

=== modified file 'src/maasserver/api/raid.py'
--- src/maasserver/api/raid.py	2015-12-16 00:01:56 +0000
+++ src/maasserver/api/raid.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `RAID`."""
@@ -39,7 +39,7 @@
 
 
 class RaidsHandler(OperationsHandler):
-    """Manage all RAID devices on a node."""
+    """Manage all RAID devices on a machine."""
     api_doc_section_name = "RAID Devices"
     update = delete = None
     fields = DISPLAYED_RAID_FIELDS
@@ -67,7 +67,7 @@
             system_id, request.user, NODE_PERMISSION.ADMIN)
         if machine.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot create RAID because the node is not Ready.")
+                "Cannot create RAID because the machine is not Ready.")
         form = CreateRaidForm(machine, data=request.data)
         if form.is_valid():
             return form.save()
@@ -75,7 +75,7 @@
             raise MAASAPIValidationError(form.errors)
 
     def read(self, request, system_id):
-        """List all RAID devices belonging to node.
+        """List all RAID devices belonging to a machine.
 
         Returns 404 if the machine is not found.
         """
@@ -85,7 +85,7 @@
 
 
 class RaidHandler(OperationsHandler):
-    """Manage a specific RAID device on a node."""
+    """Manage a specific RAID device on a machine."""
     api_doc_section_name = "RAID Device"
     create = None
     model = RAID
@@ -142,15 +142,15 @@
         ]
 
     def read(self, request, system_id, raid_id):
-        """Read RAID device on node.
+        """Read RAID device on a machine.
 
-        Returns 404 if the node or RAID is not found.
+        Returns 404 if the machine or RAID is not found.
         """
         return RAID.objects.get_object_or_404(
             system_id, raid_id, request.user, NODE_PERMISSION.VIEW)
 
     def update(self, request, system_id, raid_id):
-        """Update RAID on node.
+        """Update RAID on a machine.
 
         :param name: Name of the RAID.
         :param uuid: UUID of the RAID.
@@ -165,15 +165,15 @@
         :param remove_spare_partitions: Spare partitions to remove from the
                RAID.
 
-        Returns 404 if the node or RAID is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or RAID is not found.
+        Returns 409 if the machine is not Ready.
         """
         raid = RAID.objects.get_object_or_404(
             system_id, raid_id, request.user, NODE_PERMISSION.ADMIN)
         node = raid.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update RAID because the node is not Ready.")
+                "Cannot update RAID because the machine is not Ready.")
         form = UpdateRaidForm(raid, data=request.data)
         if form.is_valid():
             return form.save()
@@ -181,16 +181,16 @@
             raise MAASAPIValidationError(form.errors)
 
     def delete(self, request, system_id, raid_id):
-        """Delete RAID on node.
+        """Delete RAID on a machine.
 
-        Returns 404 if the node or RAID is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or RAID is not found.
+        Returns 409 if the machine is not Ready.
         """
         raid = RAID.objects.get_object_or_404(
             system_id, raid_id, request.user, NODE_PERMISSION.ADMIN)
         node = raid.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete RAID because the node is not Ready.")
+                "Cannot delete RAID because the machine is not Ready.")
         raid.delete()
         return rc.DELETED

=== modified file 'src/maasserver/api/spaces.py'
--- src/maasserver/api/spaces.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/spaces.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Space`."""

=== modified file 'src/maasserver/api/ssh_keys.py'
--- src/maasserver/api/ssh_keys.py	2016-02-19 08:38:36 +0000
+++ src/maasserver/api/ssh_keys.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `SSHKey`."""

=== modified file 'src/maasserver/api/ssl_keys.py'
--- src/maasserver/api/ssl_keys.py	2016-02-19 08:38:36 +0000
+++ src/maasserver/api/ssl_keys.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `SSLKey`."""

=== modified file 'src/maasserver/api/subnets.py'
--- src/maasserver/api/subnets.py	2016-01-29 17:32:25 +0000
+++ src/maasserver/api/subnets.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Subnet`."""

=== modified file 'src/maasserver/api/support.py'
--- src/maasserver/api/support.py	2016-02-25 08:52:39 +0000
+++ src/maasserver/api/support.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Supporting infrastructure for Piston-based APIs in MAAS."""

=== modified file 'src/maasserver/api/tags.py'
--- src/maasserver/api/tags.py	2016-02-19 08:38:36 +0000
+++ src/maasserver/api/tags.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Tag`."""

=== modified file 'src/maasserver/api/tests/test_devices.py'
--- src/maasserver/api/tests/test_devices.py	2016-02-26 18:39:26 +0000
+++ src/maasserver/api/tests/test_devices.py	2016-03-02 18:21:51 +0000
@@ -13,7 +13,10 @@
     NODE_STATUS,
     NODE_TYPE,
 )
-from maasserver.models import Device
+from maasserver.models import (
+    Device,
+    Domain,
+)
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
 from maasserver.utils.converters import json_load_bytes
@@ -72,6 +75,48 @@
         self.assertEquals(parent, device.parent)
         self.assertEqual(device.node_type, NODE_TYPE.DEVICE)
 
+    def test_POST_creates_device_with_default_domain(self):
+        hostname = factory.make_name('host')
+        macs = {
+            factory.make_mac_address()
+            for _ in range(random.randint(1, 2))
+        }
+        response = self.client.post(
+            reverse('devices_handler'),
+            {
+                'hostname': hostname,
+                'mac_addresses': macs,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        system_id = json_load_bytes(response.content)['system_id']
+        device = Device.objects.get(system_id=system_id)
+        self.assertEquals(hostname, device.hostname)
+        self.assertEquals(Domain.objects.get_default_domain(), device.domain)
+        self.assertEqual(device.node_type, NODE_TYPE.DEVICE)
+
+    def test_POST_creates_device_with_domain(self):
+        hostname = factory.make_name('host')
+        domain = factory.make_Domain()
+        macs = {
+            factory.make_mac_address()
+            for _ in range(random.randint(1, 2))
+        }
+        response = self.client.post(
+            reverse('devices_handler'),
+            {
+                'hostname': hostname,
+                'mac_addresses': macs,
+                'domain': domain.name,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        system_id = json_load_bytes(response.content)['system_id']
+        device = Device.objects.get(system_id=system_id)
+        self.assertEquals(hostname, device.hostname)
+        self.assertEquals(domain, device.domain)
+        self.assertEqual(device.node_type, NODE_TYPE.DEVICE)
+
     def test_POST_returns_limited_fields(self):
         response = self.client.post(
             reverse('devices_handler'),
@@ -83,6 +128,8 @@
         self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
+                'fqdn',
                 'owner',
                 'system_id',
                 'macaddress_set',
@@ -162,6 +209,8 @@
         self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
+                'fqdn',
                 'owner',
                 'system_id',
                 'macaddress_set',
@@ -195,7 +244,7 @@
 
         response = self.client.post(get_device_uri(device))
         self.assertEqual(
-            http.client.METHOD_NOT_ALLOWED, response.status_code,
+            http.client.BAD_REQUEST, response.status_code,
             response.content)
 
     def test_GET_reads_device(self):

=== modified file 'src/maasserver/api/tests/test_doc.py'
--- src/maasserver/api/tests/test_doc.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/api/tests/test_doc.py	2016-03-02 18:21:51 +0000
@@ -5,7 +5,10 @@
 
 __all__ = []
 
+import http.client
 from inspect import getdoc
+from io import StringIO
+import sys
 import types
 
 from django.conf.urls import (
@@ -74,6 +77,14 @@
         name = factory.make_name("module")
         return types.ModuleType(name)
 
+    def test_anon_api_doc(self):
+        # The documentation is accessible to anon users.
+        self.patch(sys, "stderr", StringIO())
+        response = self.client.get(reverse('api-doc'))
+        self.assertEqual(http.client.OK, response.status_code)
+        # No error or warning are emitted by docutils.
+        self.assertEqual("", sys.stderr.getvalue())
+
     def test_urlpatterns_empty(self):
         # No resources are found in empty modules.
         module = self.make_module()

=== modified file 'src/maasserver/api/tests/test_enlistment.py'
--- src/maasserver/api/tests/test_enlistment.py	2016-03-01 01:15:22 +0000
+++ src/maasserver/api/tests/test_enlistment.py	2016-03-02 18:21:51 +0000
@@ -64,7 +64,7 @@
         self.assertIn('application/json', response['Content-Type'])
         domain_name = Domain.objects.get_default_domain().name
         self.assertEqual(
-            'diane.%s' % domain_name, parsed_result['hostname'])
+            'diane.%s' % domain_name, parsed_result['fqdn'])
         self.assertNotEqual(0, len(parsed_result.get('system_id')))
         [diane] = Machine.objects.filter(hostname='diane')
         self.assertEqual(architecture, diane.architecture)
@@ -129,7 +129,7 @@
         self.assertIn('application/json', response['Content-Type'])
         domain_name = Domain.objects.get_default_domain().name
         self.assertEqual(
-            'diane.%s' % domain_name, parsed_result['hostname'])
+            'diane.%s' % domain_name, parsed_result['fqdn'])
         self.assertNotEqual(0, len(parsed_result.get('system_id')))
         [diane] = Machine.objects.filter(hostname='diane')
         self.assertEqual(architecture, diane.architecture)
@@ -152,7 +152,7 @@
         self.assertIn('application/json', response['Content-Type'])
         domain_name = Domain.objects.get_default_domain().name
         self.assertEqual(
-            'diane.%s' % domain_name, parsed_result['hostname'])
+            'diane.%s' % domain_name, parsed_result['fqdn'])
         self.assertNotEqual(0, len(parsed_result.get('system_id')))
         [diane] = Machine.objects.filter(hostname='diane')
         self.assertEqual(architecture, diane.architecture)
@@ -275,6 +275,30 @@
         self.assertItemsEqual(
             ['architecture'], parsed_result, response.content)
 
+    def test_POST_create_creates_machine_with_domain(self):
+        domain = factory.make_Domain()
+        # The API allows a Machine to be created.
+        architecture = make_usable_architecture(self)
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'hostname': 'diane',
+                'architecture': architecture.split('/')[0],
+                'subarchitecture': architecture.split('/')[1],
+                'power_type': 'manual',
+                'mac_addresses': ['aa:bb:cc:dd:ee:ff', '22:bb:cc:dd:ee:ff'],
+                'domain': domain.name,
+            })
+
+        self.assertEqual(http.client.OK, response.status_code)
+        parsed_result = json_load_bytes(response.content)
+        self.assertIn('application/json', response['Content-Type'])
+        self.assertEqual(
+            'diane.%s' % domain.name, parsed_result['fqdn'])
+        self.assertNotEqual(0, len(parsed_result.get('system_id')))
+        [diane] = Machine.objects.filter(hostname='diane')
+        self.assertEqual(architecture, diane.architecture)
+
 
 class MachineHostnameEnlistmentTest(
         MultipleUsersScenarios, MAASServerTestCase):
@@ -307,7 +331,7 @@
             hostname_without_domain,
             Domain.objects.get_default_domain().name)
         self.assertEqual(
-            expected_hostname, parsed_result.get('hostname'))
+            expected_hostname, parsed_result.get('fqdn'))
 
 
 class NonAdminEnlistmentAPITest(
@@ -376,6 +400,8 @@
         self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
+                'fqdn',
                 'owner',
                 'system_id',
                 'architecture',
@@ -482,6 +508,8 @@
         self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
+                'fqdn',
                 'owner',
                 'system_id',
                 'macaddress_set',
@@ -644,6 +672,8 @@
         self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
+                'fqdn',
                 'owner',
                 'system_id',
                 'macaddress_set',

=== modified file 'src/maasserver/api/tests/test_machine.py'
--- src/maasserver/api/tests/test_machine.py	2016-02-29 07:45:25 +0000
+++ src/maasserver/api/tests/test_machine.py	2016-03-02 18:21:51 +0000
@@ -7,10 +7,7 @@
 
 from base64 import b64encode
 import http.client
-from io import StringIO
-import sys
 
-import bson
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db import transaction
@@ -20,7 +17,6 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_STATUS,
-    NODE_STATUS_CHOICES,
     NODE_STATUS_CHOICES_DICT,
     NODE_TYPE,
     NODE_TYPE_CHOICES,
@@ -66,10 +62,6 @@
 from metadataserver.nodeinituser import get_node_init_user
 from mock import ANY
 from netaddr import IPNetwork
-from provisioningserver.refresh.node_info_scripts import (
-    LLDP_OUTPUT_NAME,
-    LSHW_OUTPUT_NAME,
-)
 from provisioningserver.rpc.exceptions import PowerActionAlreadyInProgress
 from provisioningserver.utils.enum import map_enum
 from twisted.internet import defer
@@ -78,19 +70,6 @@
 
 class MachineAnonAPITest(MAASServerTestCase):
 
-    def setUp(self):
-        super(MachineAnonAPITest, self).setUp()
-        self.patch(node_module.Node, '_start')
-        self.patch(node_module.Node, '_stop')
-
-    def test_anon_api_doc(self):
-        # The documentation is accessible to anon users.
-        self.patch(sys, "stderr", StringIO())
-        response = self.client.get(reverse('api-doc'))
-        self.assertEqual(http.client.OK, response.status_code)
-        # No error or warning are emitted by docutils.
-        self.assertEqual("", sys.stderr.getvalue())
-
     def test_machine_init_user_cannot_access(self):
         token = NodeKey.objects.get_token_for_node(factory.make_Node())
         client = OAuthAuthenticatedClient(get_node_init_user(), token)
@@ -147,7 +126,7 @@
         domain_name = Domain.objects.get_default_domain().name
         self.assertEqual(
             "%s.%s" % (machine.hostname, domain_name),
-            parsed_result['hostname'])
+            parsed_result['fqdn'])
         self.assertEqual(machine.system_id, parsed_result['system_id'])
 
     def test_GET_returns_associated_tag(self):
@@ -924,7 +903,7 @@
         self.assertEqual(http.client.OK, response.status_code)
         domain_name = Domain.objects.get_default_domain().name
         self.assertEqual(
-            'francis.%s' % domain_name, parsed_result['hostname'])
+            'francis.%s' % domain_name, parsed_result['fqdn'])
         self.assertEqual(0, Machine.objects.filter(hostname='diane').count())
         self.assertEqual(1, Machine.objects.filter(hostname='francis').count())
 
@@ -1480,188 +1459,6 @@
             response.content)
 
 
-class TestGetDetails(APITestCase):
-    """Tests for /api/2.0/machines/<machine>/?op=details."""
-
-    def make_lshw_result(self, machine, script_result=0):
-        return factory.make_NodeResult_for_commissioning(
-            node=machine, name=LSHW_OUTPUT_NAME,
-            script_result=script_result)
-
-    def make_lldp_result(self, machine, script_result=0):
-        return factory.make_NodeResult_for_commissioning(
-            node=machine, name=LLDP_OUTPUT_NAME, script_result=script_result)
-
-    def get_details(self, machine):
-        url = reverse('machine_handler', args=[machine.system_id])
-        response = self.client.get(url, {'op': 'details'})
-        self.assertEqual(http.client.OK, response.status_code)
-        self.assertEqual('application/bson', response['content-type'])
-        return bson.BSON(response.content).decode()
-
-    def test_GET_returns_empty_details_when_there_are_none(self):
-        machine = factory.make_Node()
-        self.assertDictEqual(
-            {"lshw": None, "lldp": None},
-            self.get_details(machine))
-
-    def test_GET_returns_all_details(self):
-        machine = factory.make_Node()
-        lshw_result = self.make_lshw_result(machine)
-        lldp_result = self.make_lldp_result(machine)
-        self.assertDictEqual(
-            {"lshw": lshw_result.data,
-             "lldp": lldp_result.data},
-            self.get_details(machine))
-
-    def test_GET_returns_only_those_details_that_exist(self):
-        machine = factory.make_Node()
-        lshw_result = self.make_lshw_result(machine)
-        self.assertDictEqual(
-            {"lshw": lshw_result.data,
-             "lldp": None},
-            self.get_details(machine))
-
-    def test_GET_returns_not_found_when_machine_does_not_exist(self):
-        url = reverse('machine_handler', args=['does-not-exist'])
-        response = self.client.get(url, {'op': 'details'})
-        self.assertEqual(http.client.NOT_FOUND, response.status_code)
-
-
-class TestMarkBroken(APITestCase):
-    """Tests for /api/2.0/machines/<machine>/?op=mark_broken"""
-
-    def get_machine_uri(self, machine):
-        """Get the API URI for `machine`."""
-        return reverse('machine_handler', args=[machine.system_id])
-
-    def test_mark_broken_changes_status(self):
-        machine = factory.make_Node(
-            status=NODE_STATUS.COMMISSIONING, owner=self.logged_in_user)
-        response = self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_broken'})
-        self.assertEqual(http.client.OK, response.status_code)
-        self.assertEqual(NODE_STATUS.BROKEN, reload_object(machine).status)
-
-    def test_mark_broken_updates_error_description(self):
-        # 'error_description' parameter was renamed 'comment' for consistency
-        # make sure this comment updates the machine's error_description
-        machine = factory.make_Node(
-            status=NODE_STATUS.COMMISSIONING, owner=self.logged_in_user)
-        comment = factory.make_name('comment')
-        response = self.client.post(
-            self.get_machine_uri(machine),
-            {'op': 'mark_broken', 'comment': comment})
-        self.assertEqual(http.client.OK, response.status_code)
-        machine = reload_object(machine)
-        self.assertEqual(
-            (NODE_STATUS.BROKEN, comment),
-            (machine.status, machine.error_description)
-        )
-
-    def test_mark_broken_updates_error_description_compatibility(self):
-        # test old 'error_description' parameter is honored for compatibility
-        machine = factory.make_Node(
-            status=NODE_STATUS.COMMISSIONING, owner=self.logged_in_user)
-        error_description = factory.make_name('error_description')
-        response = self.client.post(
-            self.get_machine_uri(machine),
-            {'op': 'mark_broken', 'error_description': error_description})
-        self.assertEqual(http.client.OK, response.status_code)
-        machine = reload_object(machine)
-        self.assertEqual(
-            (NODE_STATUS.BROKEN, error_description),
-            (machine.status, machine.error_description)
-        )
-
-    def test_mark_broken_passes_comment(self):
-        machine = factory.make_Node(
-            status=NODE_STATUS.COMMISSIONING, owner=self.logged_in_user)
-        machine_mark_broken = self.patch(node_module.Machine, 'mark_broken')
-        comment = factory.make_name('comment')
-        self.client.post(
-            self.get_machine_uri(machine),
-            {'op': 'mark_broken', 'comment': comment})
-        self.assertThat(
-            machine_mark_broken,
-            MockCalledOnceWith(self.logged_in_user, comment))
-
-    def test_mark_broken_handles_missing_comment(self):
-        machine = factory.make_Node(
-            status=NODE_STATUS.COMMISSIONING, owner=self.logged_in_user)
-        machine_mark_broken = self.patch(node_module.Machine, 'mark_broken')
-        self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_broken'})
-        self.assertThat(
-            machine_mark_broken,
-            MockCalledOnceWith(self.logged_in_user, None))
-
-    def test_mark_broken_requires_ownership(self):
-        machine = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
-        response = self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_broken'})
-        self.assertEqual(http.client.FORBIDDEN, response.status_code)
-
-    def test_mark_broken_allowed_from_any_other_state(self):
-        self.patch(node_module.Node, "_stop")
-        for status, _ in NODE_STATUS_CHOICES:
-            if status == NODE_STATUS.BROKEN:
-                continue
-
-            machine = factory.make_Node(
-                status=status, owner=self.logged_in_user)
-            response = self.client.post(
-                self.get_machine_uri(machine), {'op': 'mark_broken'})
-            self.expectThat(
-                response.status_code, Equals(http.client.OK), response)
-            machine = reload_object(machine)
-            self.expectThat(machine.status, Equals(NODE_STATUS.BROKEN))
-
-
-class TestMarkFixed(APITestCase):
-    """Tests for /api/2.0/machines/<machine>/?op=mark_fixed"""
-
-    def get_machine_uri(self, machine):
-        """Get the API URI for `machine`."""
-        return reverse('machine_handler', args=[machine.system_id])
-
-    def test_mark_fixed_changes_status(self):
-        self.become_admin()
-        machine = factory.make_Node(status=NODE_STATUS.BROKEN)
-        response = self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_fixed'})
-        self.assertEqual(http.client.OK, response.status_code)
-        self.assertEqual(NODE_STATUS.READY, reload_object(machine).status)
-
-    def test_mark_fixed_requires_admin(self):
-        machine = factory.make_Node(status=NODE_STATUS.BROKEN)
-        response = self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_fixed'})
-        self.assertEqual(http.client.FORBIDDEN, response.status_code)
-
-    def test_mark_fixed_passes_comment(self):
-        self.become_admin()
-        machine = factory.make_Node(status=NODE_STATUS.BROKEN)
-        machine_mark_fixed = self.patch(node_module.Machine, 'mark_fixed')
-        comment = factory.make_name('comment')
-        self.client.post(
-            self.get_machine_uri(machine),
-            {'op': 'mark_fixed', 'comment': comment})
-        self.assertThat(
-            machine_mark_fixed,
-            MockCalledOnceWith(self.logged_in_user, comment))
-
-    def test_mark_fixed_handles_missing_comment(self):
-        self.become_admin()
-        machine = factory.make_Node(status=NODE_STATUS.BROKEN)
-        machine_mark_fixed = self.patch(node_module.Machine, 'mark_fixed')
-        self.client.post(
-            self.get_machine_uri(machine), {'op': 'mark_fixed'})
-        self.assertThat(
-            machine_mark_fixed,
-            MockCalledOnceWith(self.logged_in_user, None))
-
-
 class TestPowerParameters(APITestCase):
     def get_machine_uri(self, machine):
         """Get the API URI for `machine`."""

=== modified file 'src/maasserver/api/tests/test_machines.py'
--- src/maasserver/api/tests/test_machines.py	2016-02-29 07:45:25 +0000
+++ src/maasserver/api/tests/test_machines.py	2016-03-02 18:21:51 +0000
@@ -107,57 +107,15 @@
             name=domainname, defaults={'authoritative': True})
         factory.make_Node(
             hostname=hostname, domain=domain)
-        expected_hostname = "%s.%s" % (hostname, domainname)
+        fqdn = "%s.%s" % (hostname, domainname)
         response = self.client.get(reverse('machines_handler'))
         self.assertEqual(
             http.client.OK.value, response.status_code, response.content)
         parsed_result = json.loads(
             response.content.decode(settings.DEFAULT_CHARSET))
         self.assertItemsEqual(
-            [expected_hostname],
-            [machine.get('hostname') for machine in parsed_result])
-
-
-class AnonymousIsRegisteredAPITest(MAASServerTestCase):
-
-    def test_is_registered_returns_True_if_machine_registered(self):
-        mac_address = factory.make_mac_address()
-        factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, mac_address=mac_address)
-        response = self.client.get(
-            reverse('machines_handler'),
-            {'op': 'is_registered', 'mac_address': mac_address})
-        self.assertEqual(
-            (http.client.OK.value, "true"),
-            (response.status_code,
-             response.content.decode(settings.DEFAULT_CHARSET)))
-
-    def test_is_registered_normalizes_mac_address(self):
-        # These two non-normalized MAC addresses are the same.
-        non_normalized_mac_address = 'AA-bb-cc-dd-ee-ff'
-        non_normalized_mac_address2 = 'aabbccddeeff'
-        factory.make_Interface(
-            INTERFACE_TYPE.PHYSICAL, mac_address=non_normalized_mac_address)
-        response = self.client.get(
-            reverse('machines_handler'),
-            {
-                'op': 'is_registered',
-                'mac_address': non_normalized_mac_address2
-            })
-        self.assertEqual(
-            (http.client.OK.value, "true"),
-            (response.status_code,
-             response.content.decode(settings.DEFAULT_CHARSET)))
-
-    def test_is_registered_returns_False_if_machine_not_registered(self):
-        mac_address = factory.make_mac_address()
-        response = self.client.get(
-            reverse('machines_handler'),
-            {'op': 'is_registered', 'mac_address': mac_address})
-        self.assertEqual(
-            (http.client.OK.value, "false"),
-            (response.status_code,
-             response.content.decode(settings.DEFAULT_CHARSET)))
+            [fqdn],
+            [machine.get('fqdn') for machine in parsed_result])
 
 
 def extract_system_ids(parsed_result):
@@ -649,7 +607,7 @@
         domain_name = desired_machine.domain.name
         self.assertEqual(
             "%s.%s" % (desired_machine.hostname, domain_name),
-            parsed_result['hostname'])
+            parsed_result['fqdn'])
 
     def test_POST_allocate_would_rather_fail_than_disobey_constraint(self):
         # If "allocate" is passed a constraint, it won't return a machine
@@ -693,7 +651,7 @@
         self.assertEqual(
             "%s.%s" % (machine.hostname, domain_name),
             json.loads(
-                response.content.decode(settings.DEFAULT_CHARSET))['hostname'])
+                response.content.decode(settings.DEFAULT_CHARSET))['fqdn'])
 
     def test_POST_allocate_treats_unknown_name_as_resource_conflict(self):
         # A name constraint naming an unknown machine produces a resource
@@ -1693,7 +1651,7 @@
         self.assertThat(
             add_chassis, MockCalledOnceWith(
                 self.logged_in_user.username, 'virsh', hostname, None, None,
-                True, None, None, None, None))
+                True, None, None, None, None, None))
 
     def test_POST_add_chassis_sends_accept_all_false_when_not_true(self):
         self.become_admin()
@@ -1716,7 +1674,7 @@
         self.assertThat(
             add_chassis, MockCalledOnceWith(
                 self.logged_in_user.username, 'virsh', hostname, None, None,
-                False, None, None, None, None))
+                False, None, None, None, None, None))
 
     def test_POST_add_chassis_sends_prefix_filter(self):
         self.become_admin()
@@ -1747,8 +1705,8 @@
             self.assertThat(
                 add_chassis, MockCalledWith(
                     self.logged_in_user.username, chassis_type, hostname,
-                    username, password, False, prefix_filter, None, None, None
-                    ))
+                    username, password, False, None, prefix_filter, None,
+                    None, None))
 
     def test_POST_add_chassis_only_allows_prefix_filter_on_virtual_chassis(
             self):
@@ -1861,7 +1819,7 @@
             self.assertThat(
                 add_chassis, MockCalledWith(
                     self.logged_in_user.username, chassis_type, hostname,
-                    username, password, False, None, None, port, None))
+                    username, password, False, None, None, None, port, None))
 
     def test_POST_add_chasis_only_allows_port_with_vmware_and_msftocs(self):
         self.become_admin()
@@ -1910,7 +1868,7 @@
         self.assertThat(
             add_chassis, MockCalledWith(
                 self.logged_in_user.username, 'vmware', hostname, username,
-                password, False, None, None, None, protocol))
+                password, False, None, None, None, None, protocol))
 
     def test_POST_add_chasis_only_allows_protocol_with_vmware(self):
         self.become_admin()
@@ -1933,6 +1891,71 @@
                 ("protocol is unavailable with the %s chassis type" %
                  chassis_type).encode('utf-8'), response.content)
 
+    def test_POST_add_chassis_accept_domain_by_name(self):
+        self.become_admin()
+        rack = factory.make_RackController()
+        accessible_by_url = self.patch(
+            machines_module.RackController.objects, 'get_accessible_by_url')
+        accessible_by_url.return_value = rack
+        add_chassis = self.patch(rack, 'add_chassis')
+        hostname = factory.make_url()
+        domain = factory.make_Domain()
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'op': 'add_chassis',
+                'chassis_type': 'virsh',
+                'hostname': hostname,
+                'domain': domain.name,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertThat(
+            add_chassis, MockCalledWith(
+                self.logged_in_user.username, 'virsh', hostname, None,
+                None, False, domain.name, None, None, None, None))
+
+    def test_POST_add_chassis_accept_domain_by_id(self):
+        self.become_admin()
+        rack = factory.make_RackController()
+        accessible_by_url = self.patch(
+            machines_module.RackController.objects, 'get_accessible_by_url')
+        accessible_by_url.return_value = rack
+        add_chassis = self.patch(rack, 'add_chassis')
+        hostname = factory.make_url()
+        domain = factory.make_Domain()
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'op': 'add_chassis',
+                'chassis_type': 'virsh',
+                'hostname': hostname,
+                'domain': domain.id,
+            })
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        self.assertThat(
+            add_chassis, MockCalledWith(
+                self.logged_in_user.username, 'virsh', hostname, None,
+                None, False, domain.name, None, None, None, None))
+
+    def test_POST_add_chassis_validates_domain(self):
+        self.become_admin()
+        domain = factory.make_name('domain')
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'op': 'add_chassis',
+                'chassis_type': 'virsh',
+                'hostname': factory.make_url(),
+                'domain': domain,
+            })
+        self.assertEqual(
+            http.client.NOT_FOUND, response.status_code, response.content)
+        self.assertEqual(
+            ("Unable to find specified domain %s" % domain).encode('utf-8'),
+            response.content)
+
     def test_POST_add_chassis_accepts_system_id_for_rack_controller(self):
         self.become_admin()
         subnet = factory.make_Subnet()
@@ -1956,7 +1979,7 @@
         self.assertThat(
             add_chassis, MockCalledWith(
                 self.logged_in_user.username, 'virsh', hostname, None, None,
-                False, None, None, None, None))
+                False, None, None, None, None, None))
 
     def test_POST_add_chassis_accepts_hostname_for_rack_controller(self):
         self.become_admin()
@@ -1981,7 +2004,7 @@
         self.assertThat(
             add_chassis, MockCalledWith(
                 self.logged_in_user.username, 'virsh', hostname, None, None,
-                False, None, None, None, None))
+                False, None, None, None, None, None))
 
     def test_POST_add_chassis_rejects_invalid_rack_controller(self):
         self.become_admin()

=== modified file 'src/maasserver/api/tests/test_node.py'
--- src/maasserver/api/tests/test_node.py	2016-02-26 18:39:26 +0000
+++ src/maasserver/api/tests/test_node.py	2016-03-02 18:21:51 +0000
@@ -6,18 +6,13 @@
 __all__ = []
 
 import http.client
-from io import StringIO
-import sys
 
 import bson
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from maasserver.enum import (
-    INTERFACE_TYPE,
-    IPADDRESS_TYPE,
     NODE_STATUS,
     NODE_STATUS_CHOICES,
-    NODE_STATUS_CHOICES_DICT,
 )
 from maasserver.models import (
     Node,
@@ -44,24 +39,10 @@
 
 class NodeAnonAPITest(MAASServerTestCase):
 
-    def setUp(self):
-        super(NodeAnonAPITest, self).setUp()
-        self.patch(node_module, 'power_on_node')
-        self.patch(node_module, 'power_off_node')
-        self.patch(node_module, 'power_driver_check')
-
-    def test_anon_api_doc(self):
-        # The documentation is accessible to anon users.
-        self.patch(sys, "stderr", StringIO())
-        response = self.client.get(reverse('api-doc'))
-        self.assertEqual(http.client.OK, response.status_code)
-        # No error or warning are emitted by docutils.
-        self.assertEqual("", sys.stderr.getvalue())
-
     def test_node_init_user_cannot_access(self):
         token = NodeKey.objects.get_token_for_node(factory.make_Node())
         client = OAuthAuthenticatedClient(get_node_init_user(), token)
-        response = client.get(reverse('nodes_handler'), {'op': 'list'})
+        response = client.get(reverse('nodes_handler'))
         self.assertEqual(http.client.FORBIDDEN, response.status_code)
 
 
@@ -87,13 +68,6 @@
 class TestNodeAPI(APITestCase):
     """Tests for /api/2.0/nodes/<node>/."""
 
-    def setUp(self):
-        super(TestNodeAPI, self).setUp()
-        self.patch(node_module, 'power_on_node')
-        self.patch(node_module, 'power_off_node')
-        self.patch(node_module, 'power_driver_check')
-        self.patch(node_module.Node, '_power_control_node')
-
     def test_handler_path(self):
         self.assertEqual(
             '/api/2.0/nodes/node-name/',
@@ -104,62 +78,6 @@
         """Get the API URI for `node`."""
         return reverse('node_handler', args=[node.system_id])
 
-    def test_GET_returns_node(self):
-        # The api allows for fetching a single Node (using system_id).
-        node = factory.make_Node()
-        response = self.client.get(self.get_node_uri(node))
-
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        domain_name = node.domain.name
-        self.assertEqual(
-            "%s.%s" % (node.hostname, domain_name),
-            parsed_result['hostname'])
-        self.assertEqual(node.system_id, parsed_result['system_id'])
-
-    def test_GET_returns_associated_tag(self):
-        node = factory.make_Node()
-        tag = factory.make_Tag()
-        node.tags.add(tag)
-        response = self.client.get(self.get_node_uri(node))
-
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual([tag.name], parsed_result['tag_names'])
-
-    def test_GET_returns_associated_ip_addresses(self):
-        node = factory.make_Node(disable_ipv4=False)
-        nic = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
-        subnet = factory.make_Subnet()
-        ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
-        lease = factory.make_StaticIPAddress(
-            alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=ip,
-            interface=nic, subnet=subnet)
-        response = self.client.get(self.get_node_uri(node))
-
-        self.assertEqual(
-            http.client.OK, response.status_code, response.content)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual([lease.ip], parsed_result['ip_addresses'])
-
-    def test_GET_returns_interface_set(self):
-        node = factory.make_Node()
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertIn('interface_set', parsed_result)
-
-    def test_GET_returns_zone(self):
-        node = factory.make_Node()
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(
-            [node.zone.name, node.zone.description],
-            [
-                parsed_result['zone']['name'],
-                parsed_result['zone']['description']])
-
     def test_GET_refuses_to_access_nonexistent_node(self):
         # When fetching a Node, the api returns a 'Not Found' (404) error
         # if no node is found.
@@ -182,84 +100,6 @@
         self.assertEqual(
             "Not Found", response.content.decode(settings.DEFAULT_CHARSET))
 
-    def test_GET_returns_owner_name_when_allocated_to_self(self):
-        node = factory.make_Node(
-            status=NODE_STATUS.ALLOCATED, owner=self.logged_in_user)
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(node.owner.username, parsed_result["owner"])
-
-    def test_GET_returns_owner_name_when_allocated_to_other_user(self):
-        node = factory.make_Node(
-            status=NODE_STATUS.ALLOCATED, owner=factory.make_User())
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(node.owner.username, parsed_result["owner"])
-
-    def test_GET_returns_empty_owner_when_not_allocated(self):
-        node = factory.make_Node(status=NODE_STATUS.READY)
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(None, parsed_result["owner"])
-
-    def test_GET_returns_physical_block_devices(self):
-        node = factory.make_Node(with_boot_disk=False)
-        devices = [
-            factory.make_PhysicalBlockDevice(node=node)
-            for _ in range(3)
-        ]
-        response = self.client.get(self.get_node_uri(node))
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        parsed_devices = [
-            device['name']
-            for device in parsed_result['physicalblockdevice_set']
-        ]
-        self.assertItemsEqual(
-            [device.name for device in devices], parsed_devices)
-
-    def test_GET_returns_min_hwe_kernel_and_hwe_kernel(self):
-        node = factory.make_Node()
-        response = self.client.get(self.get_node_uri(node))
-
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(None, parsed_result['min_hwe_kernel'])
-        self.assertEqual(None, parsed_result['hwe_kernel'])
-
-    def test_GET_returns_min_hwe_kernel(self):
-        node = factory.make_Node(min_hwe_kernel="hwe-v")
-        response = self.client.get(self.get_node_uri(node))
-
-        self.assertEqual(http.client.OK, response.status_code)
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual("hwe-v", parsed_result['min_hwe_kernel'])
-
-    def test_GET_returns_status_message_with_most_recent_event(self):
-        """Makes sure the most recent event from this node is shown in the
-        status_message attribute."""
-        # The first event won't be returned.
-        event = factory.make_Event(description="Uninteresting event")
-        node = event.node
-        # The second (and last) event will be returned.
-        message = "Interesting event"
-        factory.make_Event(description=message, node=node)
-        response = self.client.get(self.get_node_uri(node))
-        parsed_result = json_load_bytes(response.content)
-        self.assertEqual(message, parsed_result['status_message'])
-
-    def test_GET_returns_status_name(self):
-        """GET should display the node status as a user-friendly string."""
-        for status in NODE_STATUS_CHOICES_DICT:
-            node = factory.make_Node(status=status)
-            response = self.client.get(self.get_node_uri(node))
-            parsed_result = json_load_bytes(response.content)
-            self.assertEqual(NODE_STATUS_CHOICES_DICT[status],
-                             parsed_result['status_name'])
-
     def test_resource_uri_points_back_at_machine(self):
         self.become_admin()
         # When a Machine is returned by the API, the field 'resource_uri'

=== modified file 'src/maasserver/api/tests/test_nodes.py'
--- src/maasserver/api/tests/test_nodes.py	2016-02-26 18:39:26 +0000
+++ src/maasserver/api/tests/test_nodes.py	2016-03-02 18:21:51 +0000
@@ -20,10 +20,7 @@
     NODE_TYPE,
 )
 from maasserver.exceptions import MAASAPIValidationError
-from maasserver.testing.api import (
-    APITestCase,
-    MultipleUsersScenarios,
-)
+from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils import ignore_unused
@@ -31,33 +28,6 @@
 from maastesting.djangotestcase import count_queries
 
 
-class NodeHostnameTest(MultipleUsersScenarios,
-                       MAASServerTestCase):
-
-    scenarios = [
-        ('user', dict(userfactory=factory.make_User)),
-        ('admin', dict(userfactory=factory.make_admin)),
-    ]
-
-    def test_GET_returns_fqdn_with_proper_domain_name(self):
-        # The FQDN for a host is properly constructed.
-        hostname_without_domain = factory.make_name('hostname')
-        domain = factory.make_Domain(name=factory.make_name('domain'))
-        hostname_with_domain = '%s.%s' % (
-            hostname_without_domain, domain.name)
-        factory.make_Node(
-            hostname=hostname_with_domain)
-        expected_hostname = hostname_with_domain
-        response = self.client.get(reverse('nodes_handler'))
-        self.assertEqual(
-            http.client.OK.value, response.status_code, response.content)
-        parsed_result = json.loads(
-            response.content.decode(settings.DEFAULT_CHARSET))
-        self.assertItemsEqual(
-            [expected_hostname],
-            [node.get('hostname') for node in parsed_result])
-
-
 class AnonymousIsRegisteredAPITest(MAASServerTestCase):
 
     def test_is_registered_returns_True_if_node_registered(self):

=== modified file 'src/maasserver/api/tests/test_rackcontroller.py'
--- src/maasserver/api/tests/test_rackcontroller.py	2016-02-18 00:34:58 +0000
+++ src/maasserver/api/tests/test_rackcontroller.py	2016-03-02 18:21:51 +0000
@@ -12,6 +12,7 @@
     explain_unexpected_response,
 )
 from maasserver.testing.factory import factory
+from maasserver.utils.converters import json_load_bytes
 from maastesting.matchers import MockCalledOnceWith
 
 
@@ -74,7 +75,28 @@
         self.assertEqual(
             '/api/2.0/rackcontrollers/', reverse('rackcontrollers_handler'))
 
-    @staticmethod
-    def get_rack_uri(rack):
-        """Get the API URI for `rack`."""
-        return reverse('rackcontrollers_handler')
+    def test_read_returns_limited_fields(self):
+        factory.make_RackController(owner=self.logged_in_user)
+        response = self.client.get(reverse('rackcontrollers_handler'))
+        parsed_result = json_load_bytes(response.content)
+        self.assertItemsEqual(
+            [
+                'system_id',
+                'hostname',
+                'domain',
+                'fqdn',
+                'architecture',
+                'cpu_count',
+                'memory',
+                'swap_size',
+                'osystem',
+                'resource_uri',
+                'distro_series',
+                'interface_set',
+                'ip_addresses',
+                'zone',
+                'status_action',
+                'node_type',
+                'node_type_name',
+            ],
+            list(parsed_result[0]))

=== modified file 'src/maasserver/api/users.py'
--- src/maasserver/api/users.py	2016-02-03 10:27:11 +0000
+++ src/maasserver/api/users.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `User`."""

=== modified file 'src/maasserver/api/utils.py'
--- src/maasserver/api/utils.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/utils.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Helpers for Piston-based MAAS APIs."""

=== modified file 'src/maasserver/api/version.py'
--- src/maasserver/api/version.py	2015-12-11 20:45:50 +0000
+++ src/maasserver/api/version.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handler: API Version."""

=== modified file 'src/maasserver/api/volume_groups.py'
--- src/maasserver/api/volume_groups.py	2015-12-16 00:01:56 +0000
+++ src/maasserver/api/volume_groups.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `VolumeGroups`."""
@@ -46,7 +46,7 @@
 
 
 class VolumeGroupsHandler(OperationsHandler):
-    """Manage volume groups on a node."""
+    """Manage volume groups on a machine."""
     api_doc_section_name = "Volume groups"
     update = delete = None
     fields = DISPLAYED_VOLUME_GROUP_FIELDS
@@ -80,7 +80,7 @@
             system_id, request.user, NODE_PERMISSION.ADMIN)
         if machine.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot create volume group because the node is not Ready.")
+                "Cannot create volume group because the machine is not Ready.")
         form = CreateVolumeGroupForm(machine, data=request.data)
         if not form.is_valid():
             raise MAASAPIValidationError(form.errors)
@@ -89,7 +89,7 @@
 
 
 class VolumeGroupHandler(OperationsHandler):
-    """Manage volume group on a node."""
+    """Manage volume group on a machine."""
     api_doc_section_name = "Volume group"
     create = None
     model = VolumeGroup
@@ -143,15 +143,15 @@
         ]
 
     def read(self, request, system_id, volume_group_id):
-        """Read volume group on node.
+        """Read volume group on a machine.
 
-        Returns 404 if the node or volume group is not found.
+        Returns 404 if the machine or volume group is not found.
         """
         return VolumeGroup.objects.get_object_or_404(
             system_id, volume_group_id, request.user, NODE_PERMISSION.VIEW)
 
     def update(self, request, system_id, volume_group_id):
-        """Read volume group on node.
+        """Read volume group on a machine.
 
         :param name: Name of the volume group.
         :param uuid: UUID of the volume group.
@@ -161,15 +161,15 @@
         :param add_partitions: Partitions to add to the volume group.
         :param remove_partitions: Partitions to remove from the volume group.
 
-        Returns 404 if the node or volume group is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or volume group is not found.
+        Returns 409 if the machine is not Ready.
         """
         volume_group = VolumeGroup.objects.get_object_or_404(
             system_id, volume_group_id, request.user, NODE_PERMISSION.ADMIN)
         node = volume_group.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot update volume group because the node is not Ready.")
+                "Cannot update volume group because the machine is not Ready.")
         form = UpdateVolumeGroupForm(volume_group, data=request.data)
         if not form.is_valid():
             raise MAASAPIValidationError(form.errors)
@@ -177,17 +177,17 @@
             return form.save()
 
     def delete(self, request, system_id, volume_group_id):
-        """Delete volume group on node.
+        """Delete volume group on a machine.
 
-        Returns 404 if the node or volume group is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or volume group is not found.
+        Returns 409 if the machine is not Ready.
         """
         volume_group = VolumeGroup.objects.get_object_or_404(
             system_id, volume_group_id, request.user, NODE_PERMISSION.ADMIN)
         node = volume_group.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete volume group because the node is not Ready.")
+                "Cannot delete volume group because the machine is not Ready.")
         volume_group.delete()
         return rc.DELETED
 
@@ -199,15 +199,16 @@
         :param uuid: (optional) UUID of the logical volume.
         :param size: Size of the logical volume.
 
-        Returns 404 if the node or volume group is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or volume group is not found.
+        Returns 409 if the machine is not Ready.
         """
         volume_group = VolumeGroup.objects.get_object_or_404(
             system_id, volume_group_id, request.user, NODE_PERMISSION.ADMIN)
         node = volume_group.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot create logical volume because the node is not Ready.")
+                "Cannot create logical volume because the machine is not "
+                "Ready.")
         form = CreateLogicalVolumeForm(volume_group, data=request.data)
         if not form.is_valid():
             raise MAASAPIValidationError(form.errors)
@@ -221,15 +222,16 @@
         :param id: ID of the logical volume.
 
         Returns 403 if no logical volume with id.
-        Returns 404 if the node or volume group is not found.
-        Returns 409 if the node is not Ready.
+        Returns 404 if the machine or volume group is not found.
+        Returns 409 if the machine is not Ready.
         """
         volume_group = VolumeGroup.objects.get_object_or_404(
             system_id, volume_group_id, request.user, NODE_PERMISSION.ADMIN)
         node = volume_group.get_node()
         if node.status != NODE_STATUS.READY:
             raise NodeStateViolation(
-                "Cannot delete logical volume because the node is not Ready.")
+                "Cannot delete logical volume because the machine is not "
+                "Ready.")
         volume_id = get_mandatory_param(request.data, 'id')
         try:
             logical_volume = volume_group.virtual_devices.get(id=volume_id)

=== modified file 'src/maasserver/api/zones.py'
--- src/maasserver/api/zones.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/api/zones.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """API handlers: `Zone`."""

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2016-03-01 21:59:22 +0000
+++ src/maasserver/forms.py	2016-03-02 18:21:51 +0000
@@ -1,11 +1,12 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Forms."""
 
 __all__ = [
+    "AdminMachineForm",
+    "AdminMachineWithMACAddressesForm",
     "AdminNodeForm",
-    "AdminNodeWithMACAddressesForm",
     "BootSourceForm",
     "BootSourceSelectionForm",
     "BootSourceSettingsForm",
@@ -13,14 +14,17 @@
     "ClaimIPForMACForm",
     "CommissioningForm",
     "CommissioningScriptForm",
+    "get_machine_edit_form",
+    "get_machine_create_form",
     "CreatePhysicalBlockDeviceForm",
-    "get_node_create_form",
     "get_node_edit_form",
     "list_all_usable_architectures",
     "MAASAndNetworkForm",
     "MountFilesystemForm",
     "NetworksListingForm",
-    "NodeWithMACAddressesForm",
+    "NodeChoiceField",
+    "MachineWithMACAddressesForm",
+    "CreatePhysicalBlockDeviceForm",
     "ReleaseIPForm",
     "SSHKeyForm",
     "SSLKeyForm",
@@ -102,10 +106,12 @@
     CacheSet,
     Config,
     Device,
+    Domain,
     Filesystem,
     Interface,
     LargeFile,
     LicenseKey,
+    Machine,
     Node,
     Partition,
     PartitionTable,
@@ -371,10 +377,10 @@
 class NodeForm(MAASModelForm):
     def __init__(self, request=None, *args, **kwargs):
         super(NodeForm, self).__init__(*args, **kwargs)
+
         # Even though it doesn't need it and doesn't use it, this form accepts
         # a parameter named 'request' because it is used interchangingly
-        # with AdminNodeForm which actually uses this parameter.
-
+        # with AdminMachineForm which actually uses this parameter.
         instance = kwargs.get('instance')
         if instance is None or instance.owner is None:
             self.has_owner = False
@@ -384,78 +390,9 @@
         # Are we creating a new node object?
         self.new_node = (instance is None)
 
-        self.set_up_architecture_field()
-        if self.has_owner:
-            self.set_up_osystem_and_distro_series_fields(instance)
-
         self.fields['disable_ipv4'] = forms.BooleanField(
             label="", required=False)
 
-        # We only want the license key field to render in the UI if the `OS`
-        # and `Release` fields are also present.
-        if self.has_owner:
-            self.fields['license_key'] = forms.CharField(
-                label="License Key", required=False, help_text=(
-                    "License key for operating system"),
-                max_length=30)
-        else:
-            self.fields['license_key'] = forms.CharField(
-                label="", required=False, widget=forms.HiddenInput())
-
-    def set_up_architecture_field(self):
-        """Create the `architecture` field.
-
-        This needs to be done on the fly so that we can pass a dynamic list of
-        usable architectures.
-        """
-        architectures = list_all_usable_architectures()
-        default_arch = pick_default_architecture(architectures)
-        if len(architectures) == 0:
-            choices = [BLANK_CHOICE]
-        else:
-            choices = list_architecture_choices(architectures)
-        invalid_arch_message = compose_invalid_choice_text(
-            'architecture', choices)
-        self.fields['architecture'] = forms.ChoiceField(
-            choices=choices, required=False, initial=default_arch,
-            error_messages={'invalid_choice': invalid_arch_message})
-
-    def set_up_osystem_and_distro_series_fields(self, instance):
-        """Create the `osystem` and `distro_series` fields.
-
-        This needs to be done on the fly so that we can pass a dynamic list of
-        usable operating systems and distro_series.
-        """
-        osystems = list_all_usable_osystems()
-        releases = list_all_usable_releases(osystems)
-        if self.has_owner:
-            os_choices = list_osystem_choices(osystems)
-            distro_choices = list_release_choices(releases)
-            invalid_osystem_message = compose_invalid_choice_text(
-                'osystem', os_choices)
-            invalid_distro_series_message = compose_invalid_choice_text(
-                'distro_series', distro_choices)
-            self.fields['osystem'] = forms.ChoiceField(
-                label="OS", choices=os_choices, required=False, initial='',
-                error_messages={'invalid_choice': invalid_osystem_message})
-            self.fields['distro_series'] = forms.ChoiceField(
-                label="Release", choices=distro_choices,
-                required=False, initial='',
-                error_messages={
-                    'invalid_choice': invalid_distro_series_message})
-        else:
-            self.fields['osystem'] = forms.ChoiceField(
-                label="", required=False, widget=forms.HiddenInput())
-            self.fields['distro_series'] = forms.ChoiceField(
-                label="", required=False, widget=forms.HiddenInput())
-        if instance is not None:
-            initial_value = get_distro_series_initial(osystems, instance)
-            if instance is not None:
-                self.initial['distro_series'] = initial_value
-
-    def clean_distro_series(self):
-        return clean_distro_series_field(self, 'distro_series', 'osystem')
-
     def clean_disable_ipv4(self):
         # Boolean fields only show up in UI form submissions as "true" (if the
         # box was checked) or not at all (if the box was not checked).  This
@@ -495,6 +432,122 @@
         except ValueError:
             raise ValidationError('Invalid size for swap: %s' % swap_size)
 
+    def clean_domain(self):
+        domain = self.cleaned_data.get('domain')
+        if not domain:
+            return None
+        try:
+            return Domain.objects.get(id=int(domain))
+        except ValueError:
+            try:
+                return Domain.objects.get(name=domain)
+            except Domain.DoesNotExist:
+                raise ValidationError("Unable to find domain %s" % domain)
+
+    hostname = forms.CharField(
+        label="Host name", required=False, help_text=(
+            "The hostname of the machine"))
+
+    domain = forms.CharField(
+        label="Domain name", required=False, help_text=(
+            "The domain name of the machine."))
+
+    swap_size = forms.CharField(
+        label="Swap size", required=False, help_text=(
+            "The size of the swap file in bytes. The field also accepts K, M, "
+            "G and T meaning kilobytes, megabytes, gigabytes and terabytes."))
+
+    class Meta:
+        model = Node
+
+        # Fields that the form should generate automatically from the
+        # model:
+        # Note: fields have to be added here even if they were defined manually
+        # elsewhere in the form
+        fields = (
+            'hostname',
+            'domain',
+            'disable_ipv4',
+            'swap_size',
+            )
+
+
+class MachineForm(NodeForm):
+    def __init__(self, request=None, *args, **kwargs):
+        super(MachineForm, self).__init__(*args, **kwargs)
+
+        # Even though it doesn't need it and doesn't use it, this form accepts
+        # a parameter named 'request' because it is used interchangingly
+        # with AdminMachineForm which actually uses this parameter.
+        instance = kwargs.get('instance')
+
+        self.set_up_architecture_field()
+        # We only want the license key field to render in the UI if the `OS`
+        # and `Release` fields are also present.
+        if self.has_owner:
+            self.set_up_osystem_and_distro_series_fields(instance)
+            self.fields['license_key'] = forms.CharField(
+                label="License Key", required=False, help_text=(
+                    "License key for operating system"),
+                max_length=30)
+        else:
+            self.fields['license_key'] = forms.CharField(
+                label="", required=False, widget=forms.HiddenInput())
+
+    def set_up_architecture_field(self):
+        """Create the `architecture` field.
+
+        This needs to be done on the fly so that we can pass a dynamic list of
+        usable architectures.
+        """
+        architectures = list_all_usable_architectures()
+        default_arch = pick_default_architecture(architectures)
+        if len(architectures) == 0:
+            choices = [BLANK_CHOICE]
+        else:
+            choices = list_architecture_choices(architectures)
+        invalid_arch_message = compose_invalid_choice_text(
+            'architecture', choices)
+        self.fields['architecture'] = forms.ChoiceField(
+            choices=choices, required=False, initial=default_arch,
+            error_messages={'invalid_choice': invalid_arch_message})
+
+    def set_up_osystem_and_distro_series_fields(self, instance):
+        """Create the `osystem` and `distro_series` fields.
+
+        This needs to be done on the fly so that we can pass a dynamic list of
+        usable operating systems and distro_series.
+        """
+        osystems = list_all_usable_osystems()
+        releases = list_all_usable_releases(osystems)
+        if self.has_owner:
+            os_choices = list_osystem_choices(osystems)
+            distro_choices = list_release_choices(releases)
+            invalid_osystem_message = compose_invalid_choice_text(
+                'osystem', os_choices)
+            invalid_distro_series_message = compose_invalid_choice_text(
+                'distro_series', distro_choices)
+            self.fields['osystem'] = forms.ChoiceField(
+                label="OS", choices=os_choices, required=False, initial='',
+                error_messages={'invalid_choice': invalid_osystem_message})
+            self.fields['distro_series'] = forms.ChoiceField(
+                label="Release", choices=distro_choices,
+                required=False, initial='',
+                error_messages={
+                    'invalid_choice': invalid_distro_series_message})
+        else:
+            self.fields['osystem'] = forms.ChoiceField(
+                label="", required=False, widget=forms.HiddenInput())
+            self.fields['distro_series'] = forms.ChoiceField(
+                label="", required=False, widget=forms.HiddenInput())
+        if instance is not None:
+            initial_value = get_distro_series_initial(osystems, instance)
+            if instance is not None:
+                self.initial['distro_series'] = initial_value
+
+    def clean_distro_series(self):
+        return clean_distro_series_field(self, 'distro_series', 'osystem')
+
     def clean_min_hwe_kernel(self):
         min_hwe_kernel = self.cleaned_data.get('min_hwe_kernel')
         if self.new_node and not min_hwe_kernel:
@@ -503,7 +556,7 @@
         return validate_min_hwe_kernel(min_hwe_kernel)
 
     def clean(self):
-        cleaned_data = super(NodeForm, self).clean()
+        cleaned_data = super(MachineForm, self).clean()
 
         if not self.instance.hwe_kernel:
             osystem = cleaned_data.get('osystem')
@@ -520,7 +573,7 @@
         return cleaned_data
 
     def is_valid(self):
-        is_valid = super(NodeForm, self).is_valid()
+        is_valid = super(MachineForm, self).is_valid()
         if not is_valid:
             return False
         if len(list_all_usable_architectures()) == 0:
@@ -585,41 +638,20 @@
         self.is_bound = True
         self.data['hwe_kernel'] = hwe_kernel
 
-    hostname = forms.CharField(
-        label="Host name", required=False, help_text=(
-            "The FQDN (Fully Qualified Domain Name) is derived from the "
-            "host name: If the cluster controller for this node is managing "
-            "DNS then the domain part in the host name (if any) is replaced "
-            "by the domain defined on the cluster; if the cluster controller "
-            "does not manage DNS, then the host name as entered will be the "
-            "FQDN."))
-
-    swap_size = forms.CharField(
-        label="Swap size", required=False, help_text=(
-            "The size of the swap file in bytes. The field also accepts K, M, "
-            "G and T meaning kilobytes, megabytes, gigabytes and terabytes."))
-
     class Meta:
-        model = Node
+        model = Machine
 
-        # Fields that the form should generate automatically from the
-        # model:
-        # Note: fields have to be added here even if they were defined manually
-        # elsewhere in the form
-        fields = (
-            'hostname',
+        fields = NodeForm.Meta.fields + (
             'architecture',
             'osystem',
             'distro_series',
             'license_key',
-            'disable_ipv4',
-            'swap_size',
             'min_hwe_kernel',
-            'hwe_kernel'
-            )
-
-
-class DeviceForm(MAASModelForm):
+            'hwe_kernel',
+        )
+
+
+class DeviceForm(NodeForm):
     parent = forms.ModelChoiceField(
         required=False, initial=None,
         queryset=Node.objects.all(), to_field_name='system_id')
@@ -627,8 +659,7 @@
     class Meta:
         model = Device
 
-        fields = (
-            'hostname',
+        fields = NodeForm.Meta.fields + (
             'parent',
         )
 
@@ -637,8 +668,6 @@
         self.request = request
 
         instance = kwargs.get('instance')
-        # Are we creating a new device object?
-        self.new_device = (instance is None)
         self.set_up_initial_device(instance)
 
     def set_up_initial_device(self, instance):
@@ -652,12 +681,13 @@
     def save(self, commit=True):
         device = super(DeviceForm, self).save(commit=False)
         device.node_type = NODE_TYPE.DEVICE
-        if self.new_device:
+        if self.new_node:
             # Set the owner: devices are owned by their creator.
             device.owner = self.request.user
         device.save()
         return device
 
+
 CLUSTER_NOT_AVAILABLE = mark_safe(
     "The cluster controller for this node is not responding; power type "
     "validation is not available. "
@@ -673,7 +703,6 @@
 
 class AdminNodeForm(NodeForm):
     """A `NodeForm` which includes fields that only an admin may change."""
-
     zone = forms.ModelChoiceField(
         label="Physical zone", required=False,
         initial=Zone.objects.get_default_zone,
@@ -699,7 +728,6 @@
             data=data, instance=instance, **kwargs)
         self.request = request
         self.set_up_initial_zone(instance)
-        AdminNodeForm.set_up_power_type(self, data, instance)
         # The zone field is not required because we want to be able
         # to omit it when using that form in the API.
         # We don't want the UI to show an entry for the 'empty' zone,
@@ -718,17 +746,47 @@
         if instance is not None:
             self.initial['zone'] = instance.zone.name
 
+    def save(self, *args, **kwargs):
+        """Persist the node into the database."""
+        node = super(AdminNodeForm, self).save(commit=False)
+        zone = self.cleaned_data.get('zone')
+        if zone:
+            node.zone = zone
+        if kwargs.get('commit', True):
+            node.save(*args, **kwargs)
+            self.save_m2m()  # Save many to many relations.
+        return node
+
+
+class AdminMachineForm(MachineForm, AdminNodeForm):
+    """A `MachineForm` which includes fields that only an admin may change."""
+
+    class Meta:
+        model = Machine
+
+        # Fields that the form should generate automatically from the
+        # model:
+        fields = MachineForm.Meta.fields + (
+            'cpu_count',
+            'memory',
+        )
+
+    def __init__(self, data=None, instance=None, request=None, **kwargs):
+        super(AdminMachineForm, self).__init__(
+            data=data, instance=instance, **kwargs)
+        AdminMachineForm.set_up_power_type(self, data, instance)
+
     @staticmethod
-    def _get_power_type(form, data, node):
+    def _get_power_type(form, data, machine):
         if data is None:
             data = {}
 
         power_type = data.get('power_type', form.initial.get('power_type'))
 
-        # If power_type is None (this is a node creation form or this
+        # If power_type is None (this is a machine creation form or this
         # form deals with an API call which does not change the value of
-        # 'power_type') or invalid: get the node's current 'power_type'
-        # value or the default value if this form is not linked to a node.
+        # 'power_type') or invalid: get the machine's current 'power_type'
+        # value or the default value if this form is not linked to a machine.
         try:
             power_types = get_power_types()
         except ClusterUnavailable as e:
@@ -741,17 +799,17 @@
             return ''
 
         if power_type not in power_types:
-            return '' if node is None else node.power_type
+            return '' if machine is None else machine.power_type
         return power_type
 
     @staticmethod
-    def set_up_power_type(form, data, node=None):
+    def set_up_power_type(form, data, machine=None):
         """Set up the 'power_type' and 'power_parameters' fields.
 
         This can't be done at the model level because the choices need to
         be generated on the fly by get_power_type_choices().
         """
-        power_type = AdminNodeForm._get_power_type(form, data, node)
+        power_type = AdminMachineForm._get_power_type(form, data, machine)
         choices = [BLANK_CHOICE] + get_power_type_choices()
         form.fields['power_type'] = forms.ChoiceField(
             required=False, choices=choices, initial=power_type)
@@ -782,30 +840,37 @@
         return cleaned_data
 
     def clean(self):
-        cleaned_data = super(AdminNodeForm, self).clean()
-        return AdminNodeForm.check_power_type(self, cleaned_data)
+        cleaned_data = super(AdminMachineForm, self).clean()
+        return AdminMachineForm.check_power_type(self, cleaned_data)
 
     @staticmethod
-    def set_power_type(form, node):
-        """Persist the node into the database."""
+    def set_power_type(form, machine):
+        """Persist the machine into the database."""
         power_type = form.cleaned_data.get('power_type')
         if power_type is not None:
-            node.power_type = power_type
+            machine.power_type = power_type
         power_parameters = form.cleaned_data.get('power_parameters')
         if power_parameters is not None:
-            node.power_parameters = power_parameters
+            machine.power_parameters = power_parameters
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
-        node = super(AdminNodeForm, self).save(commit=False)
+        machine = super(AdminMachineForm, self).save(commit=False)
         zone = self.cleaned_data.get('zone')
         if zone:
-            node.zone = zone
-        AdminNodeForm.set_power_type(self, node)
+            machine.zone = zone
+        AdminMachineForm.set_power_type(self, machine)
         if kwargs.get('commit', True):
-            node.save(*args, **kwargs)
+            machine.save(*args, **kwargs)
             self.save_m2m()  # Save many to many relations.
-        return node
+        return machine
+
+
+def get_machine_edit_form(user):
+    if user.is_superuser:
+        return AdminMachineForm
+    else:
+        return MachineForm
 
 
 def get_node_edit_form(user):
@@ -1008,40 +1073,41 @@
     """A form mixin which dynamically adds power_type and power_parameters to
     the list of fields.  This mixin also overrides the 'save' method to persist
     these fields and is intended to be used with a class inheriting from
-    NodeForm.
+    MachineForm.
     """
 
     def __init__(self, *args, **kwargs):
         super(WithPowerMixin, self).__init__(*args, **kwargs)
         self.data = self.data.copy()
-        AdminNodeForm.set_up_power_type(self, self.data)
+        AdminMachineForm.set_up_power_type(self, self.data)
 
     def clean(self):
         cleaned_data = super(WithPowerMixin, self).clean()
-        return AdminNodeForm.check_power_type(self, cleaned_data)
+        return AdminMachineForm.check_power_type(self, cleaned_data)
 
     def save(self, *args, **kwargs):
         """Persist the node into the database."""
         node = super(WithPowerMixin, self).save()
-        AdminNodeForm.set_power_type(self, node)
+        AdminMachineForm.set_power_type(self, node)
         node.save()
         return node
 
 
-class AdminNodeWithMACAddressesForm(WithMACAddressesMixin, AdminNodeForm):
-    """A version of the AdminNodeForm which includes the multi-MAC address
+class AdminMachineWithMACAddressesForm(
+        WithMACAddressesMixin, AdminMachineForm):
+    """A version of the AdminMachineForm which includes the multi-MAC address
     field.
     """
 
 
-class NodeWithMACAddressesForm(WithMACAddressesMixin, NodeForm):
-    """A version of the NodeForm which includes the multi-MAC address field.
+class MachineWithMACAddressesForm(WithMACAddressesMixin, MachineForm):
+    """A version of the MachineForm which includes the multi-MAC address field.
     """
 
 
-class NodeWithPowerAndMACAddressesForm(
-        WithPowerMixin, NodeWithMACAddressesForm):
-    """A version of the NodeForm which includes the power fields.
+class MachineWithPowerAndMACAddressesForm(
+        WithPowerMixin, MachineWithMACAddressesForm):
+    """A version of the MachineForm which includes the power fields.
     """
 
 
@@ -1050,11 +1116,11 @@
     """
 
 
-def get_node_create_form(user):
+def get_machine_create_form(user):
     if user.is_superuser:
-        return AdminNodeWithMACAddressesForm
+        return AdminMachineWithMACAddressesForm
     else:
-        return NodeWithPowerAndMACAddressesForm
+        return MachineWithPowerAndMACAddressesForm
 
 
 class ProfileForm(MAASModelForm):

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-03-02 14:21:29 +0000
+++ src/maasserver/models/node.py	2016-03-02 18:21:51 +0000
@@ -3361,8 +3361,8 @@
 
     def add_chassis(
             self, user, chassis_type, hostname, username=None, password=None,
-            accept_all=False, prefix_filter=None, power_control=None,
-            port=None, protocol=None):
+            accept_all=False, domain=None, prefix_filter=None,
+            power_control=None, port=None, protocol=None):
         self._register_request_event(
             self.owner,
             EVENT_TYPES.REQUEST_RACK_CONTROLLER_ADD_CHASSIS,
@@ -3371,8 +3371,9 @@
         call = client(
             AddChassis, user=user, chassis_type=chassis_type,
             hostname=hostname, username=username, password=password,
-            accept_all=accept_all, prefix_filter=prefix_filter,
-            power_control=power_control, port=port, protocol=protocol)
+            accept_all=accept_all, domain=domain,
+            prefix_filter=prefix_filter, power_control=power_control,
+            port=port, protocol=protocol)
         call.wait(30)
 
     def get_bmc_accessible_nodes(self):

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-03-02 17:21:09 +0000
+++ src/maasserver/models/tests/test_node.py	2016-03-02 18:21:51 +0000
@@ -5650,6 +5650,7 @@
         username = factory.make_name('username')
         password = factory.make_name('password')
         accept_all = factory.pick_bool()
+        domain = factory.make_name('domain')
         prefix_filter = factory.make_name('prefix_filter')
         power_control = factory.make_name('power_control')
         port = random.randint(0, 65535)
@@ -5657,15 +5658,16 @@
 
         rackcontroller.add_chassis(
             user, chassis_type, hostname, username, password, accept_all,
-            prefix_filter, power_control, port, given_protocol)
+            domain, prefix_filter, power_control, port, given_protocol)
 
         self.expectThat(
             protocol.AddChassis,
             MockCalledOnceWith(
                 ANY, user=user, chassis_type=chassis_type, hostname=hostname,
                 username=username, password=password, accept_all=accept_all,
-                prefix_filter=prefix_filter, power_control=power_control,
-                port=port, protocol=given_protocol))
+                domain=domain, prefix_filter=prefix_filter,
+                power_control=power_control, port=port,
+                protocol=given_protocol))
 
     def test_add_chassis_logs_user_request(self):
         rackcontroller = factory.make_RackController()
@@ -5682,6 +5684,7 @@
         username = factory.make_name('username')
         password = factory.make_name('password')
         accept_all = factory.pick_bool()
+        domain = factory.make_name('domain')
         prefix_filter = factory.make_name('prefix_filter')
         power_control = factory.make_name('power_control')
         port = random.randint(0, 65535)
@@ -5690,7 +5693,7 @@
         register_event = self.patch(rackcontroller, '_register_request_event')
         rackcontroller.add_chassis(
             user, chassis_type, hostname, username, password, accept_all,
-            prefix_filter, power_control, port, given_protocol)
+            domain, prefix_filter, power_control, port, given_protocol)
         post_commit_hooks.reset()  # Ignore these for now.
         self.assertThat(register_event, MockCalledOnceWith(
             rackcontroller.owner,

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2016-02-26 18:34:28 +0000
+++ src/maasserver/preseed.py	2016-03-02 18:21:51 +0000
@@ -601,7 +601,7 @@
         'osystem': osystem,
         'release': release,
         'server_host': server_host,
-        'server_url': absolute_reverse('nodes_handler', base_url=base_url),
+        'server_url': absolute_reverse('machines_handler', base_url=base_url),
         'metadata_enlist_url': absolute_reverse('enlist', base_url=base_url),
         'enable_http_proxy': Config.objects.get_config('enable_http_proxy'),
         'http_proxy': Config.objects.get_config('http_proxy'),

=== modified file 'src/maasserver/rpc/nodes.py'
--- src/maasserver/rpc/nodes.py	2016-02-11 15:06:36 +0000
+++ src/maasserver/rpc/nodes.py	2016-03-02 18:21:51 +0000
@@ -19,7 +19,7 @@
 from maasserver import exceptions
 from maasserver.api.utils import get_overridden_query_dict
 from maasserver.enum import NODE_STATUS
-from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.forms import AdminMachineWithMACAddressesForm
 from maasserver.models import (
     Node,
     PhysicalInterface,
@@ -177,8 +177,9 @@
 
 @synchronous
 @transactional
-def create_node(architecture, power_type,
-                power_parameters, mac_addresses, hostname=None):
+def create_node(
+        architecture, power_type, power_parameters, mac_addresses, domain=None,
+        hostname=None):
     """Create a new `Node` and return it.
 
     :param architecture: The architecture of the new node.
@@ -187,6 +188,7 @@
         for the new node.
     :param mac_addresses: An iterable of MAC addresses that belong to
         the node.
+    :param domain: The domain the node should join.
     :param hostname: the desired hostname for the new node
     """
     # Check that there isn't already a node with one of our MAC
@@ -209,12 +211,15 @@
         'mac_addresses': mac_addresses,
     }
 
+    if domain is not None:
+        data['domain'] = domain
+
     if hostname is not None:
         data['hostname'] = hostname.strip()
 
     data_query_dict = get_overridden_query_dict(
-        {}, data, AdminNodeWithMACAddressesForm.Meta.fields)
-    form = AdminNodeWithMACAddressesForm(data_query_dict)
+        {}, data, AdminMachineWithMACAddressesForm.Meta.fields)
+    form = AdminMachineWithMACAddressesForm(data_query_dict)
     if form.is_valid():
         node = form.save()
         # We have to explicitly save the power parameters; the form

=== modified file 'src/maasserver/rpc/regionservice.py'
--- src/maasserver/rpc/regionservice.py	2016-02-26 16:19:41 +0000
+++ src/maasserver/rpc/regionservice.py	2016-03-02 18:21:51 +0000
@@ -349,7 +349,7 @@
 
     @region.CreateNode.responder
     def create_node(self, architecture, power_type, power_parameters,
-                    mac_addresses, hostname=None):
+                    mac_addresses, domain=None, hostname=None):
         """create_node()
 
         Implementation of
@@ -357,7 +357,7 @@
         """
         d = deferToDatabase(
             create_node, architecture, power_type, power_parameters,
-            mac_addresses, hostname=hostname)
+            mac_addresses, domain=domain, hostname=hostname)
         d.addCallback(lambda node: {'system_id': node.system_id})
         return d
 

=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
--- src/maasserver/rpc/tests/test_nodes.py	2016-02-26 18:48:26 +0000
+++ src/maasserver/rpc/tests/test_nodes.py	2016-03-02 18:21:51 +0000
@@ -153,6 +153,55 @@
                 architecture, power_type, power_parameters,
                 mac_addresses, hostname=hostname)
 
+    def test__creates_node_with_explicit_domain(self):
+        self.prepare_rack_rpc()
+
+        mac_addresses = [
+            factory.make_mac_address() for _ in range(3)]
+        architecture = make_usable_architecture(self)
+        hostname = factory.make_hostname()
+        domain = factory.make_Domain()
+        power_type = random.choice(self.power_types)['name']
+        power_parameters = dumps({})
+
+        node = create_node(
+            architecture, power_type, power_parameters,
+            mac_addresses, domain=domain.name, hostname=hostname)
+
+        self.assertEqual(
+            (
+                architecture,
+                power_type,
+                {},
+                domain.id,
+                hostname,
+            ),
+            (
+                node.architecture,
+                node.power_type,
+                node.power_parameters,
+                node.domain.id,
+                node.hostname,
+            ))
+        self.expectThat(node.id, Not(Is(None)))
+        self.assertItemsEqual(
+            mac_addresses,
+            [nic.mac_address for nic in node.interface_set.all()])
+
+    def test__create_node_fails_with_invalid_domain(self):
+        self.prepare_rack_rpc()
+
+        mac_addresses = [
+            factory.make_mac_address() for _ in range(3)]
+        architecture = make_usable_architecture(self)
+        power_type = random.choice(self.power_types)['name']
+        power_parameters = dumps({})
+
+        with ExpectedException(ValidationError):
+            create_node(
+                architecture, power_type, power_parameters,
+                mac_addresses, factory.make_name('domain'))
+
     def test__raises_validation_errors_for_invalid_data(self):
         self.prepare_rack_rpc()
 

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2016-02-27 02:32:00 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2016-03-02 18:21:51 +0000
@@ -2416,9 +2416,10 @@
 
         params = {
             'architecture': make_usable_architecture(self),
-            'power_type': factory.make_name("power_type"),
+            'power_type': factory.make_name('power_type'),
             'power_parameters': dumps({}),
             'mac_addresses': [factory.make_mac_address()],
+            'domain': factory.make_name('domain'),
             'hostname': None,
         }
 
@@ -2431,6 +2432,7 @@
             MockCalledOnceWith(
                 params['architecture'], params['power_type'],
                 params['power_parameters'], params['mac_addresses'],
+                domain=params['domain'],
                 hostname=params['hostname']))
         self.assertEqual(
             create_node_function.return_value.system_id,

=== modified file 'src/maasserver/tests/test_forms_device.py'
--- src/maasserver/tests/test_forms_device.py	2016-02-26 18:39:26 +0000
+++ src/maasserver/tests/test_forms_device.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for device forms."""
@@ -16,26 +16,15 @@
     def test_contains_limited_set_of_fields(self):
         form = DeviceForm()
 
-        self.assertEqual(
+        self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
                 'parent',
+                'disable_ipv4',
+                'swap_size',
             ], list(form.fields))
 
-    def test_changes_device_hostname(self):
-        device = factory.make_Device()
-        hostname = factory.make_string()
-
-        form = DeviceForm(
-            data={
-                'hostname': hostname,
-                },
-            instance=device)
-        form.save()
-        reload_object(device)
-
-        self.assertEqual(hostname, device.hostname)
-
     def test_changes_device_parent(self):
         device = factory.make_Device()
         parent = factory.make_Node()

=== modified file 'src/maasserver/tests/test_forms_helpers.py'
--- src/maasserver/tests/test_forms_helpers.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/tests/test_forms_helpers.py	2016-03-02 18:21:51 +0000
@@ -8,14 +8,17 @@
 from django.forms import CharField
 from maasserver.enum import BOOT_RESOURCE_TYPE
 from maasserver.forms import (
+    AdminMachineForm,
+    AdminMachineWithMACAddressesForm,
     AdminNodeForm,
-    AdminNodeWithMACAddressesForm,
-    get_node_create_form,
+    get_machine_create_form,
+    get_machine_edit_form,
     get_node_edit_form,
     list_all_usable_architectures,
     MAASModelForm,
+    MachineForm,
+    MachineWithPowerAndMACAddressesForm,
     NodeForm,
-    NodeWithPowerAndMACAddressesForm,
     pick_default_architecture,
     remove_None_values,
 )
@@ -98,23 +101,31 @@
     def test_remove_None_values_leaves_empty_dict_untouched(self):
         self.assertEqual({}, remove_None_values({}))
 
+    def test_get_machine_edit_form_returns_MachineForm_if_non_admin(self):
+        user = factory.make_User()
+        self.assertEqual(MachineForm, get_machine_edit_form(user))
+
+    def test_get_machine_edit_form_returns_AdminMachineForm_if_admin(self):
+        admin = factory.make_admin()
+        self.assertEqual(AdminMachineForm, get_machine_edit_form(admin))
+
     def test_get_node_edit_form_returns_NodeForm_if_non_admin(self):
         user = factory.make_User()
         self.assertEqual(NodeForm, get_node_edit_form(user))
 
-    def test_get_node_edit_form_returns_APIAdminNodeEdit_if_admin(self):
+    def test_get_node_edit_form_returns_AdminNodeForm_if_admin(self):
         admin = factory.make_admin()
         self.assertEqual(AdminNodeForm, get_node_edit_form(admin))
 
-    def test_get_node_create_form_if_non_admin(self):
+    def test_get_machine_create_form_if_non_admin(self):
         user = factory.make_User()
         self.assertEqual(
-            NodeWithPowerAndMACAddressesForm, get_node_create_form(user))
+            MachineWithPowerAndMACAddressesForm, get_machine_create_form(user))
 
-    def test_get_node_create_form_if_admin(self):
+    def test_get_machine_create_form_if_admin(self):
         admin = factory.make_admin()
         self.assertEqual(
-            AdminNodeWithMACAddressesForm, get_node_create_form(admin))
+            AdminMachineWithMACAddressesForm, get_machine_create_form(admin))
 
 
 class TestMAASModelForm(MAASTransactionServerTestCase):

=== renamed file 'src/maasserver/tests/test_forms_node.py' => 'src/maasserver/tests/test_forms_machine.py'
--- src/maasserver/tests/test_forms_node.py	2016-03-01 19:02:08 +0000
+++ src/maasserver/tests/test_forms_machine.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for node forms."""
@@ -6,7 +6,6 @@
 __all__ = []
 
 from crochet import TimeoutError
-from django.core.exceptions import ValidationError
 from maasserver import forms
 from maasserver.clusterrpc.power_parameters import get_power_type_choices
 from maasserver.clusterrpc.testing.osystems import (
@@ -14,13 +13,11 @@
     make_rpc_release,
 )
 from maasserver.forms import (
-    AdminNodeForm,
+    AdminMachineForm,
     BLANK_CHOICE,
-    NodeChoiceField,
-    NodeForm,
+    MachineForm,
     pick_default_architecture,
 )
-from maasserver.models import Node
 from maasserver.testing.architecture import (
     make_usable_architecture,
     patch_usable_architectures,
@@ -32,21 +29,21 @@
     patch_usable_osystems,
 )
 from maasserver.testing.testcase import MAASServerTestCase
-from maasserver.utils.orm import reload_object
 from provisioningserver.rpc.exceptions import (
     NoConnectionsAvailable,
     NoSuchOperatingSystem,
 )
 
 
-class TestNodeForm(MAASServerTestCase):
+class TestMachineForm(MAASServerTestCase):
 
     def test_contains_limited_set_of_fields(self):
-        form = NodeForm()
+        form = MachineForm()
 
-        self.assertEqual(
+        self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
                 'architecture',
                 'osystem',
                 'distro_series',
@@ -57,24 +54,9 @@
                 'hwe_kernel',
             ], list(form.fields))
 
-    def test_changes_node(self):
-        node = factory.make_Node()
-        hostname = factory.make_string()
-        patch_usable_architectures(self, [node.architecture])
-
-        form = NodeForm(
-            data={
-                'hostname': hostname,
-                'architecture': make_usable_architecture(self),
-                },
-            instance=node)
-        form.save()
-
-        self.assertEqual(hostname, node.hostname)
-
     def test_accepts_usable_architecture(self):
         arch = make_usable_architecture(self)
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': arch,
             })
@@ -82,7 +64,7 @@
 
     def test_rejects_unusable_architecture(self):
         patch_usable_architectures(self)
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': factory.make_name('arch'),
             })
@@ -92,7 +74,7 @@
     def test_starts_with_default_architecture(self):
         arches = sorted([factory.make_name('arch') for _ in range(5)])
         patch_usable_architectures(self, arches)
-        form = NodeForm()
+        form = MachineForm()
         self.assertEqual(
             pick_default_architecture(arches),
             form.fields['architecture'].initial)
@@ -102,7 +84,7 @@
         node = factory.make_Node(
             owner=self.logged_in_user)
         osystem = make_usable_osystem(self)
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -114,12 +96,12 @@
 
     def test_form_validates_min_hwe_kernel_by_passing_invalid_config(self):
         node = factory.make_Node(min_hwe_kernel='hwe-t')
-        form = NodeForm(instance=node)
+        form = MachineForm(instance=node)
         self.assertEqual(form.is_valid(), False)
 
     def test_adds_blank_default_when_no_arches_available(self):
         patch_usable_architectures(self, [])
-        form = NodeForm()
+        form = MachineForm()
         self.assertEqual(
             [BLANK_CHOICE],
             form.fields['architecture'].choices)
@@ -128,7 +110,7 @@
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
         osystem = make_usable_osystem(self)
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -140,7 +122,7 @@
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
         patch_usable_osystems(self)
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': factory.make_name('os'),
@@ -154,7 +136,7 @@
         node = factory.make_Node(owner=self.logged_in_user)
         osystems = [make_osystem_with_releases(self) for _ in range(5)]
         patch_usable_osystems(self, osystems)
-        form = NodeForm(instance=node)
+        form = MachineForm(instance=node)
         self.assertEqual(
             '',
             form.fields['osystem'].initial)
@@ -164,7 +146,7 @@
         node = factory.make_Node(owner=self.logged_in_user)
         osystem = make_usable_osystem(self)
         release = osystem['default_release']
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -178,7 +160,7 @@
         node = factory.make_Node(owner=self.logged_in_user)
         osystem = make_usable_osystem(self)
         release = factory.make_name('release')
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -194,7 +176,7 @@
         release = factory.make_name('release')
         make_usable_osystem(
             self, releases=[release + '6', release + '0', release + '3'])
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             },
@@ -210,7 +192,7 @@
             self,
             osystem_name='ubuntu',
             releases=['trusty'])
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             },
@@ -223,7 +205,7 @@
         node = factory.make_Node(owner=self.logged_in_user)
         osystems = [make_osystem_with_releases(self) for _ in range(5)]
         patch_usable_osystems(self, osystems)
-        form = NodeForm(instance=node)
+        form = MachineForm(instance=node)
         self.assertEqual(
             '',
             form.fields['distro_series'].initial)
@@ -234,7 +216,7 @@
         osystem = make_usable_osystem(self)
         release = osystem['default_release']
         invalid = factory.make_name('invalid_os')
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -253,7 +235,7 @@
         license_key = factory.make_name('key')
         mock_validate = self.patch(forms, 'validate_license_key')
         mock_validate.return_value = False
-        form = NodeForm(data={
+        form = MachineForm(data={
             'hostname': factory.make_name('host'),
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
@@ -273,7 +255,7 @@
         license_key = factory.make_name('key')
         mock_validate_for = self.patch(forms, 'validate_license_key_for')
         mock_validate_for.return_value = False
-        form = NodeForm(data={
+        form = MachineForm(data={
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
             'distro_series': '%s/%s*' % (osystem['name'], release['name']),
@@ -292,7 +274,7 @@
         license_key = factory.make_name('key')
         mock_validate_for = self.patch(forms, 'validate_license_key_for')
         mock_validate_for.side_effect = NoConnectionsAvailable()
-        form = NodeForm(data={
+        form = MachineForm(data={
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
             'distro_series': '%s/%s*' % (osystem['name'], release['name']),
@@ -311,7 +293,7 @@
         license_key = factory.make_name('key')
         mock_validate_for = self.patch(forms, 'validate_license_key_for')
         mock_validate_for.side_effect = TimeoutError()
-        form = NodeForm(data={
+        form = MachineForm(data={
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
             'distro_series': '%s/%s*' % (osystem['name'], release['name']),
@@ -330,7 +312,7 @@
         license_key = factory.make_name('key')
         mock_validate_for = self.patch(forms, 'validate_license_key_for')
         mock_validate_for.side_effect = NoSuchOperatingSystem()
-        form = NodeForm(data={
+        form = MachineForm(data={
             'architecture': make_usable_architecture(self),
             'osystem': osystem['name'],
             'distro_series': '%s/%s*' % (osystem['name'], release['name']),
@@ -340,46 +322,18 @@
         self.assertFalse(form.is_valid())
         self.assertItemsEqual(['license_key'], form._errors.keys())
 
-    def test_obeys_disable_ipv4_if_given(self):
-        setting = factory.pick_bool()
-        form = NodeForm(
-            data={
-                'architecture': make_usable_architecture(self),
-                'disable_ipv4': setting,
-                })
-        node = form.save()
-        self.assertEqual(setting, node.disable_ipv4)
-
-    def test_takes_missing_disable_ipv4_as_False_in_UI(self):
-        form = NodeForm(
-            instance=factory.make_Node(disable_ipv4=True),
-            data={
-                'architecture': make_usable_architecture(self),
-                'ui_submission': True,
-                })
-        node = form.save()
-        self.assertFalse(node.disable_ipv4)
-
-    def test_takes_missing_disable_ipv4_as_Unchanged_in_API(self):
-        form = NodeForm(
-            instance=factory.make_Node(disable_ipv4=True),
-            data={
-                'architecture': make_usable_architecture(self),
-                })
-        node = form.save()
-        self.assertTrue(node.disable_ipv4)
-
-
-class TestAdminNodeForm(MAASServerTestCase):
-
-    def test_AdminNodeForm_contains_limited_set_of_fields(self):
+
+class TestAdminMachineForm(MAASServerTestCase):
+
+    def test_AdminMachineForm_contains_limited_set_of_fields(self):
         self.client_log_in()
         node = factory.make_Node(owner=self.logged_in_user)
-        form = AdminNodeForm(instance=node)
+        form = AdminMachineForm(instance=node)
 
-        self.assertEqual(
+        self.assertItemsEqual(
             [
                 'hostname',
+                'domain',
                 'architecture',
                 'osystem',
                 'distro_series',
@@ -396,59 +350,24 @@
             ],
             list(form.fields))
 
-    def test_AdminNodeForm_initialises_zone(self):
-        # The zone field uses "to_field_name", so that it can refer to a zone
-        # by name instead of by ID.  A bug in Django breaks initialisation
-        # from an instance: the field tries to initialise the field using a
-        # zone's ID instead of its name, and ends up reverting to the default.
-        # The code must work around this bug.
-        zone = factory.make_Zone()
-        node = factory.make_Node(zone=zone)
-        # We'll create a form that makes a change, but not to the zone.
-        data = {'hostname': factory.make_name('host')}
-        form = AdminNodeForm(instance=node, data=data)
-        # The Django bug would stop the initial field value from being set,
-        # but the workaround ensures that it is initialised.
-        self.assertEqual(zone.name, form.initial['zone'])
-
-    def test_AdminNodeForm_changes_node(self):
-        node = factory.make_Node()
-        zone = factory.make_Zone()
-        hostname = factory.make_string()
-        power_type = factory.pick_power_type()
-        form = AdminNodeForm(
-            data={
-                'hostname': hostname,
-                'power_type': power_type,
-                'architecture': make_usable_architecture(self),
-                'zone': zone.name,
-            },
-            instance=node)
-        form.save()
-
-        node = reload_object(node)
-        self.assertEqual(
-            (node.hostname, node.power_type, node.zone),
-            (hostname, power_type, zone))
-
-    def test_AdminNodeForm_populates_power_type_choices(self):
-        form = AdminNodeForm()
+    def test_AdminMachineForm_populates_power_type_choices(self):
+        form = AdminMachineForm()
         self.assertEqual(
             [''] + [choice[0] for choice in get_power_type_choices()],
             [choice[0] for choice in form.fields['power_type'].choices])
 
-    def test_AdminNodeForm_populates_power_type_initial(self):
+    def test_AdminMachineForm_populates_power_type_initial(self):
         node = factory.make_Node()
-        form = AdminNodeForm(instance=node)
+        form = AdminMachineForm(instance=node)
         self.assertEqual(node.power_type, form.fields['power_type'].initial)
 
-    def test_AdminNodeForm_changes_node_with_skip_check(self):
+    def test_AdminMachineForm_changes_node_with_skip_check(self):
         node = factory.make_Node()
         hostname = factory.make_string()
         power_type = factory.pick_power_type()
         power_parameters_field = factory.make_string()
         arch = make_usable_architecture(self)
-        form = AdminNodeForm(
+        form = AdminMachineForm(
             data={
                 'hostname': hostname,
                 'architecture': arch,
@@ -462,37 +381,3 @@
         self.assertEqual(
             (hostname, power_type, {'field': power_parameters_field}),
             (node.hostname, node.power_type, node.power_parameters))
-
-
-class TestNodeChoiceField(MAASServerTestCase):
-    def test_allows_selecting_by_system_id(self):
-        node = factory.make_Node()
-        for _ in range(3):
-            factory.make_Node()
-        node_field = NodeChoiceField(Node.objects.filter())
-        self.assertEqual(node, node_field.clean(node.system_id))
-
-    def test_allows_selecting_by_hostname(self):
-        node = factory.make_Node()
-        for _ in range(3):
-            factory.make_Node()
-        node_field = NodeChoiceField(Node.objects.filter())
-        self.assertEqual(node, node_field.clean(node.hostname))
-
-    def test_raises_exception_when_not_found(self):
-        for _ in range(3):
-            factory.make_Node()
-        node_field = NodeChoiceField(Node.objects.filter())
-        self.assertRaises(
-            ValidationError, node_field.clean, factory.make_name('query'))
-
-    def test_works_with_multiple_entries_in_queryset(self):
-        # Regression test for lp:1551399
-        vlan = factory.make_VLAN()
-        node = factory.make_Node_with_Interface_on_Subnet(vlan=vlan)
-        factory.make_Interface(node=node, vlan=vlan)
-        qs = Node.objects.filter_by_vids([vlan.vid])
-        node_field = NodeChoiceField(qs)
-        # Double check that we have duplicated entires
-        self.assertEqual(2, len(qs.filter(system_id=node.system_id)))
-        self.assertEqual(node, node_field.clean(node.system_id))

=== renamed file 'src/maasserver/tests/test_forms_nodewithmacaddresses.py' => 'src/maasserver/tests/test_forms_machinewithmacaddresses.py'
--- src/maasserver/tests/test_forms_nodewithmacaddresses.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/tests/test_forms_machinewithmacaddresses.py	2016-03-02 18:21:51 +0000
@@ -1,13 +1,13 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for `NodeWithMACAddressesForm`."""
+"""Tests for `MachineWithMACAddressesForm`."""
 
 __all__ = []
 
 from django.http import QueryDict
 from maasserver.enum import INTERFACE_TYPE
-from maasserver.forms import NodeWithMACAddressesForm
+from maasserver.forms import MachineWithMACAddressesForm
 from maasserver.testing.architecture import (
     make_usable_architecture,
     patch_usable_architectures,
@@ -17,7 +17,7 @@
 from testtools.matchers import Contains
 
 
-class NodeWithMACAddressesFormTest(MAASServerTestCase):
+class MachineWithMACAddressesFormTest(MAASServerTestCase):
 
     def get_QueryDict(self, params):
         query_dict = QueryDict('', mutable=True)
@@ -47,7 +47,7 @@
 
     def test__valid(self):
         architecture = make_usable_architecture(self)
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(
                 mac_addresses=['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f'],
                 architecture=architecture))
@@ -62,7 +62,7 @@
         # If the form only has one (invalid) MAC address field to validate,
         # the error message in form.errors['mac_addresses'] is the
         # message from the field's validation error.
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(mac_addresses=['invalid']))
 
         self.assertFalse(form.is_valid())
@@ -75,7 +75,7 @@
         # If the form has multiple MAC address fields to validate,
         # if one or more fields are invalid, a single error message is
         # present in form.errors['mac_addresses'] after validation.
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(mac_addresses=['invalid_1', 'invalid_2']))
 
         self.assertFalse(form.is_valid())
@@ -92,7 +92,7 @@
         node = factory.make_Node_with_Interface_on_Subnet(
             address='aa:bb:cc:dd:ee:ff')
         architecture = make_usable_architecture(self)
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(
                 mac_addresses=['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f'],
                 architecture=architecture), instance=node)
@@ -107,7 +107,7 @@
         factory.make_Node_with_Interface_on_Subnet(address='aa:bb:cc:dd:ee:ff')
         architecture = make_usable_architecture(self)
         node = factory.make_Node_with_Interface_on_Subnet()
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(
                 mac_addresses=['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f'],
                 architecture=architecture), instance=node)
@@ -119,7 +119,7 @@
         factory.make_Interface(
             INTERFACE_TYPE.UNKNOWN, mac_address='aa:bb:cc:dd:ee:ff')
         architecture = make_usable_architecture(self)
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(
                 mac_addresses=['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f'],
                 architecture=architecture))
@@ -132,7 +132,7 @@
 
     def test__empty(self):
         # Empty values in the list of MAC addresses are simply ignored.
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(
                 mac_addresses=[factory.make_mac_address(), '']))
 
@@ -140,7 +140,7 @@
 
     def test__save(self):
         macs = ['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f']
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(mac_addresses=macs))
         node = form.save()
 
@@ -150,13 +150,13 @@
             [nic.mac_address for nic in node.interface_set.all()])
 
     def test_form_without_hostname_generates_hostname(self):
-        form = NodeWithMACAddressesForm(data=self.make_params(hostname=''))
+        form = MachineWithMACAddressesForm(data=self.make_params(hostname=''))
         node = form.save()
         self.assertTrue(len(node.hostname) > 0)
 
     def test_form_with_ip_based_hostname_generates_hostname(self):
         ip_based_hostname = '192-168-12-10.maas'
-        form = NodeWithMACAddressesForm(
+        form = MachineWithMACAddressesForm(
             data=self.make_params(hostname=ip_based_hostname))
         node = form.save()
         self.assertNotEqual(ip_based_hostname, node.hostname)

=== added file 'src/maasserver/tests/test_forms_node.py'
--- src/maasserver/tests/test_forms_node.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/tests/test_forms_node.py	2016-03-02 18:21:51 +0000
@@ -0,0 +1,204 @@
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for node forms."""
+
+__all__ = []
+
+from django.core.exceptions import ValidationError
+from maasserver.forms import (
+    AdminNodeForm,
+    NodeChoiceField,
+    NodeForm,
+)
+from maasserver.models import Node
+from maasserver.testing.architecture import (
+    make_usable_architecture,
+    patch_usable_architectures,
+)
+from maasserver.testing.factory import factory
+from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.orm import reload_object
+
+
+class TestNodeForm(MAASServerTestCase):
+    def test_contains_limited_set_of_fields(self):
+        form = NodeForm()
+
+        self.assertItemsEqual(
+            [
+                'hostname',
+                'domain',
+                'disable_ipv4',
+                'swap_size',
+            ], list(form.fields))
+
+    def test_accepts_hostname(self):
+        machine = factory.make_Node()
+        hostname = factory.make_string()
+        patch_usable_architectures(self, [machine.architecture])
+
+        form = NodeForm(
+            data={
+                'hostname': hostname,
+                'architecture': make_usable_architecture(self),
+                },
+            instance=machine)
+        form.save()
+
+        self.assertEqual(hostname, machine.hostname)
+
+    def test_accepts_domain_by_name(self):
+        machine = factory.make_Node()
+        domain = factory.make_Domain()
+        patch_usable_architectures(self, [machine.architecture])
+
+        form = NodeForm(
+            data={
+                'domain': domain.name,
+                },
+            instance=machine)
+        form.save()
+
+        self.assertEqual(domain.name, machine.domain.name)
+
+    def test_accepts_domain_by_id(self):
+        machine = factory.make_Node()
+        domain = factory.make_Domain()
+        patch_usable_architectures(self, [machine.architecture])
+
+        form = NodeForm(
+            data={
+                'domain': domain.id,
+                },
+            instance=machine)
+        form.save()
+
+        self.assertEqual(domain.name, machine.domain.name)
+
+    def test_validates_domain(self):
+        machine = factory.make_Node()
+        patch_usable_architectures(self, [machine.architecture])
+
+        form = NodeForm(
+            data={
+                'domain': factory.make_name('domain'),
+                },
+            instance=machine)
+
+        self.assertFalse(form.is_valid())
+
+    def test_obeys_disable_ipv4_if_given(self):
+        setting = factory.pick_bool()
+        form = NodeForm(
+            data={
+                'architecture': make_usable_architecture(self),
+                'disable_ipv4': setting,
+                })
+        node = form.save()
+        self.assertEqual(setting, node.disable_ipv4)
+
+    def test_takes_missing_disable_ipv4_as_False_in_UI(self):
+        form = NodeForm(
+            instance=factory.make_Node(disable_ipv4=True),
+            data={
+                'architecture': make_usable_architecture(self),
+                'ui_submission': True,
+                })
+        node = form.save()
+        self.assertFalse(node.disable_ipv4)
+
+    def test_takes_missing_disable_ipv4_as_Unchanged_in_API(self):
+        form = NodeForm(
+            instance=factory.make_Node(disable_ipv4=True),
+            data={
+                'architecture': make_usable_architecture(self),
+                })
+        node = form.save()
+        self.assertTrue(node.disable_ipv4)
+
+
+class TestAdminNodeForm(MAASServerTestCase):
+
+    def test_contains_limited_set_of_fields(self):
+        self.client_log_in()
+        node = factory.make_Node(owner=self.logged_in_user)
+        form = AdminNodeForm(instance=node)
+
+        self.assertItemsEqual(
+            [
+                'hostname',
+                'domain',
+                'disable_ipv4',
+                'swap_size',
+                'cpu_count',
+                'memory',
+                'zone',
+            ],
+            list(form.fields))
+
+    def test_initialises_zone(self):
+        # The zone field uses "to_field_name", so that it can refer to a zone
+        # by name instead of by ID.  A bug in Django breaks initialisation
+        # from an instance: the field tries to initialise the field using a
+        # zone's ID instead of its name, and ends up reverting to the default.
+        # The code must work around this bug.
+        zone = factory.make_Zone()
+        node = factory.make_Node(zone=zone)
+        # We'll create a form that makes a change, but not to the zone.
+        data = {'hostname': factory.make_name('host')}
+        form = AdminNodeForm(instance=node, data=data)
+        # The Django bug would stop the initial field value from being set,
+        # but the workaround ensures that it is initialised.
+        self.assertEqual(zone.name, form.initial['zone'])
+
+    def test_changes_zone(self):
+        node = factory.make_Node()
+        zone = factory.make_Zone()
+        hostname = factory.make_string()
+        form = AdminNodeForm(
+            data={
+                'hostname': hostname,
+                'architecture': make_usable_architecture(self),
+                'zone': zone.name,
+            },
+            instance=node)
+        form.save()
+
+        node = reload_object(node)
+        self.assertEqual(node.hostname, hostname)
+        self.assertEqual(node.zone, zone)
+
+
+class TestNodeChoiceField(MAASServerTestCase):
+    def test_allows_selecting_by_system_id(self):
+        node = factory.make_Node()
+        for _ in range(3):
+            factory.make_Node()
+        node_field = NodeChoiceField(Node.objects.filter())
+        self.assertEqual(node, node_field.clean(node.system_id))
+
+    def test_allows_selecting_by_hostname(self):
+        node = factory.make_Node()
+        for _ in range(3):
+            factory.make_Node()
+        node_field = NodeChoiceField(Node.objects.filter())
+        self.assertEqual(node, node_field.clean(node.hostname))
+
+    def test_raises_exception_when_not_found(self):
+        for _ in range(3):
+            factory.make_Node()
+        node_field = NodeChoiceField(Node.objects.filter())
+        self.assertRaises(
+            ValidationError, node_field.clean, factory.make_name('query'))
+
+    def test_works_with_multiple_entries_in_queryset(self):
+        # Regression test for lp:1551399
+        vlan = factory.make_VLAN()
+        node = factory.make_Node_with_Interface_on_Subnet(vlan=vlan)
+        factory.make_Interface(node=node, vlan=vlan)
+        qs = Node.objects.filter_by_vids([vlan.vid])
+        node_field = NodeChoiceField(qs)
+        # Double check that we have duplicated entires
+        self.assertEqual(2, len(qs.filter(system_id=node.system_id)))
+        self.assertEqual(node, node_field.clean(node.system_id))

=== modified file 'src/maasserver/websockets/handlers/controller.py'
--- src/maasserver/websockets/handlers/controller.py	2016-03-01 19:02:08 +0000
+++ src/maasserver/websockets/handlers/controller.py	2016-03-02 18:21:51 +0000
@@ -8,7 +8,7 @@
     ]
 
 from maasserver.enum import NODE_PERMISSION
-from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.forms import AdminMachineWithMACAddressesForm
 from maasserver.models.node import Node
 from maasserver.websockets.handlers.machine import MachineHandler
 from maasserver.websockets.handlers.node import node_prefetch
@@ -36,7 +36,7 @@
             'link_subnet',
             'unlink_subnet',
         ]
-        form = AdminNodeWithMACAddressesForm
+        form = AdminMachineWithMACAddressesForm
         exclude = [
             "status_expires",
             "parent",

=== modified file 'src/maasserver/websockets/handlers/machine.py'
--- src/maasserver/websockets/handlers/machine.py	2016-03-02 10:02:12 +0000
+++ src/maasserver/websockets/handlers/machine.py	2016-03-02 18:21:51 +0000
@@ -19,7 +19,7 @@
 from maasserver.exceptions import NodeActionError
 from maasserver.forms import (
     AddPartitionForm,
-    AdminNodeWithMACAddressesForm,
+    AdminMachineWithMACAddressesForm,
     CreateBcacheForm,
     CreateCacheSetForm,
     CreateLogicalVolumeForm,
@@ -118,7 +118,7 @@
             'create_logical_volume',
             'set_boot_disk',
         ]
-        form = AdminNodeWithMACAddressesForm
+        form = AdminMachineWithMACAddressesForm
         exclude = [
             "status_expires",
             "parent",
@@ -202,7 +202,7 @@
     def get_form_class(self, action):
         """Return the form class used for `action`."""
         if action in ("create", "update"):
-            return AdminNodeWithMACAddressesForm
+            return AdminMachineWithMACAddressesForm
         else:
             raise HandlerError("Unknown action: %s" % action)
 

=== modified file 'src/maasserver/websockets/handlers/tests/test_controller.py'
--- src/maasserver/websockets/handlers/tests/test_controller.py	2016-03-01 19:02:08 +0000
+++ src/maasserver/websockets/handlers/tests/test_controller.py	2016-03-02 18:21:51 +0000
@@ -6,7 +6,7 @@
 __all__ = []
 
 from maasserver.enum import NODE_TYPE
-from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.forms import AdminMachineWithMACAddressesForm
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.websockets.handlers.controller import ControllerHandler
@@ -63,12 +63,12 @@
         user = factory.make_admin()
         handler = ControllerHandler(user, {})
         self.assertEqual(
-            AdminNodeWithMACAddressesForm,
+            AdminMachineWithMACAddressesForm,
             handler.get_form_class("create"))
 
     def test_get_form_class_for_update(self):
         user = factory.make_admin()
         handler = ControllerHandler(user, {})
         self.assertEqual(
-            AdminNodeWithMACAddressesForm,
+            AdminMachineWithMACAddressesForm,
             handler.get_form_class("update"))

=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
--- src/maasserver/websockets/handlers/tests/test_machine.py	2016-03-02 02:22:45 +0000
+++ src/maasserver/websockets/handlers/tests/test_machine.py	2016-03-02 18:21:51 +0000
@@ -26,7 +26,7 @@
     NODE_TYPE,
 )
 from maasserver.exceptions import NodeActionError
-from maasserver.forms import AdminNodeWithMACAddressesForm
+from maasserver.forms import AdminMachineWithMACAddressesForm
 from maasserver.models.blockdevice import BlockDevice
 from maasserver.models.cacheset import CacheSet
 from maasserver.models.config import Config
@@ -898,14 +898,14 @@
         user = factory.make_admin()
         handler = MachineHandler(user, {})
         self.assertEqual(
-            AdminNodeWithMACAddressesForm,
+            AdminMachineWithMACAddressesForm,
             handler.get_form_class("create"))
 
     def test_get_form_class_for_update(self):
         user = factory.make_admin()
         handler = MachineHandler(user, {})
         self.assertEqual(
-            AdminNodeWithMACAddressesForm,
+            AdminMachineWithMACAddressesForm,
             handler.get_form_class("update"))
 
     def test_get_form_class_raises_error_for_unknown_action(self):

=== modified file 'src/maasserver/websockets/tests/test_base.py'
--- src/maasserver/websockets/tests/test_base.py	2016-02-26 18:39:26 +0000
+++ src/maasserver/websockets/tests/test_base.py	2016-03-02 18:21:51 +0000
@@ -9,8 +9,8 @@
 
 from django.db.models.query import QuerySet
 from maasserver.forms import (
-    AdminNodeForm,
-    AdminNodeWithMACAddressesForm,
+    AdminMachineForm,
+    AdminMachineWithMACAddressesForm,
 )
 from maasserver.models.node import Node
 from maasserver.models.zone import Zone
@@ -446,7 +446,7 @@
         arch = make_usable_architecture(self)
         handler = self.make_nodes_handler(
             fields=['hostname', 'architecture'],
-            form=AdminNodeWithMACAddressesForm)
+            form=AdminMachineWithMACAddressesForm)
         json_obj = handler.create({
             "hostname": hostname,
             "architecture": arch,
@@ -464,7 +464,7 @@
             fields=['hostname', 'architecture'])
         self.patch(
             handler,
-            "get_form_class").return_value = AdminNodeWithMACAddressesForm
+            "get_form_class").return_value = AdminMachineWithMACAddressesForm
         json_obj = handler.create({
             "hostname": hostname,
             "architecture": arch,
@@ -495,7 +495,7 @@
         arch = make_usable_architecture(self)
         handler = self.make_nodes_handler(
             fields=['hostname', 'architecture'],
-            form=AdminNodeWithMACAddressesForm)
+            form=AdminMachineWithMACAddressesForm)
         self.assertRaises(
             HandlerValidationError, handler.create, {
                 "hostname": hostname,
@@ -521,7 +521,7 @@
         node = factory.make_Node(architecture=arch)
         hostname = factory.make_name("hostname")
         handler = self.make_nodes_handler(
-            fields=['hostname'], form=AdminNodeForm)
+            fields=['hostname'], form=AdminMachineForm)
         json_obj = handler.update({
             "system_id": node.system_id,
             "hostname": hostname,
@@ -539,7 +539,7 @@
         handler = self.make_nodes_handler(fields=['hostname'])
         self.patch(
             handler,
-            "get_form_class").return_value = AdminNodeForm
+            "get_form_class").return_value = AdminMachineForm
         json_obj = handler.update({
             "system_id": node.system_id,
             "hostname": hostname,

=== modified file 'src/provisioningserver/drivers/hardware/msftocs.py'
--- src/provisioningserver/drivers/hardware/msftocs.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/msftocs.py	2016-03-02 18:21:51 +0000
@@ -188,7 +188,7 @@
 
 @synchronous
 def probe_and_enlist_msftocs(
-        user, ip, port, username, password, accept_all=False):
+        user, ip, port, username, password, accept_all=False, domain=None):
     """ Extracts all of nodes from msftocs, sets all of them to boot via
     HDD by, default, sets them to bootonce via PXE, and then enlists them
     into MAAS.
@@ -223,7 +223,8 @@
             'power_pass': password,
             'blade_id': blade_id,
         }
-        system_id = create_node(macs, 'amd64', 'msftocs', params).wait(30)
+        system_id = create_node(
+            macs, 'amd64', 'msftocs', params, domain).wait(30)
 
         if accept_all:
             commission_node(system_id, user).wait(30)

=== modified file 'src/provisioningserver/drivers/hardware/seamicro.py'
--- src/provisioningserver/drivers/hardware/seamicro.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/seamicro.py	2016-03-02 18:21:51 +0000
@@ -275,8 +275,9 @@
 
 
 @synchronous
-def probe_seamicro15k_and_enlist(user, ip, username, password,
-                                 power_control=None, accept_all=False):
+def probe_seamicro15k_and_enlist(
+        user, ip, username, password, power_control=None, accept_all=False,
+        domain=None):
     power_control = power_control or 'ipmi'
 
     maaslog.info("Probing for seamicro15k servers as %s@%s", username, ip)
@@ -292,7 +293,8 @@
             'system_id': system_id
         }
         maaslog.info("Creating seamicro15k node with MACs: %s", macs)
-        system_id = create_node(macs, 'amd64', 'sm15k', params).wait(30)
+        system_id = create_node(
+            macs, 'amd64', 'sm15k', params, domain).wait(30)
 
         if accept_all:
             commission_node(system_id, user).wait(30)

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_msftocs.py'
--- src/provisioningserver/drivers/hardware/tests/test_msftocs.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_msftocs.py	2016-03-02 18:21:51 +0000
@@ -366,6 +366,7 @@
         port = randint(2000, 4000)
         username = factory.make_name('username')
         password = factory.make_name('password')
+        domain = factory.make_name('domain')
         system_id = factory.make_name('system_id')
         blade_id = randint(1, 24)
         macs = ['F4:52:14:D6:70:98', 'F4:52:14:D6:70:99']
@@ -385,13 +386,13 @@
         }
         yield deferToThread(
             probe_and_enlist_msftocs, user, ip, port, username,
-            password, accept_all=True)
+            password, True, domain)
 
         self.expectThat(blades_mock, MockAnyCall())
         self.expectThat(next_boot_device_mock.call_count, Equals(2))
         self.expectThat(
             create_node_mock,
-            MockCalledOnceWith(macs, 'amd64', 'msftocs', params))
+            MockCalledOnceWith(macs, 'amd64', 'msftocs', params, domain))
         self.expectThat(
             commission_node_mock,
             MockCalledOnceWith(system_id, user))

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_seamicro.py'
--- src/provisioningserver/drivers/hardware/tests/test_seamicro.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_seamicro.py	2016-03-02 18:21:51 +0000
@@ -311,6 +311,7 @@
         username = factory.make_name('username')
         password = factory.make_name('password')
         system_id = factory.make_name('system_id')
+        domain = factory.make_name('domain')
         result = {
             0: {
                 'serverId': '0/0',
@@ -343,7 +344,7 @@
         yield deferToThread(
             probe_seamicro15k_and_enlist,
             user, ip, username, password,
-            power_control='restapi', accept_all=True)
+            power_control='restapi', accept_all=True, domain=domain)
         self.assertEqual(3, mock_create_node.call_count)
 
         last = result[2]
@@ -357,7 +358,7 @@
         self.expectThat(
             mock_create_node,
             MockCalledWith(
-                last['serverMacAddr'], 'amd64', 'sm15k', power_params))
+                last['serverMacAddr'], 'amd64', 'sm15k', power_params, domain))
         self.expectThat(
             mock_commission_node,
             MockCalledWith(system_id, user))

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_ucsm.py'
--- src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_ucsm.py	2016-03-02 18:21:51 +0000
@@ -618,6 +618,7 @@
         username = factory.make_name('username')
         password = factory.make_name('password')
         system_id = factory.make_name('system_id')
+        domain = factory.make_name('domain')
         api = Mock()
         self.patch(ucsm, 'UCSM_XML_API').return_value = api
         server_element = {'uuid': 'uuid'}
@@ -631,7 +632,7 @@
 
         yield deferToThread(
             probe_and_enlist_ucsm, user, url, username,
-            password, accept_all=True)
+            password, True, domain)
         self.expectThat(
             set_lan_boot_default_mock,
             MockCalledOnceWith(api, server_element))
@@ -644,7 +645,7 @@
         }
         self.expectThat(
             create_node_mock,
-            MockCalledOnceWith(server[1], 'amd64', 'ucsm', params))
+            MockCalledOnceWith(server[1], 'amd64', 'ucsm', params, domain))
         self.expectThat(
             commission_node_mock,
             MockCalledOnceWith(system_id, user))

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_virsh.py'
--- src/provisioningserver/drivers/hardware/tests/test_virsh.py	2015-12-10 05:00:21 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_virsh.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.drivers.hardware.virsh`.
@@ -271,6 +271,7 @@
         fake_arch = factory.make_name('arch')
         mock_arch = self.patch(virsh.VirshSSH, 'get_arch')
         mock_arch.return_value = fake_arch
+        domain = factory.make_name('domain')
 
         # Patch get_state so that one of the machines is on, so we
         # can check that it will be forced off.
@@ -330,7 +331,7 @@
         # Perform the probe and enlist
         yield deferToThread(
             virsh.probe_virsh_and_enlist, user, poweraddr,
-            password=fake_password, accept_all=True)
+            fake_password, True, domain)
 
         # Check that login was called with the provided poweraddr and
         # password.
@@ -351,16 +352,16 @@
             mock_create_node, MockCallsMatch(
                 call(
                     fake_macs[0], fake_arch, 'virsh', called_params[0],
-                    machines[0]),
+                    domain, machines[0]),
                 call(
                     fake_macs[1], fake_arch, 'virsh', called_params[1],
-                    machines[1]),
+                    domain, machines[1]),
                 call(
                     fake_macs[2], fake_arch, 'virsh', called_params[2],
-                    machines[2]),
+                    domain, machines[2]),
                 call(
                     fake_macs[3], fake_arch, 'virsh', called_params[3],
-                    machines[3]),
+                    domain, machines[3]),
             ))
         self.assertThat(mock_logout, MockCalledOnceWith())
         self.expectThat(

=== modified file 'src/provisioningserver/drivers/hardware/ucsm.py'
--- src/provisioningserver/drivers/hardware/ucsm.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/hardware/ucsm.py	2016-03-02 18:21:51 +0000
@@ -432,7 +432,8 @@
 
 
 @synchronous
-def probe_and_enlist_ucsm(user, url, username, password, accept_all=False):
+def probe_and_enlist_ucsm(
+        user, url, username, password, accept_all=False, domain=None):
     """Probe a UCS Manager and enlist all its servers.
 
     Here's what happens here: 1. Get a list of servers from the UCS
@@ -474,7 +475,8 @@
             'power_pass': password,
             'uuid': server.get('uuid'),
         }
-        system_id = create_node(macs, 'amd64', 'ucsm', params).wait(30)
+        system_id = create_node(
+            macs, 'amd64', 'ucsm', params, domain).wait(30)
 
         if accept_all:
             commission_node(system_id, user).wait(30)

=== modified file 'src/provisioningserver/drivers/hardware/virsh.py'
--- src/provisioningserver/drivers/hardware/virsh.py	2015-12-11 18:18:23 +0000
+++ src/provisioningserver/drivers/hardware/virsh.py	2016-03-02 18:21:51 +0000
@@ -257,8 +257,9 @@
 
 
 @synchronous
-def probe_virsh_and_enlist(user, poweraddr, password=None,
-                           prefix_filter=None, accept_all=False):
+def probe_virsh_and_enlist(
+        user, poweraddr, password=None, prefix_filter=None, accept_all=False,
+        domain=None):
     """Extracts all of the VMs from virsh and enlists them
     into MAAS.
 
@@ -267,6 +268,7 @@
     :param password: password connection string.
     :param prefix_filter: only enlist nodes that have the prefix.
     :param accept_all: if True, commission enlisted nodes.
+    :param domain: The domain for the node to join.
     """
     conn = VirshSSH(dom_prefix=prefix_filter)
     if not conn.login(poweraddr, password):
@@ -289,7 +291,7 @@
         if password is not None:
             params['power_pass'] = password
         system_id = create_node(
-            macs, arch, 'virsh', params, hostname=machine).wait(30)
+            macs, arch, 'virsh', params, domain, machine).wait(30)
 
         if system_id is not None:
             conn.configure_pxe_boot(machine)

=== modified file 'src/provisioningserver/drivers/hardware/vmware.py'
--- src/provisioningserver/drivers/hardware/vmware.py	2016-01-19 22:36:17 +0000
+++ src/provisioningserver/drivers/hardware/vmware.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -353,7 +353,7 @@
 @synchronous
 def probe_vmware_and_enlist(
         user, host, username, password, port=None,
-        protocol=None, prefix_filter=None, accept_all=False):
+        protocol=None, prefix_filter=None, accept_all=False, domain=None):
 
     # Both '' and None mean the same thing, so normalize it.
     if prefix_filter is None:
@@ -367,14 +367,14 @@
             servers = api.get_all_vm_properties()
             _probe_and_enlist_vmware_servers(
                 api, accept_all, host, password, port, prefix_filter, protocol,
-                servers, user, username)
+                servers, user, username, domain)
         finally:
             api.disconnect()
 
 
 def _probe_and_enlist_vmware_servers(
         api, accept_all, host, password, port, prefix_filter, protocol,
-        servers, user, username):
+        servers, user, username, domain):
     maaslog.info("Found %d VMware servers", len(servers))
     for system_name in servers:
         if not system_name.startswith(prefix_filter):
@@ -403,7 +403,7 @@
 
         system_id = create_node(
             properties['macs'], properties['architecture'],
-            'vmware', params, hostname=system_name).wait(30)
+            'vmware', params, domain, system_name).wait(30)
 
         if system_id is not None:
             api.set_pxe_boot(properties)

=== modified file 'src/provisioningserver/drivers/power/mscm.py'
--- src/provisioningserver/drivers/power/mscm.py	2016-02-25 16:13:34 +0000
+++ src/provisioningserver/drivers/power/mscm.py	2016-03-02 18:21:51 +0000
@@ -141,7 +141,8 @@
 
 
 @synchronous
-def probe_and_enlist_mscm(user, host, username, password, accept_all=False):
+def probe_and_enlist_mscm(
+        user, host, username, password, accept_all=False, domain=None):
     """ Extracts all of nodes from the MSCM, sets all of them to boot via M.2
     by, default, sets them to bootonce via PXE, and then enlists them into
     MAAS.  If accept_all is True, it will also commission them.
@@ -201,7 +202,7 @@
             "show node macaddr %s" % node_id, **params)
         macs = re.findall(r':'.join(['[0-9a-f]{2}'] * 6), node_macaddr)
         # Create node
-        system_id = create_node(macs, arch, 'mscm', params).wait(30)
+        system_id = create_node(macs, arch, 'mscm', params, domain).wait(30)
 
         if accept_all:
             commission_node(system_id, user).wait(30)

=== modified file 'src/provisioningserver/drivers/power/tests/test_mscm.py'
--- src/provisioningserver/drivers/power/tests/test_mscm.py	2016-02-25 16:13:34 +0000
+++ src/provisioningserver/drivers/power/tests/test_mscm.py	2016-03-02 18:21:51 +0000
@@ -248,6 +248,7 @@
         host = factory.make_hostname('mscm')
         username = factory.make_name('user')
         password = factory.make_name('password')
+        domain = factory.make_name('domain')
         system_id = factory.make_name('system_id')
         Driver = self.patch(mscm_module, "MSCMPowerDriver")
         mscm_driver = Driver.return_value
@@ -265,11 +266,11 @@
 
         yield deferToThread(
             probe_and_enlist_mscm,
-            user, host, username, password, accept_all=True)
+            user, host, username, password, True, domain)
 
         self.expectThat(
             create_node,
-            MockCalledOnceWith(macs, self.arch, 'mscm', params))
+            MockCalledOnceWith(macs, self.arch, 'mscm', params, domain))
         self.expectThat(
             commission_node,
             MockCalledOnceWith(system_id, user))

=== modified file 'src/provisioningserver/rpc/cluster.py'
--- src/provisioningserver/rpc/cluster.py	2016-02-29 07:45:25 +0000
+++ src/provisioningserver/rpc/cluster.py	2016-03-02 18:21:51 +0000
@@ -419,6 +419,7 @@
         (b"username", amp.Unicode(optional=True)),
         (b"password", amp.Unicode(optional=True)),
         (b"accept_all", amp.Boolean(optional=True)),
+        (b"domain", amp.Unicode(optional=True)),
         (b"prefix_filter", amp.Unicode(optional=True)),
         (b"power_control", amp.Unicode(optional=True)),
         (b"port", amp.Integer(optional=True)),

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2016-03-02 14:21:29 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2016-03-02 18:21:51 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """RPC implementation for clusters."""
@@ -380,8 +380,8 @@
     @cluster.AddChassis.responder
     def add_chassis(
             self, user, chassis_type, hostname, username=None, password=None,
-            accept_all=False, prefix_filter=None, power_control=None,
-            port=None, protocol=None):
+            accept_all=False, domain=None, prefix_filter=None,
+            power_control=None, port=None, protocol=None):
         """AddChassis()
 
         Implementation of
@@ -391,34 +391,36 @@
         if chassis_type in ('virsh', 'powerkvm'):
             d = deferToThread(
                 probe_virsh_and_enlist,
-                user, hostname, password, prefix_filter, accept_all)
+                user, hostname, password, prefix_filter, accept_all,
+                domain)
             d.addErrback(partial(catch_probe_and_enlist_error, "virsh"))
         elif chassis_type == 'vmware':
             d = deferToThread(
                 probe_vmware_and_enlist,
                 user, hostname, username, password, port, protocol,
-                prefix_filter, accept_all)
+                prefix_filter, accept_all, domain)
             d.addErrback(partial(catch_probe_and_enlist_error, "VMware"))
         elif chassis_type == 'seamicro15k':
             d = deferToThread(
                 probe_seamicro15k_and_enlist,
-                user, hostname, username, password, power_control, accept_all)
+                user, hostname, username, password, power_control, accept_all,
+                domain)
             d.addErrback(
                 partial(catch_probe_and_enlist_error, "SeaMicro 15000"))
         elif chassis_type == 'mscm':
             d = deferToThread(
                 probe_and_enlist_mscm, user, hostname, username, password,
-                accept_all)
+                accept_all, domain)
             d.addErrback(partial(catch_probe_and_enlist_error, "Moonshot"))
         elif chassis_type == 'msftocs':
             d = deferToThread(
                 probe_and_enlist_msftocs, user, hostname, port, username,
-                password, accept_all)
+                password, accept_all, domain)
             d.addErrback(partial(catch_probe_and_enlist_error, "MicrosoftOCS"))
         elif chassis_type == 'ucsm':
             d = deferToThread(
                 probe_and_enlist_ucsm, user, hostname, username, password,
-                accept_all)
+                accept_all, domain)
             d.addErrback(partial(catch_probe_and_enlist_error, "UCS"))
         else:
             message = "Unknown chassis type %s" % chassis_type

=== modified file 'src/provisioningserver/rpc/region.py'
--- src/provisioningserver/rpc/region.py	2016-02-26 16:19:41 +0000
+++ src/provisioningserver/rpc/region.py	2016-03-02 18:21:51 +0000
@@ -344,6 +344,7 @@
         (b'power_parameters', amp.Unicode()),
         (b'mac_addresses', amp.ListOf(amp.Unicode())),
         (b'hostname', amp.Unicode(optional=True)),
+        (b'domain', amp.Unicode(optional=True)),
     ]
     response = [
         (b'system_id', amp.Unicode()),

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2016-03-02 14:21:29 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2016-03-02 18:21:51 +0000
@@ -1881,6 +1881,7 @@
         hostname = factory.make_hostname()
         password = factory.make_name('password')
         accept_all = factory.pick_bool()
+        domain = factory.make_name('domain')
         prefix_filter = factory.make_name('prefix_filter')
         call_responder(Cluster(), cluster.AddChassis, {
             'user': user,
@@ -1888,12 +1889,14 @@
             'hostname': hostname,
             'password': password,
             'accept_all': accept_all,
+            'domain': domain,
             'prefix_filter': prefix_filter,
             })
         self.assertThat(
             mock_deferToThread, MockCalledOnceWith(
                 clusterservice.probe_virsh_and_enlist,
-                user, hostname, password, prefix_filter, accept_all))
+                user, hostname, password, prefix_filter, accept_all,
+                domain))
 
     def test_chassis_type_powerkvm_calls_probe_virsh_and_enlist(self):
         mock_deferToThread = self.patch_autospec(
@@ -1902,6 +1905,7 @@
         hostname = factory.make_hostname()
         password = factory.make_name('password')
         accept_all = factory.pick_bool()
+        domain = factory.make_name('domain')
         prefix_filter = factory.make_name('prefix_filter')
         call_responder(Cluster(), cluster.AddChassis, {
             'user': user,
@@ -1909,12 +1913,14 @@