Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/stratis_cli/_actions/_list_filesystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ def list_filesystems(uuid_formatter: Callable, *, pool_name=None, fs_id=None):
"""
assert fs_id is None or pool_name is not None

from ._data import ( # noqa: PLC0415
MOFilesystem,
MOPool,
ObjectManager,
filesystems,
pools,
)
from ._data import MOFilesystem, MOPool, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down
55 changes: 7 additions & 48 deletions src/stratis_cli/_actions/_logical.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ def create_volumes(namespace: Namespace):
:raises StratisCliPartialChangeError:
"""

from ._data import ( # noqa: PLC0415
MOFilesystem,
ObjectManager,
Pool,
filesystems,
pools,
)
from ._data import MOFilesystem, ObjectManager, Pool, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down Expand Up @@ -149,13 +143,7 @@ def destroy_volumes(namespace: Namespace):
:raises StratisCliPartialChangeError:
"""

from ._data import ( # noqa: PLC0415
MOFilesystem,
ObjectManager,
Pool,
filesystems,
pools,
)
from ._data import MOFilesystem, ObjectManager, Pool, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down Expand Up @@ -249,12 +237,7 @@ def rename_fs(namespace: Namespace):
:raises StratisCliEngineError:
:raises StratisCliNoChangeError:
"""
from ._data import ( # noqa: PLC0415
Filesystem,
ObjectManager,
filesystems,
pools,
)
from ._data import Filesystem, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down Expand Up @@ -284,13 +267,7 @@ def set_size_limit(namespace: Namespace):
"""
Set an upper limit on the size of the filesystem.
"""
from ._data import ( # noqa: PLC0415
Filesystem,
MOFilesystem,
ObjectManager,
filesystems,
pools,
)
from ._data import Filesystem, MOFilesystem, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down Expand Up @@ -327,13 +304,7 @@ def unset_size_limit(namespace: Namespace):
"""
Unset upper limit on the size of the filesystem.
"""
from ._data import ( # noqa: PLC0415
Filesystem,
MOFilesystem,
ObjectManager,
filesystems,
pools,
)
from ._data import Filesystem, MOFilesystem, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand All @@ -360,13 +331,7 @@ def schedule_revert(namespace: Namespace):
"""
Schedule reverting a snapshot into its origin.
"""
from ._data import ( # noqa: PLC0415
Filesystem,
MOFilesystem,
ObjectManager,
filesystems,
pools,
)
from ._data import Filesystem, MOFilesystem, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down Expand Up @@ -397,13 +362,7 @@ def cancel_revert(namespace: Namespace):
"""
Cancel reverting a snapshot into its origin.
"""
from ._data import ( # noqa: PLC0415
Filesystem,
MOFilesystem,
ObjectManager,
filesystems,
pools,
)
from ._data import Filesystem, MOFilesystem, ObjectManager, filesystems, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down
9 changes: 1 addition & 8 deletions src/stratis_cli/_actions/_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,7 @@ def init_cache(namespace: Namespace):
:raises StratisCliEngineError:
:raises StratisCliIncoherenceError:
"""
from ._data import ( # noqa: PLC0415
MODev,
MOPool,
ObjectManager,
Pool,
devs,
pools,
)
from ._data import MODev, MOPool, ObjectManager, Pool, devs, pools # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down
6 changes: 1 addition & 5 deletions tests/integration/physical/test_debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ def test_lookup_uuid(self):

from stratis_cli._actions._connection import get_object # noqa: PLC0415
from stratis_cli._actions._constants import TOP_OBJECT # noqa: PLC0415
from stratis_cli._actions._data import ( # noqa: PLC0415
MODev,
ObjectManager,
devs,
)
from stratis_cli._actions._data import MODev, ObjectManager, devs # noqa: PLC0415

proxy = get_object(TOP_OBJECT)
managed_objects = ObjectManager.Methods.GetManagedObjects(proxy, {})
Expand Down
Loading