Merge lp:~blake-rouse/maas/fix-1509536-part3 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Always set ptable in the disk operation if the disk is the boot disk.

Final part of bug: https://bugs.launchpad.net/maas/+bug/1509536

Also fixes bug: https://bugs.launchpad.net/maas/+bug/1509536

[Andres Rodriguez (andreserl)]

does this show any UI notifications? or the buttons are not made available?

review: Needs Information

[Blake Rouse (blake-rouse)]

No this has nothing to do with the UI. That is in the following branch. Still finishing it.

[Blake Rouse (blake-rouse)]

Now that all the parts are together no UI is required for this bug. Its all automatic even for the API. If you go to create a bcache, cache set, volume group, or RAID and the boot disk is selected a partition will be created for the entire disk and be added to the operation. This make it very easy for the user, they don't need to know the details.

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

=== modified file 'src/maasserver/preseed_storage.py'
--- src/maasserver/preseed_storage.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/preseed_storage.py	2015-10-28 02:07:56 +0000
@@ -177,13 +177,19 @@
             disk_operation["serial"] = block_device.serial
         else:
             disk_operation["path"] = block_device.id_path
-        # When no partition table, then the superblock on the
-        # device should be wiped. This ensures that previous data is not
-        # available to newly deployed node.
+
+        # Set the partition table type if a partition table exists or if this
+        # is the boot disk.
         partition_table = block_device.get_partitiontable()
         if partition_table is not None:
             disk_operation["ptable"] = self._get_ptable_type(
                 partition_table)
+        elif block_device.id == self.boot_disk.id:
+            if self.node.get_bios_boot_method() == "uefi":
+                disk_operation["ptable"] = "gpt"
+            else:
+                disk_operation["ptable"] = "msdos"
+
         # Set this disk to be the grub device if its the boot disk.
         if self.boot_disk == block_device:
             disk_operation["grub_device"] = True

=== modified file 'src/maasserver/tests/test_preseed_storage.py'
--- src/maasserver/tests/test_preseed_storage.py	2015-10-28 02:07:56 +0000
+++ src/maasserver/tests/test_preseed_storage.py	2015-10-28 02:07:56 +0000
@@ -411,6 +411,73 @@
         self.assertStorageConfig(self.STORAGE_CONFIG, config)
 
 
+class TestMBRWithBootDiskWithoutPartitionsLayout(
+        MAASServerTestCase, AssertStorageConfigMixin):
+
+    STORAGE_CONFIG = dedent("""\
+        config:
+          - id: sda
+            name: sda
+            type: disk
+            wipe: superblock
+            ptable: msdos
+            model: QEMU HARDDISK
+            serial: QM00001
+          - id: sdb
+            name: sdb
+            type: disk
+            wipe: superblock
+            ptable: msdos
+            path: /dev/disk/by-id/wwn-0x55cd2e400009bf84
+            grub_device: true
+          - id: sda-part1
+            name: sda-part1
+            type: partition
+            number: 1
+            uuid: 6efc2c3d-bc9d-4ee5-a7ed-c6e1574d5398
+            size: 8586788864B
+            device: sda
+            wipe: superblock
+            offset: 2097152B
+          - id: sda-part1_format
+            type: format
+            fstype: ext4
+            label: root
+            uuid: 90a69b22-e281-4c5b-8df9-b09514f27ba1
+            volume: sda-part1
+          - id: sda-part1_mount
+            type: mount
+            path: /
+            device: sda-part1_format
+        """)
+
+    def test__renders_expected_output(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.ALLOCATED, with_boot_disk=False)
+        first_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sda",
+            model="QEMU HARDDISK", serial="QM00001")  # 8 GiB
+        boot_disk = factory.make_PhysicalBlockDevice(
+            node=node, size=8 * 1024 ** 3, name="sdb",
+            id_path="/dev/disk/by-id/wwn-0x55cd2e400009bf84")
+        node.boot_disk = boot_disk
+        node.save()
+        partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.MBR, block_device=first_disk)
+        root_partition = factory.make_Partition(
+            partition_table=partition_table,
+            uuid="6efc2c3d-bc9d-4ee5-a7ed-c6e1574d5398",
+            size=(8 * 1024 ** 3) - PARTITION_TABLE_EXTRA_SPACE,
+            bootable=False)
+        factory.make_Filesystem(
+            partition=root_partition, fstype=FILESYSTEM_TYPE.EXT4,
+            uuid="90a69b22-e281-4c5b-8df9-b09514f27ba1", label="root",
+            mount_point="/")
+        node._create_acquired_filesystems()
+        config = compose_curtin_storage_config(node)
+        self.assertStorageConfig(self.STORAGE_CONFIG, config)
+
+
 class TestComplexDiskLayout(
         MAASServerTestCase, AssertStorageConfigMixin):