Merge lp:~jtv/maas/extract-formtests-node into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Extract Node form tests into their own test module.

For self-approval.

Jeroen

[Jeroen T. Vermeulen (jtv)]

Looks OK. Self-approving.

review: Approve

=== modified file 'src/maasserver/tests/test_forms.py'
--- src/maasserver/tests/test_forms.py	2014-08-26 05:43:19 +0000
+++ src/maasserver/tests/test_forms.py	2014-08-26 07:57:29 +0000
@@ -18,7 +18,6 @@
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from maasserver.clusterrpc.power_parameters import get_power_type_choices
 from maasserver.enum import (
     NODE_STATUS,
     NODEGROUP_STATUS,
@@ -27,7 +26,6 @@
 from maasserver.forms import (
     AdminNodeForm,
     AdminNodeWithMACAddressesForm,
-    BLANK_CHOICE,
     ERROR_MESSAGE_STATIC_IPS_OUTSIDE_RANGE,
     ERROR_MESSAGE_STATIC_RANGE_IN_USE,
     get_node_create_form,
@@ -37,7 +35,6 @@
     MACAddressForm,
     MAX_MESSAGES,
     merge_error_messages,
-    NO_ARCHITECTURES_AVAILABLE,
     NodeForm,
     NodeGroupInterfaceForeignDHCPForm,
     NodeGroupInterfaceForm,
@@ -56,17 +53,9 @@
     )
 from maasserver.models.network import get_name_and_vlan_from_cluster_interface
 from maasserver.models.staticipaddress import StaticIPAddress
-from maasserver.testing.architecture import (
-    make_usable_architecture,
-    patch_usable_architectures,
-    )
+from maasserver.testing.architecture import make_usable_architecture
 from maasserver.testing.factory import factory
 from maasserver.testing.orm import reload_object
-from maasserver.testing.osystems import (
-    make_osystem_with_releases,
-    make_usable_osystem,
-    patch_usable_osystems,
-    )
 from maasserver.testing.testcase import MAASServerTestCase
 from maastesting.matchers import MockCalledOnceWith
 from netaddr import IPNetwork
@@ -202,318 +191,6 @@
             AdminNodeWithMACAddressesForm, get_node_create_form(admin))
 
 
-class TestNodeForm(MAASServerTestCase):
-
-    def test_contains_limited_set_of_fields(self):
-        form = NodeForm()
-
-        self.assertEqual(
-            [
-                'hostname',
-                'architecture',
-                'osystem',
-                'distro_series',
-                'license_key',
-                'disable_ipv4',
-                'nodegroup',
-            ], 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={
-            'hostname': factory.make_name('host'),
-            'architecture': arch,
-            })
-        self.assertTrue(form.is_valid(), form._errors)
-
-    def test_rejects_unusable_architecture(self):
-        patch_usable_architectures(self)
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': factory.make_name('arch'),
-            })
-        self.assertFalse(form.is_valid())
-        self.assertItemsEqual(['architecture'], form._errors.keys())
-
-    def test_starts_with_default_architecture(self):
-        arches = sorted([factory.make_name('arch') for _ in range(5)])
-        patch_usable_architectures(self, arches)
-        form = NodeForm()
-        self.assertEqual(
-            pick_default_architecture(arches),
-            form.fields['architecture'].initial)
-
-    def test_adds_blank_default_when_no_arches_available(self):
-        patch_usable_architectures(self, [])
-        form = NodeForm()
-        self.assertEqual(
-            [BLANK_CHOICE],
-            form.fields['architecture'].choices)
-
-    def test_adds_error_when_no_arches_available(self):
-        patch_usable_architectures(self, [])
-        form = NodeForm()
-        self.assertFalse(form.is_valid())
-        self.assertEqual(
-            [NO_ARCHITECTURES_AVAILABLE],
-            form.errors['architecture'])
-
-    def test_accepts_osystem(self):
-        osystem = make_usable_osystem(self)
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            })
-        self.assertTrue(form.is_valid(), form._errors)
-
-    def test_rejects_invalid_osystem(self):
-        patch_usable_osystems(self)
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': factory.make_name('os'),
-            })
-        self.assertFalse(form.is_valid())
-        self.assertItemsEqual(['osystem'], form._errors.keys())
-
-    def test_starts_with_default_osystem(self):
-        osystems = [make_osystem_with_releases(self) for _ in range(5)]
-        patch_usable_osystems(self, osystems)
-        form = NodeForm()
-        self.assertEqual(
-            '',
-            form.fields['osystem'].initial)
-
-    def test_accepts_osystem_distro_series(self):
-        osystem = make_usable_osystem(self)
-        release = osystem.get_default_release()
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            'distro_series': '%s/%s' % (osystem.name, release),
-            })
-        self.assertTrue(form.is_valid(), form._errors)
-
-    def test_rejects_invalid_osystem_distro_series(self):
-        osystem = make_usable_osystem(self)
-        release = factory.make_name('release')
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            'distro_series': '%s/%s' % (osystem.name, release),
-            })
-        self.assertFalse(form.is_valid())
-        self.assertItemsEqual(['distro_series'], form._errors.keys())
-
-    def test_starts_with_default_distro_series(self):
-        osystems = [make_osystem_with_releases(self) for _ in range(5)]
-        patch_usable_osystems(self, osystems)
-        form = NodeForm()
-        self.assertEqual(
-            '',
-            form.fields['distro_series'].initial)
-
-    def test_rejects_mismatch_osystem_distro_series(self):
-        osystem = make_usable_osystem(self)
-        release = osystem.get_default_release()
-        invalid = factory.make_name('invalid_os')
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            'distro_series': '%s/%s' % (invalid, release),
-            })
-        self.assertFalse(form.is_valid())
-        self.assertItemsEqual(['distro_series'], form._errors.keys())
-
-    def test_rejects_missing_license_key(self):
-        osystem = make_usable_osystem(self)
-        release = osystem.get_default_release()
-        self.patch(osystem, 'requires_license_key').return_value = True
-        mock_validate = self.patch(osystem, 'validate_license_key')
-        mock_validate.return_value = True
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            'distro_series': '%s/%s*' % (osystem.name, release),
-            })
-        self.assertFalse(form.is_valid())
-        self.assertItemsEqual(['license_key'], form._errors.keys())
-
-    def test_calls_validate_license_key(self):
-        osystem = make_usable_osystem(self)
-        release = osystem.get_default_release()
-        self.patch(osystem, 'requires_license_key').return_value = True
-        mock_validate = self.patch(osystem, 'validate_license_key')
-        mock_validate.return_value = True
-        form = NodeForm(data={
-            'hostname': factory.make_name('host'),
-            'architecture': make_usable_architecture(self),
-            'osystem': osystem.name,
-            'distro_series': '%s/%s*' % (osystem.name, release),
-            'license_key': factory.make_string(),
-            })
-        self.assertTrue(form.is_valid())
-        mock_validate.assert_called_once()
-
-    def test_rejects_duplicate_fqdn_with_unmanaged_dns_on_one_nodegroup(self):
-        # If a host with a given hostname exists on a managed nodegroup,
-        # new nodes on unmanaged nodegroups with hostnames that match
-        # that FQDN will be rejected.
-        nodegroup = factory.make_node_group(
-            status=NODEGROUP_STATUS.ACCEPTED,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
-        node = factory.make_node(
-            hostname=factory.make_name("hostname"), nodegroup=nodegroup)
-        other_nodegroup = factory.make_node_group()
-        form = NodeForm(data={
-            'nodegroup': other_nodegroup,
-            'hostname': node.fqdn,
-            'architecture': make_usable_architecture(self),
-        })
-        form.instance.nodegroup = other_nodegroup
-        self.assertFalse(form.is_valid())
-
-    def test_rejects_duplicate_fqdn_on_same_nodegroup(self):
-        # If a node with a given FQDN exists on a managed nodegroup, new
-        # nodes on that nodegroup with duplicate FQDNs will be rejected.
-        nodegroup = factory.make_node_group(
-            status=NODEGROUP_STATUS.ACCEPTED,
-            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
-        node = factory.make_node(
-            hostname=factory.make_name("hostname"), nodegroup=nodegroup)
-        form = NodeForm(data={
-            'nodegroup': nodegroup,
-            'hostname': node.fqdn,
-            'architecture': make_usable_architecture(self),
-        })
-        form.instance.nodegroup = nodegroup
-        self.assertFalse(form.is_valid())
-
-
-class TestAdminNodeForm(MAASServerTestCase):
-
-    def test_AdminNodeForm_contains_limited_set_of_fields(self):
-        node = factory.make_node()
-        form = AdminNodeForm(instance=node)
-
-        self.assertEqual(
-            [
-                'hostname',
-                'architecture',
-                'osystem',
-                'distro_series',
-                'license_key',
-                'disable_ipv4',
-                'power_type',
-                'power_parameters',
-                'cpu_count',
-                'memory',
-                'storage',
-                'zone',
-            ],
-            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()
-        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):
-        node = factory.make_node()
-        form = AdminNodeForm(instance=node)
-        self.assertEqual(node.power_type, form.fields['power_type'].initial)
-
-    def test_AdminNodeForm_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(
-            data={
-                'hostname': hostname,
-                'architecture': arch,
-                'power_type': power_type,
-                'power_parameters_field': power_parameters_field,
-                'power_parameters_skip_check': True,
-                },
-            instance=node)
-        form.save()
-
-        self.assertEqual(
-            (hostname, power_type, {'field': power_parameters_field}),
-            (node.hostname, node.power_type, node.power_parameters))
-
-    def test_AdminForm_does_not_permit_nodegroup_change(self):
-        # We had to make Node.nodegroup editable to get Django to
-        # validate it as non-blankable, but that doesn't mean that we
-        # actually want to allow people to edit it through API or UI.
-        old_nodegroup = factory.make_node_group()
-        node = factory.make_node(
-            nodegroup=old_nodegroup,
-            architecture=make_usable_architecture(self))
-        new_nodegroup = factory.make_node_group()
-        AdminNodeForm(data={'nodegroup': new_nodegroup}, instance=node).save()
-        # The form saved without error, but the nodegroup change was ignored.
-        self.assertEqual(old_nodegroup, node.nodegroup)
-
-
 class TestMergeErrorMessages(MAASServerTestCase):
 
     def test_merge_error_messages_returns_summary_message(self):

=== 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	2014-08-26 07:57:29 +0000
@@ -0,0 +1,352 @@
+# Copyright 2014 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for node forms."""
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+str = None
+
+__metaclass__ = type
+__all__ = []
+
+from maasserver.clusterrpc.power_parameters import get_power_type_choices
+from maasserver.enum import (
+    NODEGROUP_STATUS,
+    NODEGROUPINTERFACE_MANAGEMENT,
+    )
+from maasserver.forms import (
+    AdminNodeForm,
+    BLANK_CHOICE,
+    NO_ARCHITECTURES_AVAILABLE,
+    NodeForm,
+    pick_default_architecture,
+    )
+from maasserver.testing.architecture import (
+    make_usable_architecture,
+    patch_usable_architectures,
+    )
+from maasserver.testing.factory import factory
+from maasserver.testing.orm import reload_object
+from maasserver.testing.osystems import (
+    make_osystem_with_releases,
+    make_usable_osystem,
+    patch_usable_osystems,
+    )
+from maasserver.testing.testcase import MAASServerTestCase
+
+
+class TestNodeForm(MAASServerTestCase):
+
+    def test_contains_limited_set_of_fields(self):
+        form = NodeForm()
+
+        self.assertEqual(
+            [
+                'hostname',
+                'architecture',
+                'osystem',
+                'distro_series',
+                'license_key',
+                'disable_ipv4',
+                'nodegroup',
+            ], 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={
+            'hostname': factory.make_name('host'),
+            'architecture': arch,
+            })
+        self.assertTrue(form.is_valid(), form._errors)
+
+    def test_rejects_unusable_architecture(self):
+        patch_usable_architectures(self)
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': factory.make_name('arch'),
+            })
+        self.assertFalse(form.is_valid())
+        self.assertItemsEqual(['architecture'], form._errors.keys())
+
+    def test_starts_with_default_architecture(self):
+        arches = sorted([factory.make_name('arch') for _ in range(5)])
+        patch_usable_architectures(self, arches)
+        form = NodeForm()
+        self.assertEqual(
+            pick_default_architecture(arches),
+            form.fields['architecture'].initial)
+
+    def test_adds_blank_default_when_no_arches_available(self):
+        patch_usable_architectures(self, [])
+        form = NodeForm()
+        self.assertEqual(
+            [BLANK_CHOICE],
+            form.fields['architecture'].choices)
+
+    def test_adds_error_when_no_arches_available(self):
+        patch_usable_architectures(self, [])
+        form = NodeForm()
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            [NO_ARCHITECTURES_AVAILABLE],
+            form.errors['architecture'])
+
+    def test_accepts_osystem(self):
+        osystem = make_usable_osystem(self)
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            })
+        self.assertTrue(form.is_valid(), form._errors)
+
+    def test_rejects_invalid_osystem(self):
+        patch_usable_osystems(self)
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': factory.make_name('os'),
+            })
+        self.assertFalse(form.is_valid())
+        self.assertItemsEqual(['osystem'], form._errors.keys())
+
+    def test_starts_with_default_osystem(self):
+        osystems = [make_osystem_with_releases(self) for _ in range(5)]
+        patch_usable_osystems(self, osystems)
+        form = NodeForm()
+        self.assertEqual(
+            '',
+            form.fields['osystem'].initial)
+
+    def test_accepts_osystem_distro_series(self):
+        osystem = make_usable_osystem(self)
+        release = osystem.get_default_release()
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            'distro_series': '%s/%s' % (osystem.name, release),
+            })
+        self.assertTrue(form.is_valid(), form._errors)
+
+    def test_rejects_invalid_osystem_distro_series(self):
+        osystem = make_usable_osystem(self)
+        release = factory.make_name('release')
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            'distro_series': '%s/%s' % (osystem.name, release),
+            })
+        self.assertFalse(form.is_valid())
+        self.assertItemsEqual(['distro_series'], form._errors.keys())
+
+    def test_starts_with_default_distro_series(self):
+        osystems = [make_osystem_with_releases(self) for _ in range(5)]
+        patch_usable_osystems(self, osystems)
+        form = NodeForm()
+        self.assertEqual(
+            '',
+            form.fields['distro_series'].initial)
+
+    def test_rejects_mismatch_osystem_distro_series(self):
+        osystem = make_usable_osystem(self)
+        release = osystem.get_default_release()
+        invalid = factory.make_name('invalid_os')
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            'distro_series': '%s/%s' % (invalid, release),
+            })
+        self.assertFalse(form.is_valid())
+        self.assertItemsEqual(['distro_series'], form._errors.keys())
+
+    def test_rejects_missing_license_key(self):
+        osystem = make_usable_osystem(self)
+        release = osystem.get_default_release()
+        self.patch(osystem, 'requires_license_key').return_value = True
+        mock_validate = self.patch(osystem, 'validate_license_key')
+        mock_validate.return_value = True
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            'distro_series': '%s/%s*' % (osystem.name, release),
+            })
+        self.assertFalse(form.is_valid())
+        self.assertItemsEqual(['license_key'], form._errors.keys())
+
+    def test_calls_validate_license_key(self):
+        osystem = make_usable_osystem(self)
+        release = osystem.get_default_release()
+        self.patch(osystem, 'requires_license_key').return_value = True
+        mock_validate = self.patch(osystem, 'validate_license_key')
+        mock_validate.return_value = True
+        form = NodeForm(data={
+            'hostname': factory.make_name('host'),
+            'architecture': make_usable_architecture(self),
+            'osystem': osystem.name,
+            'distro_series': '%s/%s*' % (osystem.name, release),
+            'license_key': factory.make_string(),
+            })
+        self.assertTrue(form.is_valid())
+        mock_validate.assert_called_once()
+
+    def test_rejects_duplicate_fqdn_with_unmanaged_dns_on_one_nodegroup(self):
+        # If a host with a given hostname exists on a managed nodegroup,
+        # new nodes on unmanaged nodegroups with hostnames that match
+        # that FQDN will be rejected.
+        nodegroup = factory.make_node_group(
+            status=NODEGROUP_STATUS.ACCEPTED,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
+        node = factory.make_node(
+            hostname=factory.make_name("hostname"), nodegroup=nodegroup)
+        other_nodegroup = factory.make_node_group()
+        form = NodeForm(data={
+            'nodegroup': other_nodegroup,
+            'hostname': node.fqdn,
+            'architecture': make_usable_architecture(self),
+        })
+        form.instance.nodegroup = other_nodegroup
+        self.assertFalse(form.is_valid())
+
+    def test_rejects_duplicate_fqdn_on_same_nodegroup(self):
+        # If a node with a given FQDN exists on a managed nodegroup, new
+        # nodes on that nodegroup with duplicate FQDNs will be rejected.
+        nodegroup = factory.make_node_group(
+            status=NODEGROUP_STATUS.ACCEPTED,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
+        node = factory.make_node(
+            hostname=factory.make_name("hostname"), nodegroup=nodegroup)
+        form = NodeForm(data={
+            'nodegroup': nodegroup,
+            'hostname': node.fqdn,
+            'architecture': make_usable_architecture(self),
+        })
+        form.instance.nodegroup = nodegroup
+        self.assertFalse(form.is_valid())
+
+
+class TestAdminNodeForm(MAASServerTestCase):
+
+    def test_AdminNodeForm_contains_limited_set_of_fields(self):
+        node = factory.make_node()
+        form = AdminNodeForm(instance=node)
+
+        self.assertEqual(
+            [
+                'hostname',
+                'architecture',
+                'osystem',
+                'distro_series',
+                'license_key',
+                'disable_ipv4',
+                'power_type',
+                'power_parameters',
+                'cpu_count',
+                'memory',
+                'storage',
+                'zone',
+            ],
+            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()
+        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):
+        node = factory.make_node()
+        form = AdminNodeForm(instance=node)
+        self.assertEqual(node.power_type, form.fields['power_type'].initial)
+
+    def test_AdminNodeForm_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(
+            data={
+                'hostname': hostname,
+                'architecture': arch,
+                'power_type': power_type,
+                'power_parameters_field': power_parameters_field,
+                'power_parameters_skip_check': True,
+                },
+            instance=node)
+        form.save()
+
+        self.assertEqual(
+            (hostname, power_type, {'field': power_parameters_field}),
+            (node.hostname, node.power_type, node.power_parameters))
+
+    def test_AdminForm_does_not_permit_nodegroup_change(self):
+        # We had to make Node.nodegroup editable to get Django to
+        # validate it as non-blankable, but that doesn't mean that we
+        # actually want to allow people to edit it through API or UI.
+        old_nodegroup = factory.make_node_group()
+        node = factory.make_node(
+            nodegroup=old_nodegroup,
+            architecture=make_usable_architecture(self))
+        new_nodegroup = factory.make_node_group()
+        AdminNodeForm(data={'nodegroup': new_nodegroup}, instance=node).save()
+        # The form saved without error, but the nodegroup change was ignored.
+        self.assertEqual(old_nodegroup, node.nodegroup)