types: move storage-related types to types/storage.py

Signed-off-by: Olivier Gayot <[email protected]>
canonical · Jun 11, 2024 · 6171179 · 6171179
1 parent 8cd7362
commit 6171179
Show file tree

Hide file tree

Showing 19 changed files with 375 additions and 342 deletions.
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -46,7 +46,8 @@ subiquity/common/resources.py
 subiquity/common/serialize.py
 subiquity/common/tests/__init__.py
 subiquity/common/tests/test_serialization.py
-subiquity/common/types.py
+subiquity/common/types/__init__.py
+subiquity/common/types/storage.py
 subiquitycore/async_helpers.py
 subiquitycore/context.py
 subiquitycore/controller.py

diff --git a/subiquity/client/controllers/filesystem.py b/subiquity/client/controllers/filesystem.py
@@ -20,7 +20,7 @@
 from subiquity.client.controller import SubiquityTuiController
 from subiquity.common.filesystem import gaps
 from subiquity.common.filesystem.manipulator import FilesystemManipulator
-from subiquity.common.types import (
+from subiquity.common.types.storage import (
     GuidedCapability,
     GuidedChoiceV2,
     GuidedStorageResponseV2,

diff --git a/subiquity/common/apidef.py b/subiquity/common/apidef.py
@@ -26,7 +26,6 @@
     AdAdminNameValidation,
     AdConnectionInfo,
     AdDomainNameValidation,
-    AddPartitionV2,
     AdJoinResult,
     AdPasswordValidation,
     AnyStep,
@@ -35,12 +34,9 @@
     CasperMd5Results,
     Change,
     CodecsData,
-    Disk,
     DriversPayload,
     DriversResponse,
     ErrorReportRef,
-    GuidedChoiceV2,
-    GuidedStorageResponseV2,
     IdentityData,
     KeyboardSetting,
     KeyboardSetup,
@@ -50,11 +46,9 @@
     MirrorPost,
     MirrorPostResponse,
     MirrorSelectionFallback,
-    ModifyPartitionV2,
     NetworkStatus,
     OEMResponse,
     PackageInstallState,
-    ReformatDisk,
     RefreshStatus,
     ShutdownMode,
     SnapInfo,
@@ -63,8 +57,6 @@
     SourceSelectionAndSetting,
     SSHData,
     SSHFetchIdResponse,
-    StorageResponse,
-    StorageResponseV2,
     TimeZoneInfo,
     UbuntuProCheckTokenAnswer,
     UbuntuProGeneralInfo,
@@ -75,6 +67,16 @@
     UsernameValidation,
     ZdevInfo,
 )
+from subiquity.common.types.storage import (
+    AddPartitionV2,
+    Disk,
+    GuidedChoiceV2,
+    GuidedStorageResponseV2,
+    ModifyPartitionV2,
+    ReformatDisk,
+    StorageResponse,
+    StorageResponseV2,
+)
 from subiquitycore.models.network import (
     BondConfig,
     NetDevInfo,

diff --git a/subiquity/common/filesystem/actions.py b/subiquity/common/filesystem/actions.py
@@ -18,7 +18,7 @@
 from gettext import pgettext
 
 from subiquity.common.filesystem import boot, gaps, labels
-from subiquity.common.types import GapUsable
+from subiquity.common.types.storage import GapUsable
 from subiquity.models.filesystem import (
     Bootloader,
     Disk,

diff --git a/subiquity/common/filesystem/gaps.py b/subiquity/common/filesystem/gaps.py
@@ -18,7 +18,7 @@
 
 import attr
 
-from subiquity.common.types import GapUsable
+from subiquity.common.types.storage import GapUsable
 from subiquity.models.filesystem import (
     LVM_CHUNK_SIZE,
     Disk,

diff --git a/subiquity/common/filesystem/labels.py b/subiquity/common/filesystem/labels.py
@@ -15,8 +15,8 @@
 
 import functools
 
-from subiquity.common import types
 from subiquity.common.filesystem import boot, gaps
+from subiquity.common.types import storage as types
 from subiquity.models.filesystem import (
     ZFS,
     Disk,

diff --git a/subiquity/common/filesystem/manipulator.py b/subiquity/common/filesystem/manipulator.py
@@ -18,7 +18,7 @@
 from curtin.block import get_resize_fstypes
 
 from subiquity.common.filesystem import boot, gaps
-from subiquity.common.types import Bootloader
+from subiquity.common.types.storage import Bootloader
 from subiquity.models.filesystem import Partition, align_up
 from subiquitycore.utils import write_named_tempfile
 

diff --git a/subiquity/common/filesystem/sizes.py b/subiquity/common/filesystem/sizes.py
@@ -17,7 +17,7 @@
 
 import attr
 
-from subiquity.common.types import GuidedResizeValues
+from subiquity.common.types.storage import GuidedResizeValues
 from subiquity.models.filesystem import GiB, MiB, align_down, align_up
 
 BIOS_GRUB_SIZE_BYTES = 1 * MiB

diff --git a/subiquity/common/filesystem/tests/test_gaps.py b/subiquity/common/filesystem/tests/test_gaps.py
@@ -18,7 +18,7 @@
 from unittest import mock
 
 from subiquity.common.filesystem import gaps
-from subiquity.common.types import GapUsable
+from subiquity.common.types.storage import GapUsable
 from subiquity.models.filesystem import (
     LVM_CHUNK_SIZE,
     LVM_OVERHEAD,

diff --git a/subiquity/common/filesystem/tests/test_sizes.py b/subiquity/common/filesystem/tests/test_sizes.py
@@ -27,7 +27,7 @@
     scale_partitions,
     uefi_scale,
 )
-from subiquity.common.types import GuidedResizeValues
+from subiquity.common.types.storage import GuidedResizeValues
 from subiquity.models.filesystem import MiB
 
 

diff --git a/subiquity/common/tests/test_types.py b/subiquity/common/tests/test_types.py
@@ -15,7 +15,7 @@
 
 import unittest
 
-from subiquity.common.types import GuidedCapability, SizingPolicy
+from subiquity.common.types.storage import GuidedCapability, SizingPolicy
 
 
 class TestSizingPolicy(unittest.TestCase):