Merge ~ltrager/maas:no-arch-and-mac-address-validation-with-ipmi-power-parameters into maas:master

[Lee Trager]

LP: #1707216 - Allow machines with IPMI BMCs to be added without arch or MAC

Machines which use an IPMI BMC may now be added without giving an architecture and/or MAC addresses. If an incorrect MAC address is
given it will be automatically corrected.

Scenarios tested in the CI
* Enlistment via power on of the BMC
* Adding a machine with the correct architecture and MAC address
* Adding a machine with the correct architecture and a bad MAC address
* Adding a machine with no architecture and correct MAC address
* Adding a machine with no architecture or MAC address

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fd05ed24e861c86ab35276f07cb98676cbb928cd

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e3bc53406b3c6188943bdd710ecb77ce915e127e

review: Approve

1e112aa... by Lee Trager on 2018-06-21

Merge branch 'master' into no-arch-and-mac-address-validation-with-ipmi-power-parameters

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1e112aa3f60f1e132e4774a1edbd0898f8d2b397

review: Approve

[Andres Rodriguez (andreserl)]

Please see inline.

review: Needs Information

e309910... by Lee Trager on 2018-06-21

Merge branch 'master' into no-arch-and-mac-address-validation-with-ipmi-power-parameters

[Lee Trager (ltrager)]

The changes to the Javascript allow a user to create a machine without an architecture or MAC address. If no architecture is given but a MAC address is given the form ignores the given MAC address(see line 328 of the review). This forces the machine to go into enlistment which sets a proper architecture and commissioning sets the correct MAC address.

[Andres Rodriguez (andreserl)]

So why ignore the MAC address. If the user is giving us a MAC address we
shouldn't be ignoring it becuase that's what the user gave us.

On Thu, Jun 21, 2018 at 12:28 PM, Lee Trager <email address hidden>
wrote:

> The changes to the Javascript allow a user to create a machine without an
> architecture or MAC address. If no architecture is given but a MAC address
> is given the form ignores the given MAC address(see line 328 of the
> review). This forces the machine to go into enlistment which sets a proper
> architecture and commissioning sets the correct MAC address.
> --
> https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/348256
> You are reviewing the proposed merge of ~ltrager/maas:no-arch-and-mac-
> address-validation-with-ipmi-power-parameters into maas:master.
>

--
Andres Rodriguez
Engineering Manager, MAAS
Canonical USA, Inc.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e309910f2a81d542c9bf26477797b92db091046c

review: Approve

[Lee Trager (ltrager)]

If the MAC address is set the machine will go into commissioning. Commissioning will fail when the preseed is fetched because the preseed needs the correct architecture to know what repositories to configure. Even if we work around that problem the architecture still needs to be set for deployments. Currently, only enlistment discovers the architecture.

When commissioning runs the MAC addresses are set correctly. If the MAC the user gave us is really on the machine it will be added.

e73bce4... by Lee Trager on 2018-06-26

Merge branch 'master' into no-arch-and-mac-address-validation-with-ipmi-power-parameters

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3277/console
COMMIT: e73bce441a7296fc77441b0c7c5b2dfb0dd67956

review: Needs Fixing

123adab... by Lee Trager on 2018-06-28

Merge branch 'master' into no-arch-and-mac-address-validation-with-ipmi-power-parameters

[MAAS Lander (maas-lander)]

UNIT TESTS
-b no-arch-and-mac-address-validation-with-ipmi-power-parameters lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 123adab60c94f28c336c3088382fd54d4bb37e3c

review: Approve

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 9d9bad6..f8d1f84 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -60,6 +60,7 @@ from maasserver.exceptions import (
     Unauthorized,
 )
 from maasserver.forms import (
+    AdminMachineForm,
     get_machine_create_form,
     get_machine_edit_form,
 )
@@ -1064,43 +1065,46 @@ class MachineHandler(NodeHandler, OwnerDataMixin, PowerMixin):
         return machine
 
 
-def create_machine(request):
-    """Service an http request to create a machine.
-
-    The machine will be in the New state.
-
-    :param request: The http request for this machine to be created.
-    :return: A `Machine`.
-    :rtype: :class:`maasserver.models.Machine`.
-    :raises: ValidationError
-    """
-
+def fix_architecture(data):
     # For backwards compatibilty reasons, requests may be sent with:
     #     architecture with a '/' in it: use normally
     #     architecture without a '/' and no subarchitecture: assume 'generic'
     #     architecture without a '/' and a subarchitecture: use as specified
     #     architecture with a '/' and a subarchitecture: error
-    given_arch = request.data.get('architecture', None)
-    given_subarch = request.data.get('subarchitecture', None)
-    given_min_hwe_kernel = request.data.get('min_hwe_kernel', None)
-    altered_query_data = request.data.copy()
-    if given_arch and '/' in given_arch:
-        if given_subarch:
+    architecture = data.get('architecture', None)
+    subarchitecture = data.get('subarchitecture', None)
+    if architecture and '/' in architecture:
+        if subarchitecture:
             # Architecture with a '/' and a subarchitecture: error.
             raise MAASAPIValidationError(
                 'Subarchitecture cannot be specified twice.')
-        # Architecture with a '/' in it: use normally.
-    elif given_arch:
-        if given_subarch:
+    elif architecture:
+        if subarchitecture:
             # Architecture without a '/' and a subarchitecture:
             # use as specified.
-            altered_query_data['architecture'] = '/'.join(
-                [given_arch, given_subarch])
-            del altered_query_data['subarchitecture']
+            data['architecture'] = '/'.join([architecture, subarchitecture])
+            del data['subarchitecture']
         else:
             # Architecture without a '/' and no subarchitecture:
             # assume 'generic'.
-            altered_query_data['architecture'] += '/generic'
+            data['architecture'] += '/generic'
+
+
+def create_machine(request, requires_arch=False):
+    """Service an http request to create a machine.
+
+    The machine will be in the New state.
+
+    :param request: The http request for this machine to be created.
+    :return: A `Machine`.
+    :rtype: :class:`maasserver.models.Machine`.
+    :raises: ValidationError
+    """
+    given_arch = request.data.get('architecture', None)
+    given_subarch = request.data.get('subarchitecture', None)
+    given_min_hwe_kernel = request.data.get('min_hwe_kernel', None)
+    altered_query_data = request.data.copy()
+    fix_architecture(altered_query_data)
 
     hwe_regex = re.compile('(hwe|ga)-.+')
     has_arch_with_hwe = (
@@ -1117,7 +1121,8 @@ def create_machine(request):
                 'min_hwe_kernel must be in the form of hwe-<LETTER>.')
 
     Form = get_machine_create_form(request.user)
-    form = Form(data=altered_query_data, request=request)
+    form = Form(
+        data=altered_query_data, request=request, requires_arch=requires_arch)
     if form.is_valid():
         machine = form.save()
         maaslog.info("%s: Enlisted new machine", machine.hostname)
@@ -1201,6 +1206,7 @@ class AnonMachinesHandler(AnonNodesHandler):
         # BMC enlistment is currently only done for IPMI.
         # First, check if there is a pre-existing machine within MAAS that
         # matches the request.
+        architecture = request.data.get('architecture', None)
         power_type = request.data.get('power_type', None)
         power_parameters = request.data.get('power_parameters', None)
         machine = None
@@ -1210,10 +1216,30 @@ class AnonMachinesHandler(AnonNodesHandler):
                 status__in=[NODE_STATUS.NEW, NODE_STATUS.COMMISSIONING],
                 bmc__power_parameters__power_address=(
                     params['power_address'])).first()
+            if machine is not None:
+                # Update the power parameters with the new MAAS password and
+                # ensure the architecture is set.
+                data = {
+                    'architecture': architecture,
+                    'power_type': power_type,
+                    'power_parameters': power_parameters,
+                }
+                fix_architecture(data)
+
+                # AdminMachineForm must be used so the power parameters can be
+                # updated.
+                form = AdminMachineForm(
+                    data=data, instance=machine, requires_arch=True)
+                if form.is_valid():
+                    machine = form.save()
+                else:
+                    raise MAASAPIValidationError(form.errors)
         if machine is None:
-            machine = create_machine(request)
+            machine = create_machine(request, requires_arch=True)
         if machine.status == NODE_STATUS.NEW:
-            # Create or update NodeMetadata object for this node.
+            # Make sure an enlisting NodeMetadata object exists if the machine
+            # is NEW. When commissioning finishes this is how MAAS knows to
+            # set the status to NEW instead of READY.
             NodeMetadata.objects.update_or_create(
                 node=machine, key='enlisting', defaults={'value': 'True'})
         return machine
diff --git a/src/maasserver/api/tests/test_enlistment.py b/src/maasserver/api/tests/test_enlistment.py
index 07cc179..753bfdc 100644
--- a/src/maasserver/api/tests/test_enlistment.py
+++ b/src/maasserver/api/tests/test_enlistment.py
@@ -455,20 +455,28 @@ class AnonymousEnlistmentAPITest(APITestCase.ForAnonymous):
             }
         machine = factory.make_Machine(
             hostname=hostname, status=NODE_STATUS.NEW,
-            architecture=architecture, power_type=power_type,
+            architecture='', power_type=power_type,
             power_parameters=power_parameters)
+        # Simulate creating the MAAS IPMI user
+        power_parameters["power_user"] = "maas"
+        power_parameters["power_pass"] = factory.make_name("power-pass")
         response = self.client.post(
             reverse('machines_handler'),
             {
-                'hostname': hostname,
+                'hostname': 'maas-enlistment',
                 'architecture': architecture,
                 'power_type': power_type,
                 'mac_addresses': factory.make_mac_address(),
                 'power_parameters': json.dumps(power_parameters),
             })
-        node_metadata = NodeMetadata.objects.get(key='enlisting')
-        self.assertEqual(node_metadata.value, 'True')
         self.assertEqual(http.client.OK, response.status_code)
+        machine = reload_object(machine)
+        self.assertEqual(hostname, machine.hostname)
+        self.assertEqual(architecture, machine.architecture)
+        self.assertDictContainsSubset(
+            machine.bmc.power_parameters, power_parameters)
+        node_metadata = NodeMetadata.objects.get(node=machine, key='enlisting')
+        self.assertEqual(node_metadata.value, 'True')
         self.assertThat(mock_create_machine, MockNotCalled())
         self.assertEqual(
             machine.system_id, json_load_bytes(response.content)['system_id'])
@@ -492,6 +500,46 @@ class AnonymousEnlistmentAPITest(APITestCase.ForAnonymous):
         self.assertEqual(
             machine.system_id, json_load_bytes(response.content)['system_id'])
 
+    def test_POST_create_requires_architecture(self):
+        hostname = factory.make_name("hostname")
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'hostname': hostname,
+                'power_type': 'manual',
+                'mac_addresses': ['aa:bb:cc:dd:ee:ff', '22:bb:cc:dd:ee:ff'],
+            })
+        self.assertEqual(http.client.BAD_REQUEST, response.status_code)
+        self.assertDictEqual(
+            {'architecture': ['This field is required.']},
+            json_load_bytes(response.content))
+
+    def test_POST_create_validates_architecture(self):
+        hostname = factory.make_name("hostname")
+        power_type = 'ipmi'
+        power_parameters = {
+            "power_address": factory.make_ip_address(),
+            "power_user": factory.make_name("power-user"),
+            "power_pass": factory.make_name("power-pass"),
+            "power_driver": 'LAN_2_0',
+            "mac_address": '',
+            "power_boot_type": 'auto',
+            }
+        factory.make_Machine(
+            hostname=hostname, status=NODE_STATUS.NEW,
+            architecture='', power_type=power_type,
+            power_parameters=power_parameters)
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'hostname': 'maas-enlistment',
+                'architecture': factory.make_name('arch'),
+                'power_type': power_type,
+                'mac_addresses': factory.make_mac_address(),
+                'power_parameters': json.dumps(power_parameters),
+            })
+        self.assertEqual(http.client.BAD_REQUEST, response.status_code)
+
 
 class SimpleUserLoggedInEnlistmentAPITest(APITestCase.ForUser):
     """Enlistment tests from the perspective of regular, non-admin users."""
diff --git a/src/maasserver/api/tests/test_machines.py b/src/maasserver/api/tests/test_machines.py
index c96eaa0..fc44545 100644
--- a/src/maasserver/api/tests/test_machines.py
+++ b/src/maasserver/api/tests/test_machines.py
@@ -173,6 +173,33 @@ class TestMachinesAPI(APITestCase.ForUser):
             {nic.mac_address for nic in machine.interface_set.all()},
             Equals(macs))
 
+    def test_POST_creates_ipmi_machine_sets_mac_addresses_empty_no_arch(self):
+        make_usable_architecture(self)
+        hostname = factory.make_name('host')
+        macs = {
+            factory.make_mac_address()
+            for _ in range(random.randint(1, 2))
+        }
+        power_address = factory.make_ip_address()
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'hostname': hostname,
+                'mac_addresses': macs,
+                'power_type': 'ipmi',
+                'power_parameters_power_address': power_address,
+            })
+        self.assertEqual(http.client.OK, response.status_code)
+        system_id = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))['system_id']
+        machine = Machine.objects.get(system_id=system_id)
+        self.expectThat(machine.hostname, Equals(hostname))
+        self.expectThat(
+            {nic.mac_address for nic in machine.interface_set.all()},
+            Equals(set()))
+        self.assertEqual(
+            power_address, machine.power_parameters['power_address'])
+
     def test_POST_when_logged_in_creates_machine_in_declared_state(self):
         # When a user enlists a machine, it goes into the New state.
         # This will change once we start doing proper commissioning.
diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index 970e6a3..d769a88 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -667,15 +667,18 @@ class NodeForm(MAASModelForm):
 
 
 class MachineForm(NodeForm):
-    def __init__(self, request=None, *args, **kwargs):
+    def __init__(self, request=None, requires_arch=False, *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.
+        request = kwargs.get('request')
+        if request is not None:
+            self.data = request.data
         instance = kwargs.get('instance')
 
-        self.set_up_architecture_field()
+        self.set_up_architecture_field(requires_arch=requires_arch)
         # 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:
@@ -688,7 +691,7 @@ class MachineForm(NodeForm):
             self.fields['license_key'] = forms.CharField(
                 label="", required=False, widget=forms.HiddenInput())
 
-    def set_up_architecture_field(self):
+    def set_up_architecture_field(self, requires_arch=False):
         """Create the `architecture` field.
 
         This needs to be done on the fly so that we can pass a dynamic list of
@@ -702,9 +705,11 @@ class MachineForm(NodeForm):
             choices = list_architecture_choices(architectures)
         invalid_arch_message = compose_invalid_choice_text(
             'architecture', choices)
+        power_type = self.data.get('power_type', None)
         self.fields['architecture'] = forms.ChoiceField(
-            choices=choices, required=False, initial=default_arch,
-            error_messages={'invalid_choice': invalid_arch_message})
+            choices=choices, required=(power_type != 'ipmi' or requires_arch),
+            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.
@@ -1205,7 +1210,8 @@ class WithMACAddressesMixin:
 
     def set_up_mac_addresses_field(self):
         macs = [mac for mac in self.data.getlist('mac_addresses') if mac]
-        self.fields['mac_addresses'] = MultipleMACAddressField(len(macs))
+        self.fields['mac_addresses'] = MultipleMACAddressField(
+            len(macs), required=(self.data.get('power_type') != 'ipmi'))
         self.data = self.data.copy()
         self.data['mac_addresses'] = macs
 
@@ -1255,7 +1261,19 @@ class WithMACAddressesMixin:
         This implementation of `save` does not support the `commit` argument.
         """
         node = super(WithMACAddressesMixin, self).save()
-        for mac in self.cleaned_data['mac_addresses']:
+        architecture = self.cleaned_data.get('architecture')
+        power_type = self.cleaned_data.get('power_type')
+        # If a new node with an IPMI BMC is created the user doesn't have
+        # to specify the architecture or MAC addresses. Anonymous POST
+        # on the machines API will find the machine the user created by
+        # power address. If only the MAC address is given ignore it so the
+        # machine boots into the enlistment environment and MAAS can capture
+        # the architecture.
+        if not architecture and power_type == 'ipmi':
+            mac_addresses = []
+        else:
+            mac_addresses = self.cleaned_data['mac_addresses']
+        for mac in mac_addresses:
             mac_addresses_errors = []
             try:
                 node.add_physical_interface(mac)
diff --git a/src/maasserver/forms/tests/test_machine.py b/src/maasserver/forms/tests/test_machine.py
index f284136..4bca075 100644
--- a/src/maasserver/forms/tests/test_machine.py
+++ b/src/maasserver/forms/tests/test_machine.py
@@ -369,8 +369,8 @@ class TestAdminMachineForm(MAASServerTestCase):
                 'cpu_count',
                 'memory',
                 'zone',
-                'power_type',
                 'power_parameters',
+                'power_type',
                 'pool',
             ],
             list(form.fields))
diff --git a/src/maasserver/forms/tests/test_machinewithmacaddresses.py b/src/maasserver/forms/tests/test_machinewithmacaddresses.py
index 5e6b703..fefaaf9 100644
--- a/src/maasserver/forms/tests/test_machinewithmacaddresses.py
+++ b/src/maasserver/forms/tests/test_machinewithmacaddresses.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `MachineWithMACAddressesForm`."""
@@ -138,6 +138,24 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
 
         self.assertTrue(form.is_valid())
 
+    def test__mac_address_is_required(self):
+        form = MachineWithMACAddressesForm(
+            data=self.make_params(mac_addresses=[]))
+
+        self.assertFalse(form.is_valid())
+        self.assertEqual(['mac_addresses'], list(form.errors))
+        self.assertEqual(
+            ["This field is required."],
+            form.errors['mac_addresses'])
+
+    def test__no_architecture_or_mac_addresses_is_ok_for_ipmi(self):
+        # No architecture or MAC addresses is okay for IPMI power types.
+        params = self.make_params(mac_addresses=[])
+        params['architecture'] = None
+        params['power_type'] = 'ipmi'
+        form = MachineWithMACAddressesForm(data=params)
+        self.assertTrue(form.is_valid())
+
     def test__save(self):
         macs = ['aa:bb:cc:dd:ee:ff', '9a:bb:c3:33:e5:7f']
         form = MachineWithMACAddressesForm(
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 6f89875..3b7b9dd 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -1567,12 +1567,6 @@ class Node(CleanSave, TimestampedModel):
                 )
             raise NodeStateViolation(error_text)
 
-    def clean_architecture(self):
-        if self.architecture == '':
-            raise ValidationError(
-                {'architecture':
-                    ["Architecture must be defined for installable nodes."]})
-
     def clean_hostname_domain(self):
         # If you set the hostname to a name with dots, that you mean for that
         # to be the FQDN of the host. Se we check that a domain exists for
@@ -1611,8 +1605,6 @@ class Node(CleanSave, TimestampedModel):
             self.clean_pool()
         if self._state.has_changed('status'):
             self.clean_status(self._state.get_old_value('status'))
-        if self._state.has_changed('architecture'):
-            self.clean_architecture()
         if self._state.has_changed('boot_disk_id'):
             self.clean_boot_disk()
         if self._state.has_changed('boot_interface_id'):
@@ -2988,7 +2980,7 @@ class Node(CleanSave, TimestampedModel):
 
     def split_arch(self):
         """Return architecture and subarchitecture, as a tuple."""
-        if self.architecture is None:
+        if self.architecture is None or self.architecture == '':
             return ("", "")
         arch, subarch = self.architecture.split('/')
         return (arch, subarch)
@@ -5509,10 +5501,6 @@ class Device(Node):
         super(Device, self).__init__(
             node_type=NODE_TYPE.DEVICE, *args, **kwargs)
 
-    def clean_architecture(self):
-        # Devices aren't required to have a defined architecture
-        pass
-
 
 class NodeGroupToRackController(CleanSave, Model):
     """Store some of the old NodeGroup data so we can migrate it when a rack
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index b5a96ef..55cd947 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -1004,17 +1004,6 @@ class TestNode(MAASServerTestCase):
         node = factory.make_Node()
         self.assertThat(node.system_id, HasLength(6))
 
-    def test_empty_architecture_rejected_for_type_node(self):
-        self.assertRaises(
-            ValidationError,
-            factory.make_Node, node_type=NODE_TYPE.MACHINE, architecture='')
-
-    def test_empty_architecture_rejected_for_type_rack_controller(self):
-        self.assertRaises(
-            ValidationError,
-            factory.make_Node, node_type=NODE_TYPE.RACK_CONTROLLER,
-            architecture='')
-
     def test__set_zone(self):
         zone = factory.make_Zone()
         node = factory.make_Node()
@@ -3429,18 +3418,6 @@ class TestNode(MAASServerTestCase):
         node = reload_object(node)
         self.assertIsNone(node.status_expires)
 
-    def test_save_checks_architecture_for_installable_nodes(self):
-        device = factory.make_Device(architecture='')
-        device.node_type = factory.pick_enum(
-            NODE_TYPE, but_not=[NODE_TYPE.DEVICE])
-        device._state._changed_fields['architecture'] = None
-        exception = self.assertRaises(
-            ValidationError, device.as_node().save)
-        self.assertEqual(
-            exception.message_dict,
-            {'architecture':
-                ['Architecture must be defined for installable nodes.']})
-
     def test_netboot_defaults_to_True(self):
         node = Node()
         self.assertTrue(node.netboot)
diff --git a/src/maasserver/static/js/angular/controllers/add_hardware.js b/src/maasserver/static/js/angular/controllers/add_hardware.js
index 5e1b0d8..e41cfb5 100644
--- a/src/maasserver/static/js/angular/controllers/add_hardware.js
+++ b/src/maasserver/static/js/angular/controllers/add_hardware.js
@@ -25,6 +25,7 @@ angular.module('MAAS').controller('AddHardwareController', [
         $scope.pools = ResourcePoolsManager.getItems();
         $scope.domains = DomainsManager.getItems();
         $scope.architectures = GeneralManager.getData("architectures");
+        $scope.architectures.push("Choose an architecture");
         $scope.hwe_kernels = GeneralManager.getData("hwe_kernels");
         $scope.default_min_hwe_kernel = GeneralManager.getData(
             "default_min_hwe_kernel");
@@ -518,7 +519,8 @@ angular.module('MAAS').controller('AddHardwareController', [
                 $scope.machine === null ||
                 $scope.machine.zone === null ||
                 $scope.machine.pool === null ||
-                $scope.machine.architecture === '' ||
+                ($scope.machine.architecture === 'Choose an architecture' &&
+                    $scope.machine.power.type.name !== 'ipmi') ||
                 $scope.machine.power.type === null ||
                 $scope.invalidName($scope.machine));
             if(in_error) {
@@ -527,7 +529,8 @@ angular.module('MAAS').controller('AddHardwareController', [
 
             // Make sure none of the mac addresses are in error. The first one
             // cannot be blank the remaining are allowed to be empty.
-            if($scope.machine.macs[0].mac === '' ||
+            if(($scope.machine.macs[0].mac === '' &&
+                $scope.machine.power.type.name !== 'ipmi') ||
                 $scope.machine.macs[0].error) {
                 return true;
             }
@@ -575,6 +578,11 @@ angular.module('MAAS').controller('AddHardwareController', [
             // the device.
             $scope.error = null;
 
+            // Set the architecture to empty string if none was chosen.
+            if($scope.machine.architecture === "Choose an architecture") {
+                $scope.machine.architecture = '';
+            }
+
             // Add the machine.
             MachinesManager.create(
                 convertMachineToProtocol($scope.machine)).then(
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js b/src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js
index 4f097c4..1f7b583 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js
@@ -105,7 +105,7 @@ describe("AddHardwareController", function() {
         expect($scope.zones).toBe(ZonesManager.getItems());
         expect($scope.pools).toBe(ResourcePoolsManager.getItems());
         expect($scope.domains).toBe(DomainsManager.getItems());
-        expect($scope.architectures).toEqual([]);
+        expect($scope.architectures).toEqual(['Choose an architecture']);
         expect($scope.hwe_kernels).toEqual([]);
         expect($scope.power_types).toEqual([]);
         expect($scope.error).toBeNull();
@@ -131,7 +131,7 @@ describe("AddHardwareController", function() {
             architecture: '',
             power: {type: makeName("power_type")}
         };
-        $scope.show();
+        $scope.show()
 
         loadManagers_defer.resolve();
         loadItems_defer.resolve();
@@ -139,7 +139,7 @@ describe("AddHardwareController", function() {
         expect($scope.machine.architecture).toEqual(arch);
     });
 
-    it("initializes machine architecture with amd64 arch", function() {
+    it("initializes machine arch with amd64 arch", function() {
         var loadManagers_defer = $q.defer();
         var loadItems_defer = $q.defer();
         var controller = makeController(loadManagers_defer, loadItems_defer);
@@ -383,11 +383,11 @@ describe("AddHardwareController", function() {
             expect($scope.machineHasError()).toBe(true);
         });
 
-        it("returns true if architecture is empty", function() {
+        it("returns true if architecture is not chosen", function() {
             var controller = makeControllerWithMachine();
             $scope.machine.zone = {};
             $scope.machine.pool = {};
-            $scope.machine.architecture = '';
+            $scope.machine.architecture = 'Choose an architecture';
             $scope.machine.power.type = {};
             $scope.machine.macs[0].mac = '00:11:22:33:44:55';
             $scope.machine.macs[0].error = false;
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index da3a9a2..c1cae77 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -382,7 +382,7 @@
                             <select name="architecture" id="architecture"
                                 data-ng-model="machine.architecture"
                                 data-ng-options="arch for arch in architectures">
-                                <option value="" disabled>Choose an architecture</option>
+                                <option value="">Choose an architecture</option>
                             </select>
                         </div>
                     </div>
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 72fd395..183d74f 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -1778,37 +1778,6 @@ class TestMachineHandler(MAASServerTestCase):
             HandlerPermissionError,
             handler.create, {})
 
-    def test_create_raises_validation_error_for_missing_pxe_mac(self):
-        user = factory.make_admin()
-        handler = MachineHandler(user, {})
-        zone = factory.make_Zone()
-        params = {
-            "architecture": make_usable_architecture(self),
-            "zone": {
-                "name": zone.name,
-            },
-        }
-        error = self.assertRaises(
-            HandlerValidationError, handler.create, params)
-        self.assertThat(error.message_dict, Equals(
-            {'mac_addresses': ['This field is required.']}))
-
-    def test_create_raises_validation_error_for_missing_architecture(self):
-        user = factory.make_admin()
-        handler = MachineHandler(user, {})
-        zone = factory.make_Zone()
-        params = {
-            "pxe_mac": factory.make_mac_address(),
-            "zone": {
-                "name": zone.name,
-            },
-        }
-        error = self.assertRaises(
-            HandlerValidationError, handler.create, params)
-        self.assertThat(error.message_dict, Equals(
-            {'architecture': [
-                'Architecture must be defined for installable nodes.']}))
-
     def test_create_creates_node(self):
         user = factory.make_admin()
         handler = MachineHandler(user, {})