MAAS

Merge ~troyanov/maas:revert-1938296-to-3.2 into maas:3.2

  1. Git
  2. lp:~troyanov/maas
  3. revert-1938296-to-3.2
  4. Merge into 3.2
Proposed by Anton Troyanov
Status: Merged
Approved by: Christian Grabowski
Approved revision: 1e9b08d5d0fd98cff3504e23e553893a4ae30994
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:revert-1938296-to-3.2
Merge into: maas:3.2
Diff against target: 195 lines (+14/-57)
6 files modified
src/maasserver/forms/__init__.py (+3/-3)
src/maasserver/forms/tests/test_blockdevice.py (+1/-2)
src/maasserver/models/filesystemgroup.py (+0/-4)
src/maasserver/models/tests/test_filesystemgroup.py (+0/-29)
src/maasserver/models/tests/test_node.py (+3/-4)
src/maasserver/tests/test_preseed_storage.py (+7/-15)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
MAAS Lander Approve
Review via email: mp+427679@code.launchpad.net

Commit message

Revert "fix RAID device available space reporting"

This reverts commit 47edd13773def85a776d5c517e0dc9830c30f91b.

LP:1981536
(cherry picked from commit 7a6e7bafd63c87e75265c16aeec9dcf3a34bfa19)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

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

STATUS: SUCCESS
COMMIT: 1e9b08d5d0fd98cff3504e23e553893a4ae30994

review: Approve
Revision history for this message
Anton Troyanov (troyanov) wrote :

self-approve backport to 3.2

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b revert-1938296-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

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

Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b revert-1938296-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
2index f77e344..e3e0fb6 100644
3--- a/src/maasserver/forms/__init__.py
4+++ b/src/maasserver/forms/__init__.py
5@@ -2853,10 +2853,10 @@ class FormatBlockDeviceForm(Form):
6 cleaned_data = super().clean()
7 if "fstype" not in cleaned_data:
8 return cleaned_data
9- partitions = Partition.objects.filter(
10- partition_table__block_device=self.block_device
11+ partition_table = PartitionTable.objects.filter(
12+ block_device=self.block_device
13 )
14- if partitions.exists():
15+ if partition_table.exists():
16 raise ValidationError(
17 "Cannot format block device with a partition table."
18 )
19diff --git a/src/maasserver/forms/tests/test_blockdevice.py b/src/maasserver/forms/tests/test_blockdevice.py
20index 7f6f0b2..01a347a 100644
21--- a/src/maasserver/forms/tests/test_blockdevice.py
22+++ b/src/maasserver/forms/tests/test_blockdevice.py
23@@ -36,8 +36,7 @@ class TestFormatBlockDeviceForm(MAASServerTestCase):
24 def test_is_not_valid_if_block_device_has_partition_table(self):
25 fstype = factory.pick_filesystem_type()
26 block_device = factory.make_PhysicalBlockDevice()
27- pt = factory.make_PartitionTable(block_device=block_device)
28- pt.add_partition()
29+ factory.make_PartitionTable(block_device=block_device)
30 data = {"fstype": fstype}
31 form = FormatBlockDeviceForm(block_device, data=data)
32 self.assertFalse(
33diff --git a/src/maasserver/models/filesystemgroup.py b/src/maasserver/models/filesystemgroup.py
34index c90c224..eda3a48 100644
35--- a/src/maasserver/models/filesystemgroup.py
36+++ b/src/maasserver/models/filesystemgroup.py
37@@ -207,7 +207,6 @@ class RAIDManager(BaseFilesystemGroupManager):
38 spare_devices=[],
39 spare_partitions=[],
40 ):
41- from maasserver.models import PartitionTable
42 from maasserver.models.filesystem import Filesystem
43
44 # Create a FilesystemGroup for this RAID
45@@ -255,9 +254,6 @@ class RAIDManager(BaseFilesystemGroupManager):
46 filesystem_group=raid,
47 )
48 raid.save(force_update=True)
49-
50- PartitionTable.objects.create(block_device=raid.virtual_device)
51-
52 return raid
53
54
55diff --git a/src/maasserver/models/tests/test_filesystemgroup.py b/src/maasserver/models/tests/test_filesystemgroup.py
56index 75673c4..c7a3a16 100644
57--- a/src/maasserver/models/tests/test_filesystemgroup.py
58+++ b/src/maasserver/models/tests/test_filesystemgroup.py
59@@ -19,7 +19,6 @@ from maasserver.enum import (
60 FILESYSTEM_TYPE,
61 PARTITION_TABLE_TYPE,
62 )
63-from maasserver.models import PartitionTable
64 from maasserver.models.blockdevice import MIN_BLOCK_DEVICE_SIZE
65 from maasserver.models.filesystem import Filesystem
66 from maasserver.models.filesystemgroup import (
67@@ -2296,34 +2295,6 @@ class TestRAID(MAASServerTestCase):
68 (10 * partition.size) - RAID_SUPERBLOCK_OVERHEAD, raid.get_size()
69 )
70
71- def test_create_raid_with_partition_table(self):
72- node = factory.make_Node()
73- block_devices = [
74- factory.make_PhysicalBlockDevice(
75- node=node, size=21470003200, block_size=512
76- ),
77- factory.make_PhysicalBlockDevice(
78- node=node, size=11270004736, block_size=512
79- ),
80- ]
81- partitions = []
82- for bd in block_devices:
83- ptable = factory.make_PartitionTable(block_device=bd)
84- partitions.append(ptable.add_partition())
85-
86- uuid = str(uuid4())
87- md0 = RAID.objects.create_raid(
88- name="md0",
89- level=FILESYSTEM_GROUP_TYPE.RAID_0,
90- uuid=uuid,
91- partitions=partitions,
92- )
93- bdev = md0.virtual_device
94- part_size = bdev.get_available_size()
95-
96- pt_md0, _ = PartitionTable.objects.get_or_create(block_device=bdev)
97- pt_md0.add_partition(size=part_size)
98-
99 def test_add_spare_partition_to_array(self):
100 node = factory.make_Node()
101 device_size = 10 * 1000**4
102diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
103index 09fac42..408d63d 100644
104--- a/src/maasserver/models/tests/test_node.py
105+++ b/src/maasserver/models/tests/test_node.py
106@@ -92,7 +92,6 @@ from maasserver.models import (
107 from maasserver.models import (
108 NodeDevice,
109 OwnerData,
110- PartitionTable,
111 PhysicalInterface,
112 RackController,
113 RAID,
114@@ -12336,10 +12335,10 @@ class TestNodeStorageClone_ComplexDiskLayout(
115 block_devices=[raid_5_disk_1, raid_5_disk_2, raid_5_disk_3],
116 spare_devices=[raid_5_disk_4, raid_5_disk_5],
117 )
118- raid_5_partition_table = PartitionTable.objects.get(
119- block_device=raid_5.virtual_device
120+ raid_5_partition_table = factory.make_PartitionTable(
121+ table_type=PARTITION_TABLE_TYPE.GPT,
122+ block_device=raid_5.virtual_device,
123 )
124-
125 raid_5_partition = factory.make_Partition(
126 partition_table=raid_5_partition_table,
127 uuid="18a6e885-3e6d-4505-8a0d-cf34df11a8b0",
128diff --git a/src/maasserver/tests/test_preseed_storage.py b/src/maasserver/tests/test_preseed_storage.py
129index befa7c3..6f16bf8 100644
130--- a/src/maasserver/tests/test_preseed_storage.py
131+++ b/src/maasserver/tests/test_preseed_storage.py
132@@ -23,14 +23,7 @@ from maasserver.enum import (
133 NODE_STATUS,
134 PARTITION_TABLE_TYPE,
135 )
136-from maasserver.models import (
137- Bcache,
138- Filesystem,
139- PartitionTable,
140- RAID,
141- VMFS,
142- VolumeGroup,
143-)
144+from maasserver.models import Bcache, Filesystem, RAID, VMFS, VolumeGroup
145 from maasserver.models.partitiontable import (
146 BIOS_GRUB_PARTITION_SIZE,
147 PARTITION_TABLE_EXTRA_SPACE,
148@@ -1264,8 +1257,9 @@ class TestComplexDiskLayout(MAASServerTestCase, AssertStorageConfigMixin):
149 block_devices=[raid_5_disk_1, raid_5_disk_2, raid_5_disk_3],
150 spare_devices=[raid_5_disk_4, raid_5_disk_5],
151 )
152- raid_5_partition_table = PartitionTable.objects.get(
153- block_device=raid_5.virtual_device
154+ raid_5_partition_table = factory.make_PartitionTable(
155+ table_type=PARTITION_TABLE_TYPE.GPT,
156+ block_device=raid_5.virtual_device,
157 )
158 raid_5_partition = factory.make_Partition(
159 partition_table=raid_5_partition_table,
160@@ -1687,7 +1681,6 @@ class TestBootableRaidLayoutMBR(MAASServerTestCase, AssertStorageConfigMixin):
161 - sdc-part2
162 id: md0
163 name: md0
164- ptable: gpt
165 raidlevel: 1
166 spare_devices: []
167 type: raid
168@@ -1819,7 +1812,6 @@ class TestBootableRaidLayoutUEFI(MAASServerTestCase, AssertStorageConfigMixin):
169 - sdc-part1
170 id: md0
171 name: md0
172- ptable: gpt
173 raidlevel: 1
174 spare_devices: []
175 type: raid
176@@ -1969,7 +1961,6 @@ class TestBootableRaidLayoutGPT(MAASServerTestCase, AssertStorageConfigMixin):
177 - sdc-part2
178 id: md0
179 name: md0
180- ptable: gpt
181 raidlevel: 1
182 spare_devices: []
183 type: raid
184@@ -2180,8 +2171,9 @@ class TestBootableRaidLayoutGPTWithPartition(
185 uuid="uuid-raid",
186 partitions=partitions,
187 )
188- raid_part_table = PartitionTable.objects.get(
189- block_device=raid.virtual_device
190+ raid_part_table = factory.make_PartitionTable(
191+ table_type=PARTITION_TABLE_TYPE.GPT,
192+ block_device=raid.virtual_device,
193 )
194 raid_partition = factory.make_Partition(
195 partition_table=raid_part_table,

Subscribers

People subscribed via source and target branches