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

[Lee Trager]

Add the ability to reset machines and devices to default state.

[Andres Rodriguez (andreserl)]

A method already exists that allows setting the storage back to how it was after commission. We discussed that a similar method needed to be added for the networking and I'm not seeing that method here.

As far as adding a 'reset' Is is a nice improvement but wasn't the discussed solution. Can we discuss this?

review: Needs Fixing

[Gavin Panella (allenap)]

[I wrote some comments on this yesterday and forgot to save them.]

Looks good to me. I've made some comments about `idempotent` which need addressing, but there's no need for me to block you on that.

You've just got to convince roaksoax now :)

review: Approve

[Andres Rodriguez (andreserl)]

Hehe se actually discussed it yesterday and came to the conclusion that we
need to change reset to restore and have individual
Methods for storage and networking!

On Friday, April 29, 2016, Gavin Panella <email address hidden>
wrote:

> Review: Approve
>
> [I wrote some comments on this yesterday and forgot to save them.]
>
> Looks good to me. I've made some comments about `idempotent` which need
> addressing, but there's no need for me to block you on that.
>
> You've just got to convince roaksoax now :)
>
> Diff comments:
>
> > === modified file 'src/maasserver/api/devices.py'
> > --- src/maasserver/api/devices.py 2016-04-14 15:25:36 +0000
> > +++ src/maasserver/api/devices.py 2016-04-28 09:04:07 +0000
> > @@ -117,6 +118,22 @@
> > device.delete()
> > return rc.DELETED
> >
> > + @operation(idempotent=True)
>
> I chose the argument name "idempotent" and unfortunately it wasn't a good
> choice. This reset operation is idempotent but it's also destructive, so
> this should be specified as idempotent=False. Ultimately this is used to
> specify an operation as available via GET (idempotent=True) or POST
> (idempotent=False), and this operation should definitely only be available
> via POST.
>
> > + def reset(self, request, system_id):
> > + """Reset a machine's network and storage options.
> > +
> > + Resets a machine's network and storage options as if the node
> was just
> > + commissioned.
> > +
> > + Returns 404 if the machine is not found
> > + Returns 403 if the user does not have permission to reset the
> machine.
>
> For this whole docstring, s/machine/device/ and remove mentions of storage
> options.
>
> > + """
> > + device = self.model.objects.get_node_or_404(
> > + system_id=system_id, user=request.user,
> > + perm=NODE_PERMISSION.ADMIN)
> > + device.set_initial_networking_configuration()
> > + return reload_object(device)
> > +
> > @operation(idempotent=False)
> > def set_owner_data(self, request, system_id):
> > """Set key/value data for the current owner.
> >
> > === modified file 'src/maasserver/api/machines.py'
> > --- src/maasserver/api/machines.py 2016-04-15 22:14:33 +0000
> > +++ src/maasserver/api/machines.py 2016-04-28 09:04:07 +0000
> > @@ -697,6 +700,22 @@
> > request.user.username)
> > return node
> >
> > + @operation(idempotent=True)
>
> Same here, re. idempotent.
>
> > + def reset(self, request, system_id):
> > + """Reset a machine's network and storage options.
> > +
> > + Resets a machine's network and storage options as if the node
> was just
> > + commissioned.
> > +
> > + Returns 404 if the machine is not found.
> > + Returns 403 if the user does not have permission to reset the
> machine.
> > + """
> > + machine = self.model.objects.get_node_or_404(
> > + system_id=system_id, user=request.user,
> > + perm=NODE_PERMISSION.ADMIN)
> > + machine.reset()
> > + return reload_object(machine)
> > +
> > @operation(idempotent=False)
> > def set_owner_data(...

[Lee Trager (ltrager)]

I've added a set_initial_networking_configuration and a restore_default_configuration operation in place of reset for both machines and devices. restore_default_configuration resets networking and storage options to default on machines, if there is anything else it should be resetting please let me know. For devices restore_default_configuration is the same as set_initial_networking_configuration, I added it to devices so MAAS has a consistent operation to reset all fields.

[Andres Rodriguez (andreserl)]

I thought we were gonna have a restore_network_configuration *and* a restore_storage_configuration or similar ?

review: Needs Information

[Lee Trager (ltrager)]

We have set_storage_config which can be used to set the storage layout. If you don't know what storage layout you have set you'd have todo

maas <profile> machine set-storage-layout <system_id> storage_layout=$(maas <profile> maas get-config name=default_storage_layout)

I could add some code so that setting storage_layout=default would automatically look up what the default is or restore_storage_configuration as you suggested.

[Andres Rodriguez (andreserl)]

Hi Lee,

IIRC, we agreed to use restore for both and the restore for storage
wouldn't set the default layout but rather get it to original?

On Wednesday, May 4, 2016, Lee Trager <email address hidden> wrote:

> We have set_storage_config which can be used to set the storage layout. If
> you don't know what storage layout you have set you'd have todo
>
> maas <profile> machine set-storage-layout <system_id>
> storage_layout=$(maas <profile> maas get-config name=default_storage_layout)
>
> I could add some code so that setting storage_layout=default would
> automatically look up what the default is or restore_storage_configuration
> as you suggested.
> --
> https://code.launchpad.net/~ltrager/maas/reset_node/+merge/293222
> You are reviewing the proposed merge of lp:~ltrager/maas/reset_node into
> lp:maas.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

[Lee Trager (ltrager)]

As per our IRC discussion this renames all restore operations to use the format store_*_configuration. I've also added a restore_storage_configuration which resets a machine's storage layout to whatever the global configuration option default_storage_layout is set to.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

Attempt to merge into lp:maas failed due to conflicts:

text conflict in src/maasserver/api/machines.py
text conflict in src/maasserver/api/tests/test_machine.py

[MAAS Lander (maas-lander)]

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

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [94.5 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Fetched 94.5 kB in 0s (197 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-2ubuntu3).
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
bzr is already the newest version (2.7.0-2ubuntu1).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
isc-dhcp-common is already the newest version (4.3.3-5ubuntu12).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
libpq-dev is already the newest version (9.5.2-1).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelin...

=== modified file 'src/maasserver/api/devices.py'
--- src/maasserver/api/devices.py	2016-04-28 01:14:14 +0000
+++ src/maasserver/api/devices.py	2016-05-09 20:14:05 +0000
@@ -12,6 +12,7 @@
     NodesHandler,
     OwnerDataMixin,
 )
+from maasserver.api.support import operation
 from maasserver.enum import NODE_PERMISSION
 from maasserver.exceptions import MAASAPIValidationError
 from maasserver.forms import (
@@ -19,6 +20,7 @@
     DeviceWithMACsForm,
 )
 from maasserver.models.node import Device
+from maasserver.utils.orm import reload_object
 from piston3.utils import rc
 
 # Device's fields exposed on the API.
@@ -116,6 +118,32 @@
         device.delete()
         return rc.DELETED
 
+    @operation(idempotent=False)
+    def restore_networking_configuration(self, request, system_id):
+        """Reset a device's network options.
+
+        Returns 404 if the device is not found
+        Returns 403 if the user does not have permission to reset the device.
+        """
+        device = self.model.objects.get_node_or_404(
+            system_id=system_id, user=request.user,
+            perm=NODE_PERMISSION.ADMIN)
+        device.set_initial_networking_configuration()
+        return reload_object(device)
+
+    @operation(idempotent=False)
+    def restore_default_configuration(self, request, system_id):
+        """Reset a device's configuration to its initial state.
+
+        Returns 404 if the device is not found.
+        Returns 403 if the user does not have permission to reset the device.
+        """
+        device = self.model.objects.get_node_or_404(
+            system_id=system_id, user=request.user,
+            perm=NODE_PERMISSION.ADMIN)
+        device.restore_default_configuration()
+        return reload_object(device)
+
     @classmethod
     def resource_uri(cls, device=None):
         # This method is called by piston in two different contexts:
 
=== modified file 'src/maasserver/api/machines.py'
--- src/maasserver/api/machines.py	2016-05-04 02:39:11 +0000
+++ src/maasserver/api/machines.py	2016-05-09 20:14:05 +0000
@@ -77,7 +77,10 @@
     StorageLayoutForm,
     StorageLayoutMissingBootDiskError,
 )
-from maasserver.utils.orm import get_first
+from maasserver.utils.orm import (
+    get_first,
+    reload_object,
+)
 import yaml
 
 # Machine's fields exposed on the API.
@@ -420,7 +423,7 @@
         Note: This will clear the current storage layout and any extra
         configuration and replace it will the new layout.
 
-        :param storage_layout: Storage layout for the machine. (flat, lvm
+        :param storage_layout: Storage layout for the machine. (flat, lvm,
             and bcache)
 
         The following are optional for all layouts:
@@ -583,6 +586,45 @@
             content_type='text/plain')
 
     @operation(idempotent=False)
+    def restore_networking_configuration(self, request, system_id):
+        """Reset a machine's networking options to its initial state.
+
+        Returns 404 if the machine is not found.
+        Returns 403 if the user does not have permission to reset the machine.
+        """
+        machine = self.model.objects.get_node_or_404(
+            system_id=system_id, user=request.user,
+            perm=NODE_PERMISSION.ADMIN)
+        machine.set_initial_networking_configuration()
+        return reload_object(machine)
+
+    @operation(idempotent=False)
+    def restore_storage_configuration(self, request, system_id):
+        """Reset a machine's storage options to its initial state.
+
+        Returns 404 if the machine is not found.
+        Returns 403 if the user does not have permission to reset the machine.
+        """
+        machine = self.model.objects.get_node_or_404(
+            system_id=system_id, user=request.user,
+            perm=NODE_PERMISSION.ADMIN)
+        machine.set_default_storage_layout()
+        return reload_object(machine)
+
+    @operation(idempotent=False)
+    def restore_default_configuration(self, request, system_id):
+        """Reset a machine's configuration to its initial state.
+
+        Returns 404 if the machine is not found.
+        Returns 403 if the user does not have permission to reset the machine.
+        """
+        machine = self.model.objects.get_node_or_404(
+            system_id=system_id, user=request.user,
+            perm=NODE_PERMISSION.ADMIN)
+        machine.restore_default_configuration()
+        return reload_object(machine)
+
+    @operation(idempotent=False)
     def mark_broken(self, request, system_id):
         """Mark a node as 'broken'.
 
 
=== modified file 'src/maasserver/api/tests/test_devices.py'
--- src/maasserver/api/tests/test_devices.py	2016-04-22 17:28:15 +0000
+++ src/maasserver/api/tests/test_devices.py	2016-05-09 20:14:05 +0000
@@ -16,11 +16,13 @@
 from maasserver.models import (
     Device,
     Domain,
+    node as node_module,
 )
 from maasserver.testing.api import APITestCase
 from maasserver.testing.factory import factory
 from maasserver.utils.converters import json_load_bytes
 from maasserver.utils.orm import reload_object
+from maastesting.matchers import MockCalledOnce
 
 
 class DeviceOwnerDataTest(APITestCase):
@@ -348,3 +350,45 @@
         response = self.client.delete(get_device_uri(device))
         self.assertEqual(http.client.FORBIDDEN, response.status_code)
         self.assertEqual(device, reload_object(device))
+
+    def test_restore_networking_configuration(self):
+        self.become_admin()
+        device = factory.make_Device()
+        mock_set_initial_networking_config = self.patch(
+            node_module.Device, 'set_initial_networking_configuration')
+        response = self.client.post(
+            get_device_uri(device),
+            {'op': 'restore_networking_configuration'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            device.system_id, json_load_bytes(response.content)['system_id'])
+        self.assertThat(mock_set_initial_networking_config, MockCalledOnce())
+
+    def test_restore_networking_configuration_requires_admin(self):
+        device = factory.make_Device()
+        response = self.client.post(
+            get_device_uri(device),
+            {'op': 'restore_networking_configuration'})
+        self.assertEqual(
+            http.client.FORBIDDEN, response.status_code, response.content)
+
+    def test_restore_default_configuration(self):
+        self.become_admin()
+        device = factory.make_Device()
+        mock_set_initial_networking_config = self.patch(
+            node_module.Device, 'restore_default_configuration')
+        response = self.client.post(
+            get_device_uri(device),
+            {'op': 'restore_default_configuration'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            device.system_id, json_load_bytes(response.content)['system_id'])
+        self.assertThat(mock_set_initial_networking_config, MockCalledOnce())
+
+    def test_restore_default_configuration_requires_admin(self):
+        device = factory.make_Device()
+        response = self.client.post(
+            get_device_uri(device),
+            {'op': 'restore_default_configuration'})
+        self.assertEqual(
+            http.client.FORBIDDEN, response.status_code, response.content)
 
=== modified file 'src/maasserver/api/tests/test_machine.py'
--- src/maasserver/api/tests/test_machine.py	2016-05-04 02:39:11 +0000
+++ src/maasserver/api/tests/test_machine.py	2016-05-09 20:14:05 +0000
@@ -57,6 +57,7 @@
 from maastesting.matchers import (
     Equals,
     HasLength,
+    MockCalledOnce,
     MockCalledOnceWith,
 )
 from metadataserver.models import (
@@ -1885,6 +1886,96 @@
             mock_get_curtin_merged_config, MockCalledOnceWith(machine))
 
 
+class TestRestoreNetworkingConfiguration(APITestCase):
+    """Tests for
+    /api/2.0/machines/<machine>/?op=restore_networking_configuration"""
+
+    def get_machine_uri(self, machine):
+        """Get the API URI for `machine`."""
+        return reverse('machine_handler', args=[machine.system_id])
+
+    def test_(self):
+        self.become_admin()
+        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        mock_set_initial_networking_config = self.patch(
+            node_module.Machine, 'set_initial_networking_configuration')
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_networking_configuration'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            machine.system_id, json_load_bytes(response.content)['system_id'])
+        self.assertThat(mock_set_initial_networking_config, MockCalledOnce())
+
+    def test_restore_networking_configuration_requires_admin(self):
+        machine = factory.make_Machine()
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_networking_configuration'})
+        self.assertEqual(
+            http.client.FORBIDDEN, response.status_code, response.content)
+
+
+class TestRestoreStorageConfiguration(APITestCase):
+    """Tests for
+    /api/2.0/machines/<machine>/?op=restore_storage_configuration"""
+
+    def get_machine_uri(self, machine):
+        """Get the API URI for `machine`."""
+        return reverse('machine_handler', args=[machine.system_id])
+
+    def test_restore_storage_configuration(self):
+        self.become_admin()
+        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        mock_set_default_storage_layout = self.patch(
+            node_module.Machine, 'set_default_storage_layout')
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_storage_configuration'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            machine.system_id, json_load_bytes(response.content)['system_id'])
+        self.assertThat(mock_set_default_storage_layout, MockCalledOnce())
+
+    def test_restore_storage_configuration_requires_admin(self):
+        machine = factory.make_Machine()
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_storage_configuration'})
+        self.assertEqual(
+            http.client.FORBIDDEN, response.status_code, response.content)
+
+
+class TestRestoreDefaultConfiguration(APITestCase):
+    """Tests for
+    /api/2.0/machines/<machine>/?op=restore_default_configuration"""
+
+    def get_machine_uri(self, machine):
+        """Get the API URI for `machine`."""
+        return reverse('machine_handler', args=[machine.system_id])
+
+    def test_restore_default_configuration(self):
+        self.become_admin()
+        machine = factory.make_Machine(status=NODE_STATUS.READY)
+        mock_restore_default_configuration = self.patch(
+            node_module.Machine, 'restore_default_configuration')
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_default_configuration'})
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertEqual(
+            machine.system_id, json_load_bytes(response.content)['system_id'])
+        self.assertThat(mock_restore_default_configuration, MockCalledOnce())
+
+    def test_restore_default_configuration_requires_admin(self):
+        machine = factory.make_Machine()
+        response = self.client.post(
+            self.get_machine_uri(machine),
+            {'op': 'restore_default_configuration'})
+        self.assertEqual(
+            http.client.FORBIDDEN, response.status_code, response.content)
+
+
 class TestMarkBroken(APITestCase):
 
     def get_node_uri(self, machine):
 
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-05-09 17:19:23 +0000
+++ src/maasserver/models/node.py	2016-05-09 20:14:05 +0000
@@ -2423,6 +2423,13 @@
             # No interfaces on the node. Nothing to do.
             return
 
+        if self.node_type == NODE_TYPE.MACHINE and self.status not in [
+                NODE_STATUS.NEW, NODE_STATUS.READY, NODE_STATUS.ALLOCATED,
+                NODE_STATUS.FAILED_DEPLOYMENT]:
+            raise ValidationError(
+                "Machine must be in a new, ready, allocated, or failed "
+                "deployment state to be reset.")
+
         # Set AUTO mode on the boot interface.
         auto_set = False
         discovered_addresses = boot_interface.ip_addresses.filter(
@@ -3066,6 +3073,17 @@
         super(Machine, self).__init__(
             node_type=NODE_TYPE.MACHINE, *args, **kwargs)
 
+    def restore_default_configuration(self):
+        """Restores a machine's configuration to default settings."""
+        if self.status not in [
+                NODE_STATUS.NEW, NODE_STATUS.READY, NODE_STATUS.ALLOCATED,
+                NODE_STATUS.FAILED_DEPLOYMENT]:
+            raise ValidationError(
+                "Machine must be in a new, ready, allocated, or failed "
+                "deployment state to restore default configuration.")
+        self.set_default_storage_layout()
+        self.set_initial_networking_configuration()
+
 
 class Controller(Node):
     """A node which is either a rack or region controller."""
@@ -3795,6 +3813,10 @@
         super(Device, self).__init__(
             node_type=NODE_TYPE.DEVICE, *args, **kwargs)
 
+    def restore_default_configuration(self):
+        """Restores a device's configuration to default settings."""
+        self.set_initial_networking_configuration()
+
     def clean_architecture(self, prev):
         # Devices aren't required to have a defined architecture
         pass
 
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-05-04 16:23:11 +0000
+++ src/maasserver/models/tests/test_node.py	2016-05-09 20:14:05 +0000
@@ -106,6 +106,7 @@
     deferToDatabase,
 )
 from maastesting.matchers import (
+    MockCalledOnce,
     MockCalledOnceWith,
     MockCallsMatch,
     MockNotCalled,
@@ -293,6 +294,30 @@
             list(Machine.objects.get_available_machines_for_acquisition(user)))
 
 
+class TestMachine(MAASServerTestCase):
+    def test_restore_default_configuration(self):
+        machine = factory.make_Machine(status=NODE_STATUS.NEW)
+        mock_set_default_storage_layout = self.patch(
+            machine, 'set_default_storage_layout')
+        mock_set_initial_networking_configuration = self.patch(
+            machine, 'set_initial_networking_configuration')
+        machine.restore_default_configuration()
+        self.assertThat(mock_set_default_storage_layout, MockCalledOnce())
+        self.assertThat(
+            mock_set_initial_networking_configuration, MockCalledOnce())
+
+    def test_restore_default_configuration_error_wrong_status(self):
+        machine = factory.make_Machine_with_Interface_on_Subnet(
+            status=factory.pick_choice(
+                NODE_STATUS_CHOICES,
+                but_not=[
+                    NODE_STATUS.NEW, NODE_STATUS.READY, NODE_STATUS.ALLOCATED,
+                    NODE_STATUS.FAILED_DEPLOYMENT])
+        )
+        self.assertRaises(
+            ValidationError, machine.restore_default_configuration)
+
+
 class TestControllerManager(MAASServerTestCase):
     def test_controller_lists_node_type_rack_and_region(self):
         racks_and_regions = set()
@@ -481,6 +506,17 @@
         self.assertEqual('', device.architecture)
 
 
+class TestDevice(MAASServerTestCase):
+
+    def test_restore_default_configuration(self):
+        device = factory.make_Device()
+        mock_set_initial_networking_configuration = self.patch(
+            device, 'set_initial_networking_configuration')
+        device.restore_default_configuration()
+        self.assertThat(
+            mock_set_initial_networking_configuration, MockCalledOnce())
+
+
 class TestNode(MAASServerTestCase):
 
     def setUp(self):
@@ -3610,6 +3646,17 @@
             alloc_type=IPADDRESS_TYPE.AUTO).first()
         self.assertIsNone(auto_ip)
 
+    def test_set_initial_net_config_rasies_validation_error_wrong_status(self):
+        machine = factory.make_Machine_with_Interface_on_Subnet(
+            status=factory.pick_choice(
+                NODE_STATUS_CHOICES,
+                but_not=[
+                    NODE_STATUS.NEW, NODE_STATUS.READY, NODE_STATUS.ALLOCATED,
+                    NODE_STATUS.FAILED_DEPLOYMENT])
+        )
+        self.assertRaises(
+            ValidationError, machine.set_initial_networking_configuration)
+
     def test_set_initial_networking_configuration_auto_on_boot_nic(self):
         node = factory.make_Node_with_Interface_on_Subnet()
         boot_interface = node.get_boot_interface()
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2016-05-05 17:22:16 +0000
+++ src/maasserver/testing/factory.py	2016-05-09 20:14:05 +0000
@@ -66,6 +66,7 @@
     IPRange,
     LargeFile,
     LicenseKey,
+    Machine,
     Node,
     OwnerData,
     Partition,
@@ -426,6 +427,10 @@
             Node.objects.filter(id=node.id).update(created=created)
         return reload_object(node)
 
+    def make_Machine(self, *args, **kwargs):
+        machine = self.make_Node(*args, node_type=NODE_TYPE.MACHINE, **kwargs)
+        return typecast_node(machine, Machine)
+
     def make_RackController(
             self, last_image_sync=undefined, owner=None, **kwargs):
         if owner is None:
@@ -680,6 +685,11 @@
             vlan.save()
         return reload_object(node)
 
+    def make_Machine_with_Interface_on_Subnet(self, *args, **kwargs):
+        machine = self.make_Node_with_Interface_on_Subnet(
+            *args, node_type=NODE_TYPE.MACHINE, **kwargs)
+        return typecast_node(machine, Machine)
+
     UNDEFINED = float('NaN')
 
     def _get_exclude_list(self, subnet):