Merge ~troyanov/maas:revert-1938296 into maas:master

[Anton Troyanov]

Revert "fix RAID device available space reporting"

This reverts commit 47edd13773def85a776d5c517e0dc9830c30f91b.

LP:1981536

[MAAS Lander (maas-lander)]

UNIT TESTS
-b revert-1938296 lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8234de2908a66a379d8491cc9ae1c94b5ecaf968

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index 59b1b12..e99ad29 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -2855,10 +2855,10 @@ class FormatBlockDeviceForm(Form):
         cleaned_data = super().clean()
         if "fstype" not in cleaned_data:
             return cleaned_data
-        partitions = Partition.objects.filter(
-            partition_table__block_device=self.block_device
+        partition_table = PartitionTable.objects.filter(
+            block_device=self.block_device
         )
-        if partitions.exists():
+        if partition_table.exists():
             raise ValidationError(
                 "Cannot format block device with a partition table."
             )
diff --git a/src/maasserver/forms/tests/test_blockdevice.py b/src/maasserver/forms/tests/test_blockdevice.py
index 7f6f0b2..01a347a 100644
--- a/src/maasserver/forms/tests/test_blockdevice.py
+++ b/src/maasserver/forms/tests/test_blockdevice.py
@@ -36,8 +36,7 @@ class TestFormatBlockDeviceForm(MAASServerTestCase):
     def test_is_not_valid_if_block_device_has_partition_table(self):
         fstype = factory.pick_filesystem_type()
         block_device = factory.make_PhysicalBlockDevice()
-        pt = factory.make_PartitionTable(block_device=block_device)
-        pt.add_partition()
+        factory.make_PartitionTable(block_device=block_device)
         data = {"fstype": fstype}
         form = FormatBlockDeviceForm(block_device, data=data)
         self.assertFalse(
diff --git a/src/maasserver/models/filesystemgroup.py b/src/maasserver/models/filesystemgroup.py
index bc758ba..9250d2c 100644
--- a/src/maasserver/models/filesystemgroup.py
+++ b/src/maasserver/models/filesystemgroup.py
@@ -207,7 +207,6 @@ class RAIDManager(BaseFilesystemGroupManager):
         spare_devices=[],
         spare_partitions=[],
     ):
-        from maasserver.models import PartitionTable
         from maasserver.models.filesystem import Filesystem
 
         # Create a FilesystemGroup for this RAID
@@ -255,9 +254,6 @@ class RAIDManager(BaseFilesystemGroupManager):
                 filesystem_group=raid,
             )
         raid.save(force_update=True)
-
-        PartitionTable.objects.create(block_device=raid.virtual_device)
-
         return raid
 
 
diff --git a/src/maasserver/models/tests/test_filesystemgroup.py b/src/maasserver/models/tests/test_filesystemgroup.py
index 44e7733..a0bf0e9 100644
--- a/src/maasserver/models/tests/test_filesystemgroup.py
+++ b/src/maasserver/models/tests/test_filesystemgroup.py
@@ -19,7 +19,6 @@ from maasserver.enum import (
     FILESYSTEM_TYPE,
     PARTITION_TABLE_TYPE,
 )
-from maasserver.models import PartitionTable
 from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
 from maasserver.models.filesystem import Filesystem
 from maasserver.models.filesystemgroup import (
@@ -2285,34 +2284,6 @@ class TestRAID(MAASServerTestCase):
             (10 * partition.size) - RAID_SUPERBLOCK_OVERHEAD, raid.get_size()
         )
 
-    def test_create_raid_with_partition_table(self):
-        node = factory.make_Node()
-        block_devices = [
-            factory.make_PhysicalBlockDevice(
-                node=node, size=21470003200, block_size=512
-            ),
-            factory.make_PhysicalBlockDevice(
-                node=node, size=11270004736, block_size=512
-            ),
-        ]
-        partitions = []
-        for bd in block_devices:
-            ptable = factory.make_PartitionTable(block_device=bd)
-            partitions.append(ptable.add_partition())
-
-        uuid = str(uuid4())
-        md0 = RAID.objects.create_raid(
-            name="md0",
-            level=FILESYSTEM_GROUP_TYPE.RAID_0,
-            uuid=uuid,
-            partitions=partitions,
-        )
-        bdev = md0.virtual_device
-        part_size = bdev.get_available_size()
-
-        pt_md0, _ = PartitionTable.objects.get_or_create(block_device=bdev)
-        pt_md0.add_partition(size=part_size)
-
     def test_add_spare_partition_to_array(self):
         node = factory.make_Node()
         device_size = 10 * 1000**4
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 9f54da9..8605163 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -92,7 +92,6 @@ from maasserver.models import (
 from maasserver.models import (
     NodeDevice,
     OwnerData,
-    PartitionTable,
     PhysicalInterface,
     RackController,
     RAID,
@@ -12312,10 +12311,10 @@ class TestNodeStorageClone_ComplexDiskLayout(
             block_devices=[raid_5_disk_1, raid_5_disk_2, raid_5_disk_3],
             spare_devices=[raid_5_disk_4, raid_5_disk_5],
         )
-        raid_5_partition_table = PartitionTable.objects.get(
-            block_device=raid_5.virtual_device
+        raid_5_partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT,
+            block_device=raid_5.virtual_device,
         )
-
         raid_5_partition = factory.make_Partition(
             partition_table=raid_5_partition_table,
             uuid="18a6e885-3e6d-4505-8a0d-cf34df11a8b0",
diff --git a/src/maasserver/tests/test_preseed_storage.py b/src/maasserver/tests/test_preseed_storage.py
index befa7c3..6f16bf8 100644
--- a/src/maasserver/tests/test_preseed_storage.py
+++ b/src/maasserver/tests/test_preseed_storage.py
@@ -23,14 +23,7 @@ from maasserver.enum import (
     NODE_STATUS,
     PARTITION_TABLE_TYPE,
 )
-from maasserver.models import (
-    Bcache,
-    Filesystem,
-    PartitionTable,
-    RAID,
-    VMFS,
-    VolumeGroup,
-)
+from maasserver.models import Bcache, Filesystem, RAID, VMFS, VolumeGroup
 from maasserver.models.partitiontable import (
     BIOS_GRUB_PARTITION_SIZE,
     PARTITION_TABLE_EXTRA_SPACE,
@@ -1264,8 +1257,9 @@ class TestComplexDiskLayout(MAASServerTestCase, AssertStorageConfigMixin):
             block_devices=[raid_5_disk_1, raid_5_disk_2, raid_5_disk_3],
             spare_devices=[raid_5_disk_4, raid_5_disk_5],
         )
-        raid_5_partition_table = PartitionTable.objects.get(
-            block_device=raid_5.virtual_device
+        raid_5_partition_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT,
+            block_device=raid_5.virtual_device,
         )
         raid_5_partition = factory.make_Partition(
             partition_table=raid_5_partition_table,
@@ -1687,7 +1681,6 @@ class TestBootableRaidLayoutMBR(MAASServerTestCase, AssertStorageConfigMixin):
             - sdc-part2
             id: md0
             name: md0
-            ptable: gpt
             raidlevel: 1
             spare_devices: []
             type: raid
@@ -1819,7 +1812,6 @@ class TestBootableRaidLayoutUEFI(MAASServerTestCase, AssertStorageConfigMixin):
             - sdc-part1
             id: md0
             name: md0
-            ptable: gpt
             raidlevel: 1
             spare_devices: []
             type: raid
@@ -1969,7 +1961,6 @@ class TestBootableRaidLayoutGPT(MAASServerTestCase, AssertStorageConfigMixin):
             - sdc-part2
             id: md0
             name: md0
-            ptable: gpt
             raidlevel: 1
             spare_devices: []
             type: raid
@@ -2180,8 +2171,9 @@ class TestBootableRaidLayoutGPTWithPartition(
             uuid="uuid-raid",
             partitions=partitions,
         )
-        raid_part_table = PartitionTable.objects.get(
-            block_device=raid.virtual_device
+        raid_part_table = factory.make_PartitionTable(
+            table_type=PARTITION_TABLE_TYPE.GPT,
+            block_device=raid.virtual_device,
         )
         raid_partition = factory.make_Partition(
             partition_table=raid_part_table,