Merge ~adam-collard/maas:vmfs7-websocket into maas:master

[Adam Collard]

Special case VMFS7 layout too.

See https://github.com/canonical-web-and-design/maas-ui/issues/2772#issuecomment-899909562

[MAAS Lander (maas-lander)]

UNIT TESTS
-b vmfs7-websocket lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10722/console
COMMIT: 294873a1fa79d234137cbf05f8074398140d4178

review: Needs Fixing

[Alberto Donato (ack)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b vmfs7-websocket lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10724/consoleText

diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 1417834..eff6132 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -393,12 +393,17 @@ class NodeHandler(TimestampedModelHandler):
                 # partition. VMware ESXi does not directly mount the partitions
                 # used. As MAAS can't model that inject a place holder so the
                 # UI knows that these partitions are in use.
-                if detected_layout == "vmfs6":
+                datastore_partition_for_layout = {
+                    "vmfs6": "-part3",
+                    "vmfs7": "-part8",
+                }.get(detected_layout)
+                if datastore_partition_for_layout is not None:
                     for disk in data["disks"]:
                         if disk["id"] == layout_bd.id:
                             for partition in disk["partitions"]:
-                                if partition["name"].endswith("-part3"):
-                                    # Partition 3 is for the default datastore.
+                                if partition["name"].endswith(
+                                    datastore_partition_for_layout
+                                ):
                                     # This partition may be modified by the
                                     # user.
                                     continue
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index b13f953..90c871f 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -71,6 +71,7 @@ from maasserver.storage_layouts import (
     get_applied_storage_layout_for_node,
     get_storage_layout_choices,
     VMFS6StorageLayout,
+    VMFS7StorageLayout,
 )
 from maasserver.testing.architecture import make_usable_architecture
 from maasserver.testing.factory import factory
@@ -825,7 +826,7 @@ class TestMachineHandler(MAASServerTestCase):
         handler.dehydrate(node, data)
         self.assertEqual(data["pod"], {"id": pod.id, "name": pod.name})
 
-    def test_dehydrate_with_vmfs_layout_sets_reserved(self):
+    def test_dehydrate_with_vmfs6_layout_sets_reserved(self):
         owner = factory.make_User()
         node = factory.make_Node(with_boot_disk=False)
         node.boot_disk = factory.make_PhysicalBlockDevice(
@@ -857,6 +858,38 @@ class TestMachineHandler(MAASServerTestCase):
                             partition["filesystem"],
                         )
 
+    def test_dehydrate_with_vmfs7_layout_sets_reserved(self):
+        owner = factory.make_User()
+        node = factory.make_Node(with_boot_disk=False)
+        node.boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=LARGE_BLOCK_DEVICE
+        )
+        layout = VMFS7StorageLayout(node)
+        layout.configure()
+        handler = MachineHandler(owner, {}, None)
+        for disk in handler.dehydrate(node, {})["disks"]:
+            if disk["id"] == node.boot_disk.id:
+                for partition in disk["partitions"]:
+                    if partition["name"].endswith("-part8"):
+                        self.assertEqual(
+                            "VMFS extent for datastore1", partition["used_for"]
+                        )
+                    else:
+                        self.assertEqual(
+                            "VMware ESXi OS partition", partition["used_for"]
+                        )
+                        self.assertDictEqual(
+                            {
+                                "id": -1,
+                                "label": "RESERVED",
+                                "mount_point": "RESERVED",
+                                "mount_options": None,
+                                "fstype": None,
+                                "is_format_fstype": False,
+                            },
+                            partition["filesystem"],
+                        )
+
     def test_dehydrate_power_parameters_returns_None_when_empty(self):
         owner = factory.make_User()
         handler = MachineHandler(owner, {}, None)