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

[Newell Jensen]

LP: #1707216 - No validation for architecture or mac addresses is required for IPMI power types.

7b0fdba... by Newell Jensen on 2018-06-07

Clean some tests.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 7b0fdba3debce6fb4818b6cc6b3300c454d5de48

review: Approve

[Lee Trager (ltrager)]

I'm not sure clearing the errors after they occur is the best path. If I add form.save() to your unit test an exception is raised about the architecture missing. I think MAAS should be smart enough to know when to avoid the errors.

On Django forms whether or not a field is required is controlled by the optional field argument required. On the mac_addresses field this is not set so Django is assuming it always is, you can turn it off by modifying WithMACAddressesMixin.set_up_mac_addresses_field with

self.fields['mac_addresses'] = MultipleMACAddressField(len(macs), required=(self.data.get('power_type') != 'ipmi'))

If you look at MachineForm.set_up_architecture_field you'll see required is already False. The error is coming from Node.clean_architecture. That is why clearing the error won't help, the model save will still raise the error. The form should be validating the architecture already so I think its safe to remove Node.clean_architecture and Device.clean_architecture and rely on the form by making required=True unless the power type is ipmi.

review: Needs Fixing

a12d6d7... by Newell Jensen on 2018-06-14

Move validation for architecture to forms. Review fixes and updated unit tests.

18315b3... by Newell Jensen on 2018-06-14

Merge with master.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: a12d6d70413c1cd5fe1695c6000f522af1799ca1

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 18315b3cef069a5695ab5ee5f21ddbf1a5473b14

review: Approve

97fb812... by Newell Jensen on 2018-06-14

Set mac_addresses to empty list when no architecture is given for IPMI power types. This will force the machine to enlist if no architecture is supplied.

f2e44fa... by Newell Jensen on 2018-06-14

Fix failing unit tests by adding an explicit check for ipmi power type when setting mac addresses to an empty list when no architecture is set.

[MAAS Lander (maas-lander)]

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

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3164/console
COMMIT: 97fb812e49d1a49dbfd6211157540dfe5fe7ad5f

review: Needs Fixing

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: f2e44fad675b05b437679f0993817f3dcf15c991

review: Approve

[Lee Trager (ltrager)]

If MAC addresses are added and an architecture isn't specified in the UI MAC addresses shouldn't be added for the machine. You stopped adding them only over the API, this should be done in the form. A few other comments below but I think this is close.

review: Needs Fixing

94cf8d4... by Newell Jensen on 2018-06-17

Review fixes.

[Newell Jensen (newell-jensen)]

I updated the branch with the review fixes. Thanks for the review Lee.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 94cf8d46212d7476f9720cc44c3334c803630c20

review: Approve

[Newell Jensen (newell-jensen)]

Rejecting this branch as my changes were used in https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/348256

Unmerged commits

94cf8d4... by Newell Jensen on 2018-06-17

Review fixes.

f2e44fa... by Newell Jensen on 2018-06-14

Fix failing unit tests by adding an explicit check for ipmi power type when setting mac addresses to an empty list when no architecture is set.

97fb812... by Newell Jensen on 2018-06-14

Set mac_addresses to empty list when no architecture is given for IPMI power types. This will force the machine to enlist if no architecture is supplied.

18315b3... by Newell Jensen on 2018-06-14

Merge with master.

a12d6d7... by Newell Jensen on 2018-06-14

Move validation for architecture to forms. Review fixes and updated unit tests.

7b0fdba... by Newell Jensen on 2018-06-07

Clean some tests.

ea5199b... by Newell Jensen on 2018-06-07

Fix lint.

cf4c545... by Newell Jensen on 2018-06-07

Drive by clean up.

fb59a9e... by Newell Jensen on 2018-06-07

LP: #1707216 - No validation for architecture or mac addresses is required for IPMI power types.

dc3931c... by Newell Jensen on 2018-06-07

Add unit tests.

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index a02cbe2..61e3ec0 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -1200,6 +1200,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
@@ -1209,6 +1210,11 @@ class AnonMachinesHandler(AnonNodesHandler):
                 status__in=[NODE_STATUS.NEW, NODE_STATUS.COMMISSIONING],
                 bmc__power_parameters__power_address=(
                     params['power_address'])).first()
+            # Update architecture if it is not already set.
+            if machine is not None and architecture is not None:
+                if machine.architecture != architecture:
+                    machine.architecture = architecture
+                    machine.save()
         if machine is None:
             machine = create_machine(request)
         if machine.status == NODE_STATUS.NEW:
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..44c392d 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -673,6 +673,9 @@ class MachineForm(NodeForm):
         # 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()
@@ -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'),
+            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,16 +1261,25 @@ 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']:
-            mac_addresses_errors = []
-            try:
-                node.add_physical_interface(mac)
-            except ValidationError as e:
-                mac_addresses_errors.append(e.message)
-            if mac_addresses_errors:
-                raise ValidationError({
-                    "mac_addresses": mac_addresses_errors
-                    })
+        architecture = self.cleaned_data.get('architecture')
+        power_type = self.cleaned_data.get('power_type')
+        # BMC enlistment - if no achitecture is set for IPMI power type,
+        # force mac_addressesto be empty.
+        if not architecture and power_type == 'ipmi':
+            mac_addresses = []
+        else:
+            mac_addresses = self.cleaned_data.get('mac_addresses')
+        if mac_addresses:
+            for mac in mac_addresses:
+                mac_addresses_errors = []
+                try:
+                    node.add_physical_interface(mac)
+                except ValidationError as e:
+                    mac_addresses_errors.append(e.message)
+                if mac_addresses_errors:
+                    raise ValidationError({
+                        "mac_addresses": mac_addresses_errors
+                        })
         # Generate a hostname for this node if the provided hostname is
         # IP-based (because this means that this name comes from a DNS
         # reverse query to the MAAS DNS).  If the provided hostname was empty,
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 2599a6e..6b4b39f 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -1563,12 +1563,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
@@ -1607,8 +1601,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'):
@@ -2984,7 +2976,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)
@@ -5464,10 +5456,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 d15ba32..0b5694c 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..7d4d7f0 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");
@@ -274,22 +275,6 @@ angular.module('MAAS').controller('AddHardwareController', [
             }
         }
 
-        // Get the default architecture from the loaded architectures.
-        function defaultArchitecture() {
-            if($scope.architectures.length === 0) {
-                return '';
-            } else {
-                // Return amd64/generic first if available.
-                var i;
-                for(i = 0; i < $scope.architectures.length; i++) {
-                    if($scope.architectures[i] === "amd64/generic") {
-                        return $scope.architectures[i];
-                    }
-                }
-                return $scope.architectures[0];
-            }
-        }
-
         // Return a new MAC address object.
         function newMAC() {
             return {
@@ -326,7 +311,7 @@ angular.module('MAAS').controller('AddHardwareController', [
                 macs: [newMAC()],
                 zone: defaultZone(),
                 pool: defaultResourcePool(),
-                architecture: defaultArchitecture(),
+                architecture: '',
                 min_hwe_kernel: $scope.default_min_hwe_kernel.text,
                 power: {
                     type: null,
@@ -419,15 +404,6 @@ angular.module('MAAS').controller('AddHardwareController', [
                 $scope.machine = newMachine($scope.machine);
                 $scope.chassis = newChassis($scope.chassis);
                 $scope.error = null;
-
-                // If the machine doesn't have an architecture
-                // set then it was created before all of the
-                // architectures were loaded. Set the default
-                // architecture for that machine.
-                if(angular.isObject($scope.machine) &&
-                    $scope.machine.architecture === '') {
-                    $scope.machine.architecture = defaultArchitecture();
-                }
                 $scope.viewable = true;
             });
 
@@ -518,7 +494,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 +504,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 +553,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..48f8783 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();
@@ -121,32 +121,14 @@ describe("AddHardwareController", function() {
         expect(ManagerHelperService.loadManagers).not.toHaveBeenCalled();
     });
 
-    it("initializes machine architecture with first arch", function() {
-        var loadManagers_defer = $q.defer();
-        var loadItems_defer = $q.defer();
-        var controller = makeController(loadManagers_defer, loadItems_defer);
-        var arch = makeName("arch");
-        $scope.architectures = [arch];
-        $scope.machine = {
-            architecture: '',
-            power: {type: makeName("power_type")}
-        };
-        $scope.show();
-
-        loadManagers_defer.resolve();
-        loadItems_defer.resolve();
-        $scope.$digest();
-        expect($scope.machine.architecture).toEqual(arch);
-    });
-
-    it("initializes machine architecture with amd64 arch", function() {
+    it("initializes machine arch with 'Choose an architecture'", function() {
         var loadManagers_defer = $q.defer();
         var loadItems_defer = $q.defer();
         var controller = makeController(loadManagers_defer, loadItems_defer);
         var arch = makeName("arch");
         $scope.architectures = [arch, "amd64/generic"];
         $scope.machine = {
-            architecture: '',
+            architecture: 'Choose an architecture',
             power: {type: makeName("power_type")}
         };
         $scope.show();
@@ -154,7 +136,7 @@ describe("AddHardwareController", function() {
         loadManagers_defer.resolve();
         loadItems_defer.resolve();
         $scope.$digest();
-        expect($scope.machine.architecture).toEqual("amd64/generic");
+        expect($scope.machine.architecture).toEqual("Choose an architecture");
     });
 
     it("doesnt initializes machine architecture if set", function() {
@@ -383,11 +365,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 8310b39..d318cab 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, {})