Skip to content

Commit 74337d2

Browse files
committed
Refactor some code into utils/nvmet directory
1 parent 51bddd4 commit 74337d2

File tree

7 files changed

+501
-494
lines changed

7 files changed

+501
-494
lines changed

src/middlewared/middlewared/etc_files/nvmet_kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from middlewared.plugins.nvmet.kernel import write_config
1+
from middlewared.utils.nvmet.kernel import write_config
22

33

44
def render(service, middleware, render_ctx):

src/middlewared/middlewared/etc_files/nvmet_spdk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from middlewared.plugins.nvmet.spdk import write_config
1+
from middlewared.utils.nvmet.spdk import write_config
22

33

44
def render(service, middleware, render_ctx):

src/middlewared/middlewared/plugins/nvmet/global.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from middlewared.service import SystemServiceService, ValidationErrors, filterable_api_method, private
1515
from middlewared.utils import filter_list
1616
from .constants import NVMET_SERVICE_NAME
17-
from .kernel import clear_config, load_modules, nvmet_kernel_module_loaded, unload_module
17+
from middlewared.utils.nvmet.kernel import clear_config, load_modules, nvmet_kernel_module_loaded, unload_module
1818
from .mixin import NVMetStandbyMixin
1919
from .utils import uuid_nqn
2020

src/middlewared/middlewared/plugins/nvmet/namespace.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
from middlewared.service import SharingService, ValidationErrors, private
1818
from middlewared.service_exception import CallError, MatchNotFound
1919
from .constants import NAMESPACE_DEVICE_TYPE
20-
from .kernel import lock_namespace as kernel_lock_namespace
21-
from .kernel import unlock_namespace as kernel_unlock_namespace
22-
from .kernel import resize_namespace as kernel_resize_namespace
20+
from middlewared.utils.nvmet.kernel import lock_namespace as kernel_lock_namespace
21+
from middlewared.utils.nvmet.kernel import unlock_namespace as kernel_unlock_namespace
22+
from middlewared.utils.nvmet.kernel import resize_namespace as kernel_resize_namespace
2323

2424
UUID_GENERATE_RETRIES = 10
2525
NSID_SEARCH_RANGE = 0xFFFF # This is much less than NSID, but good enough for practical purposes.

0 commit comments

Comments
 (0)