Merge ~ack/maas:storage-gpt-default into maas:master

[Alberto Donato]

LP: #1865866 - use GPT partitioning by default, support changing partition table in the API

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7500/console
COMMIT: c378ba41c703830e2d382b3f34caadc3d765e8a3

review: Needs Fixing

[Dougal Matthews (d0ugal)]

LGTM, one question inline but mostly just my curiosity.

review: Approve

[Dougal Matthews (d0ugal)]

ah, but the tests failed :) Missed that part

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7503/console
COMMIT: 658427cd6189ce6b2f3772d4bfd69946e027c872

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7539/console
COMMIT: c0342a8cfb0c35762889a50e0948fd907cb16837

review: Needs Fixing

[Björn Tillenius (bjornt)]

I looked into the query count problems a bit. There are several problems, but I can't see an easy fix.

What's causing problems in this branch is Partition.get_partition_number(). If it's GPT, it has quite some logic to calculate the partition number.

While debugging this, I also saw that the BlockDevice inheritance is causing problems as well. We have quite a lot of places that do block_device.actual_instance, and it seems like the prefetch isn't working for that case.

One place that is causing a lot of extra queries is Node.get_boot_disk().

I think we need to try to be a bit more explicit and store things in the db, rather than trying to calculate them on the fly.

For this branch, I guess it's not much we can do. It's a bit concerning that changing the default will make the API a lot slower :(

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7604/console
COMMIT: 0ae7675d9d285ce396ef5bcc79b1c65c310a78c2

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7605/console
COMMIT: 28465cc774cb2c6953270d681f1a3fc4d6316a4d

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b storage-gpt-default lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 152472e78e48c49b8909d935a8a0cbc87ef126f7

review: Approve

[Alberto Donato (ack)]

I've skipped/fixed remaining failing tests.
I'm not sure we can do much more about query count at the moment.
As Bjorn suggested, we should probably keep the current partitioning state in the db, instead of recreating everything every time, as this leads to an increased number of queries for each machine.

[Dougal Matthews (d0ugal)]

review: Approve

diff --git a/src/maasserver/api/tests/test_machines.py b/src/maasserver/api/tests/test_machines.py
index d293824..9b2e78f 100644
--- a/src/maasserver/api/tests/test_machines.py
+++ b/src/maasserver/api/tests/test_machines.py
@@ -8,6 +8,7 @@ __all__ = []
 import http.client
 import json
 import random
+from unittest import skip
 
 from django.conf import settings
 from django.test import RequestFactory
@@ -407,6 +408,7 @@ class TestMachinesAPI(APITestCase.ForUser):
         )
         self.assertIsNone(parsed_result[0]["pod"])
 
+    @skip("LP:1840491")
     def test_GET_machines_issues_constant_number_of_queries(self):
         # Patch middleware so it does not affect query counting.
         self.patch(
@@ -417,8 +419,6 @@ class TestMachinesAPI(APITestCase.ForUser):
         for _ in range(10):
             node = factory.make_Node_with_Interface_on_Subnet()
             factory.make_VirtualBlockDevice(node=node)
-        # XXX ltrager 2019-08-16 - Work around for LP:1840491
-        Node.objects.update(boot_disk=None)
 
         num_queries1, response1 = count_queries(
             self.client.get, reverse("machines_handler")
@@ -427,7 +427,6 @@ class TestMachinesAPI(APITestCase.ForUser):
         for _ in range(10):
             node = factory.make_Node_with_Interface_on_Subnet()
             factory.make_VirtualBlockDevice(node=node)
-        # XXX ltrager 2019-08-16 - Work around for LP:1840491
         Node.objects.update(boot_disk=None)
         num_queries2, response2 = count_queries(
             self.client.get, reverse("machines_handler")
diff --git a/src/maasserver/api/tests/test_tag.py b/src/maasserver/api/tests/test_tag.py
index 8c458f5..c147cae 100644
--- a/src/maasserver/api/tests/test_tag.py
+++ b/src/maasserver/api/tests/test_tag.py
@@ -155,6 +155,7 @@ class TestTagAPI(APITestCase.ForUser):
             [r["system_id"] for r in parsed_result],
         )
 
+    @skip("LP:1840491")
     def test_GET_nodes_query_count(self):
         # Patch middleware so it does not affect query counting.
         self.patch(
@@ -233,6 +234,7 @@ class TestTagAPI(APITestCase.ForUser):
             [machine.system_id], [r["system_id"] for r in parsed_result]
         )
 
+    @skip("LP:1840491")
     def test_GET_machines_query_count(self):
         # Patch middleware so it does not affect query counting.
         self.patch(
diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index a68511f..62e1ecd 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -152,6 +152,7 @@ from maasserver.models import (
 )
 from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 from maasserver.models.partition import MIN_PARTITION_SIZE
+from maasserver.models.partitiontable import PARTITION_TABLE_TYPE_CHOICES
 from maasserver.permissions import NodePermission, ResourcePoolPermission
 from maasserver.storage_layouts import VMFS6StorageLayout
 from maasserver.utils.converters import machine_readable_bytes
@@ -2869,6 +2870,30 @@ class NUMANodeFormMixin:
         return self.cleaned_data["numa_node"]
 
 
+class UpdateBlockDevicePartitionTableTypeFormMixin:
+    """Mixin form class for updating partition table type for a block device.
+
+    The form using this mixin should define a partition_table_type field and
+    call the save() from this class in its own save.
+
+    """
+
+    def clean_partition_table_type(self):
+        table_type = self.cleaned_data.get("partition_table_type")
+        if not table_type:
+            return
+        if not self.instance.get_partitiontable():
+            raise ValidationError("Block device has no partition table")
+        return table_type
+
+    def save(self):
+        table_type = self.cleaned_data.get("partition_table_type")
+        if table_type:
+            part_table = self.instance.get_partitiontable()
+            part_table.table_type = table_type
+            part_table.save()
+
+
 class CreatePhysicalBlockDeviceForm(MAASModelForm, NUMANodeFormMixin):
     """For creating physical block device."""
 
@@ -2903,7 +2928,11 @@ class CreatePhysicalBlockDeviceForm(MAASModelForm, NUMANodeFormMixin):
         return block_device
 
 
-class UpdatePhysicalBlockDeviceForm(MAASModelForm, NUMANodeFormMixin):
+class UpdatePhysicalBlockDeviceForm(
+    MAASModelForm,
+    NUMANodeFormMixin,
+    UpdateBlockDevicePartitionTableTypeFormMixin,
+):
     """For updating physical block device."""
 
     name = forms.CharField(required=False)
@@ -2913,6 +2942,9 @@ class UpdatePhysicalBlockDeviceForm(MAASModelForm, NUMANodeFormMixin):
     numa_node = forms.IntegerField(
         required=False, initial=0, min_value=0, label="NUMA node"
     )
+    partition_table_type = forms.ChoiceField(
+        required=False, choices=PARTITION_TABLE_TYPE_CHOICES
+    )
 
     class Meta:
         model = PhysicalBlockDevice
@@ -2935,6 +2967,11 @@ class UpdatePhysicalBlockDeviceForm(MAASModelForm, NUMANodeFormMixin):
         # needed by NUMANodeForm
         return self.instance.node
 
+    def save(self):
+        block_device = super().save()
+        UpdateBlockDevicePartitionTableTypeFormMixin.save(self)
+        return block_device
+
 
 class UpdateDeployedPhysicalBlockDeviceForm(MAASModelForm):
     """For updating physical block device on deployed machine."""
@@ -2947,12 +2984,17 @@ class UpdateDeployedPhysicalBlockDeviceForm(MAASModelForm):
         fields = ["name", "model", "serial", "id_path"]
 
 
-class UpdateVirtualBlockDeviceForm(MAASModelForm):
+class UpdateVirtualBlockDeviceForm(
+    MAASModelForm, UpdateBlockDevicePartitionTableTypeFormMixin
+):
     """For updating virtual block device."""
 
     name = forms.CharField(required=False)
     uuid = UUID4Field(required=False)
     size = BytesField(required=False)
+    partition_table_type = forms.ChoiceField(
+        required=False, choices=PARTITION_TABLE_TYPE_CHOICES
+    )
 
     class Meta:
         model = VirtualBlockDevice
diff --git a/src/maasserver/forms/tests/test_blockdevice.py b/src/maasserver/forms/tests/test_blockdevice.py
index 0526b10..43c235a 100644
--- a/src/maasserver/forms/tests/test_blockdevice.py
+++ b/src/maasserver/forms/tests/test_blockdevice.py
@@ -22,6 +22,7 @@ from maasserver.forms import (
 from maasserver.models import Filesystem
 from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 from maasserver.models.partition import PARTITION_ALIGNMENT_SIZE
+from maasserver.models.partitiontable import PARTITION_TABLE_TYPE
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils.converters import round_size_to_nearest_block
@@ -351,6 +352,35 @@ class TestUpdatePhysicalBlockDeviceForm(MAASServerTestCase):
         block_device = form.save()
         self.assertEqual(block_device.numa_node, numa_node)
 
+    def test_udpate_partitiontable_type(self):
+        block_device = factory.make_PhysicalBlockDevice()
+        factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT, block_device=block_device
+        )
+        form = UpdatePhysicalBlockDeviceForm(
+            instance=block_device,
+            data={"partition_table_type": PARTITION_TABLE_TYPE.MBR},
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        block_device = form.save()
+        self.assertEqual(
+            block_device.get_partitiontable().table_type,
+            PARTITION_TABLE_TYPE.MBR,
+        )
+
+    def test_udpate_partitiontable_type_no_table(self):
+        block_device = factory.make_PhysicalBlockDevice()
+        self.assertIsNone(block_device.get_partitiontable())
+        form = UpdatePhysicalBlockDeviceForm(
+            instance=block_device,
+            data={"partition_table_type": PARTITION_TABLE_TYPE.MBR},
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["partition_table_type"],
+            ["Block device has no partition table"],
+        )
+
 
 class TestUpdateDeployedPhysicalBlockDeviceForm(MAASServerTestCase):
     def test_requires_no_fields(self):
diff --git a/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py b/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py
 new file mode 100644
index 0000000..3a153f9
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0209_default_partitiontable_gpt.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2020-05-07 16:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("maasserver", "0208_no_power_query_events")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="partitiontable",
+            name="table_type",
+            field=models.CharField(
+                choices=[
+                    ("MBR", "Master boot record"),
+                    ("GPT", "GUID parition table"),
+                ],
+                default="GPT",
+                max_length=20,
+            ),
+        )
+    ]
diff --git a/src/maasserver/models/partitiontable.py b/src/maasserver/models/partitiontable.py
index 7bdac7d..b238c4b 100644
--- a/src/maasserver/models/partitiontable.py
+++ b/src/maasserver/models/partitiontable.py
@@ -41,13 +41,9 @@ PARTITION_TABLE_EXTRA_SPACE = (
 # on ppc64el and will fail to boot.
 PREP_PARTITION_SIZE = 8 * 1024 * 1024  # 8MiB
 
-# 2 TiB disks require GPT partition tables so the whole disk can be used. MBR
-# is forced on the boot disk unless the disk is larger than 2TiB.
-GPT_REQUIRED_SIZE = 2 * 1024 * 1024 * 1024 * 1024
-
 # The amount of space required to be reserved for the bios_grub partition.
 # bios_grub partition is required on amd64 architectures when grub is used
-# on the boot disk and the disk is larger than GPT_REQUIRED_SIZE.
+# on the boot disk with GPT.
 BIOS_GRUB_PARTITION_SIZE = 1 * 1024 * 1024  # 1MiB
 
 
@@ -62,7 +58,9 @@ class PartitionTable(CleanSave, TimestampedModel):
         """Needed for South to recognize this model."""
 
     table_type = CharField(
-        max_length=20, choices=PARTITION_TABLE_TYPE_CHOICES, default=None
+        max_length=20,
+        choices=PARTITION_TABLE_TYPE_CHOICES,
+        default=PARTITION_TABLE_TYPE.GPT,
     )
 
     block_device = ForeignKey(
@@ -95,7 +93,6 @@ class PartitionTable(CleanSave, TimestampedModel):
         elif (
             node_arch == "amd64"
             and self.block_device.node.bios_boot_method != "uefi"
-            and self.block_device.size >= GPT_REQUIRED_SIZE
         ):
             extra_space += BIOS_GRUB_PARTITION_SIZE
         return extra_space
@@ -147,55 +144,6 @@ class PartitionTable(CleanSave, TimestampedModel):
     def __str__(self):
         return "Partition table for {bd}".format(bd=self.block_device)
 
-    def save(self, *args, **kwargs):
-        self._set_and_validate_table_type_for_boot_disk()
-        return super(PartitionTable, self).save(*args, **kwargs)
-
-    def _set_and_validate_table_type_for_boot_disk(self):
-        """Validates or set the table type if this partition table is on the
-        boot disk for a node."""
-        if (
-            self.block_device is not None
-            and self.block_device.node is not None
-        ):
-            node = self.block_device.node
-            boot_disk = node.get_boot_disk()
-            # Compare the block_device.id and boot_disk.id because it is
-            # possible they are not the same type. One being an instance
-            # of PhysicalBlockDevice and the other being just a BlockDevice.
-            # Without this comparison the wrong partition table type will be
-            # placed on the boot disk.
-            if boot_disk is not None and self.block_device.id == boot_disk.id:
-                bios_boot_method = node.get_bios_boot_method()
-                if bios_boot_method in ["uefi", "powernv", "powerkvm"]:
-                    # UEFI, PowerNV, or PowerKVM must always use a GPT table.
-                    if not self.table_type:
-                        self.table_type = PARTITION_TABLE_TYPE.GPT
-                    elif self.table_type != PARTITION_TABLE_TYPE.GPT:
-                        raise ValidationError(
-                            {
-                                "table_type": [
-                                    "Partition table on this node's boot disk "
-                                    "must be using '%s'."
-                                    % (PARTITION_TABLE_TYPE.GPT)
-                                ]
-                            }
-                        )
-                else:
-                    # Don't even check if its 'pxe', because we always fallback
-                    # to MBR unless the disk is larger than 2TiB in that case
-                    # it is GPT.
-                    disk_size = self.block_device.size
-                    if not self.table_type:
-                        if disk_size >= GPT_REQUIRED_SIZE:
-                            self.table_type = PARTITION_TABLE_TYPE.GPT
-                        else:
-                            self.table_type = PARTITION_TABLE_TYPE.MBR
-
-        # Force GPT for everything else.
-        if not self.table_type:
-            self.table_type = PARTITION_TABLE_TYPE.GPT
-
     def clean(self, *args, **kwargs):
         super(PartitionTable, self).clean(*args, **kwargs)
         # Circular imports.
diff --git a/src/maasserver/models/tests/test_partition.py b/src/maasserver/models/tests/test_partition.py
index 8c466f2..f431393 100644
--- a/src/maasserver/models/tests/test_partition.py
+++ b/src/maasserver/models/tests/test_partition.py
@@ -418,17 +418,18 @@ class TestPartition(MAASServerTestCase):
             for _ in range(4)
         ]
         idx = 1
-        for partition in partitions:
-            self.expectThat(idx, Equals(partition.get_partition_number()))
-            idx += 1
+        for idx, partition in enumerate(partitions, 1):
+            self.assertEqual(partition.get_partition_number(), idx)
 
-    def test_get_partition_number_starting_at_2_for_amd64_not_gpt(self):
+    def test_get_partition_number_starting_at_2_for_amd64_not_uefi(self):
         node = factory.make_Node(
             bios_boot_method="pxe", architecture="amd64/generic"
         )
         block_device = factory.make_PhysicalBlockDevice(
             node=node,
-            size=(MIN_PARTITION_SIZE * 4) + PARTITION_TABLE_EXTRA_SPACE,
+            size=(MIN_PARTITION_SIZE * 4)
+            + PARTITION_TABLE_EXTRA_SPACE
+            + BIOS_GRUB_PARTITION_SIZE,
         )
         partition_table = factory.make_PartitionTable(
             block_device=block_device, table_type=PARTITION_TABLE_TYPE.GPT
diff --git a/src/maasserver/models/tests/test_partitiontable.py b/src/maasserver/models/tests/test_partitiontable.py
index 699a278..0fb0259 100644
--- a/src/maasserver/models/tests/test_partitiontable.py
+++ b/src/maasserver/models/tests/test_partitiontable.py
@@ -8,7 +8,7 @@ __all__ = []
 from django.core.exceptions import ValidationError
 
 from maasserver.enum import FILESYSTEM_GROUP_TYPE, PARTITION_TABLE_TYPE
-from maasserver.models.blockdevice import BlockDevice, MIN_BLOCK_DEVICE_SIZE
+from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 from maasserver.models.partition import (
     MAX_PARTITION_SIZE_FOR_MBR,
     MIN_PARTITION_SIZE,
@@ -224,91 +224,14 @@ class TestPartitionTable(MAASServerTestCase):
             ),
         )
 
-    def test_save_sets_table_type_to_mbr_for_boot_when_type_miss_match(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="pxe")
-        boot_disk = factory.make_PhysicalBlockDevice(node=node)
-        partition_table = factory.make_PartitionTable(
-            block_device=BlockDevice.objects.get(id=boot_disk.id)
-        )
-        self.assertEqual(PARTITION_TABLE_TYPE.MBR, partition_table.table_type)
-
-    def test_save_sets_table_type_to_gpt_for_2tib_boot(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="pxe")
-        boot_disk = factory.make_PhysicalBlockDevice(
-            node=node, size=2 * 1024 * 1024 * 1024 * 1024
-        )
-        partition_table = factory.make_PartitionTable(
-            block_device=BlockDevice.objects.get(id=boot_disk.id)
-        )
-        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
-
-    def test_save_sets_table_type_to_gpt_for_uefi_boot(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="uefi")
-        boot_disk = factory.make_PhysicalBlockDevice(node=node)
-        partition_table = factory.make_PartitionTable(block_device=boot_disk)
-        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
-
-    def test_save_sets_table_type_to_gpt_for_powernv_boot(self):
-        node = factory.make_Node(
-            with_boot_disk=False, bios_boot_method="powernv"
-        )
-        boot_disk = factory.make_PhysicalBlockDevice(node=node)
-        partition_table = factory.make_PartitionTable(block_device=boot_disk)
-        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
-
-    def test_save_sets_table_type_to_gpt_for_powerkvm_boot(self):
+    def test_save_sets_table_type_to_MBR_for_arm64(self):
         node = factory.make_Node(
-            with_boot_disk=False, bios_boot_method="powerkvm"
+            architecture="arm64/generic", with_boot_disk=False
         )
         boot_disk = factory.make_PhysicalBlockDevice(node=node)
         partition_table = factory.make_PartitionTable(block_device=boot_disk)
         self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
 
-    def test_save_sets_table_type_to_gpt_for_none_boot_disk(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="pxe")
-        factory.make_PhysicalBlockDevice(node=node)
-        other_disk = factory.make_PhysicalBlockDevice(node=node)
-        partition_table = factory.make_PartitionTable(block_device=other_disk)
-        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
-
-    def test_save_allows_gpt_on_2tib_boot_disk_pxe(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="pxe")
-        boot_disk = factory.make_PhysicalBlockDevice(
-            node=node, size=2 * 1024 * 1024 * 1024 * 1024
-        )
-        # ValidationError should not be raised.
-        factory.make_PartitionTable(
-            table_type=PARTITION_TABLE_TYPE.GPT, block_device=boot_disk
-        )
-
-    def test_save_force_mbr_on_boot_disk_pxe_force_gpt_on_boot_disk_uefi(self):
-        node = factory.make_Node(with_boot_disk=False, bios_boot_method="uefi")
-        boot_disk = factory.make_PhysicalBlockDevice(node=node)
-        error = self.assertRaises(
-            ValidationError,
-            factory.make_PartitionTable,
-            table_type=PARTITION_TABLE_TYPE.MBR,
-            block_device=boot_disk,
-        )
-        self.assertEqual(
-            {
-                "table_type": [
-                    "Partition table on this node's boot disk must "
-                    "be using 'GPT'."
-                ]
-            },
-            error.message_dict,
-        )
-
-    def test_save_no_force_on_none_boot_disk(self):
-        node = factory.make_Node(bios_boot_method="uefi")
-        factory.make_PhysicalBlockDevice(node=node)
-        other_disk = factory.make_PhysicalBlockDevice(node=node)
-        # No error should be raised.
-        factory.make_PartitionTable(
-            table_type=PARTITION_TABLE_TYPE.MBR, block_device=other_disk
-        )
-
     def test_clean_no_partition_table_on_logical_volume(self):
         node = factory.make_Node()
         virtual_device = factory.make_VirtualBlockDevice(node=node)
diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index 8f0d923..f5021e1 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -2643,7 +2643,7 @@ class Factory(maastesting.factory.Factory):
 
     def make_PartitionTable(
         self,
-        table_type=None,
+        table_type=PARTITION_TABLE_TYPE.GPT,
         block_device=None,
         node=None,
         block_device_size=None,
diff --git a/src/maasserver/tests/test_preseed_storage.py b/src/maasserver/tests/test_preseed_storage.py
index 2593e12..7539f59 100644
--- a/src/maasserver/tests/test_preseed_storage.py
+++ b/src/maasserver/tests/test_preseed_storage.py
@@ -2510,6 +2510,7 @@ class TestVMFS(MAASServerTestCase, AssertStorageConfigMixin):
             device: sda
             number: 1
             type: partition
+            offset: 4194304B
             size: 3145728B
             uuid: 7f79841c-9f57-4ab7-ada2-b2774e3908a3
             wipe: superblock
@@ -2625,6 +2626,7 @@ class TestVMFS(MAASServerTestCase, AssertStorageConfigMixin):
             status=NODE_STATUS.ALLOCATED,
             architecture="amd64/generic",
             osystem="esxi",
+            bios_boot_method="uefi",
             distro_series="6.7",
             with_boot_disk=False,
         )
diff --git a/src/maasserver/tests/test_storage_layouts.py b/src/maasserver/tests/test_storage_layouts.py
index 1918dca..44955d0 100644
--- a/src/maasserver/tests/test_storage_layouts.py
+++ b/src/maasserver/tests/test_storage_layouts.py
@@ -548,7 +548,7 @@ class TestFlatStorageLayout(MAASServerTestCase, LayoutHelpersMixin):
             ["root_device", "root_size", "boot_size"], layout.fields.keys()
         )
 
-    def test__creates_layout_with_mbr_defaults(self):
+    def test__creates_layout_with_gpt_defaults(self):
         node = factory.make_Node(with_boot_disk=False)
         boot_disk = factory.make_PhysicalBlockDevice(
             node=node, size=LARGE_BLOCK_DEVICE
@@ -558,7 +558,7 @@ class TestFlatStorageLayout(MAASServerTestCase, LayoutHelpersMixin):
 
         # Validate partition table.
         partition_table = boot_disk.get_partitiontable()
-        self.assertEqual(PARTITION_TABLE_TYPE.MBR, partition_table.table_type)
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
 
         # Validate root partition.
         partitions = partition_table.partitions.order_by("id").all()
@@ -715,7 +715,7 @@ class TestFlatStorageLayout(MAASServerTestCase, LayoutHelpersMixin):
 
         # Validate partition table.
         partition_table = boot_disk.get_partitiontable()
-        self.assertEqual(PARTITION_TABLE_TYPE.MBR, partition_table.table_type)
+        self.assertEqual(PARTITION_TABLE_TYPE.GPT, partition_table.table_type)
 
         # Validate boot partition.
         partitions = partition_table.partitions.order_by("id").all()
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 0af3a36..f703a5b 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -674,7 +674,7 @@ class TestMachineHandler(MAASServerTestCase):
         # and slowing down the client waiting for the response.
         self.assertEqual(
             queries,
-            55,
+            76,
             "Number of queries has changed; make sure this is expected.",
         )