Skip to content

Commit 4d71f04

Browse files
authored
Merge pull request ceph#65702 from Hezko/nvmeof-cli-fix-api-cli-separte-commands
mgr/dashboard: fix the separation between CLI and API only commands Reviewed-by: Nizamudeen A <[email protected]>
2 parents 857a462 + 7b71919 commit 4d71f04

File tree

1 file changed

+44
-7
lines changed
  • src/pybind/mgr/dashboard/controllers

1 file changed

+44
-7
lines changed

src/pybind/mgr/dashboard/controllers/nvmeof.py

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,6 @@ def io_stats(self, nqn: str, nsid: str, gw_group: Optional[str] = None,
434434
subsystem_nqn=nqn, nsid=int(nsid))
435435
)
436436

437-
@NvmeofCLICommand(
438-
"nvmeof namespace add", model.NamespaceCreation, alias="nvmeof ns add"
439-
)
440437
@EndpointDoc(
441438
"Create a new NVMeoF namespace",
442439
parameters={
@@ -466,6 +463,48 @@ def io_stats(self, nqn: str, nsid: str, gw_group: Optional[str] = None,
466463
@convert_to_model(model.NamespaceCreation)
467464
@handle_nvmeof_error
468465
def create(
466+
self,
467+
nqn: str,
468+
rbd_image_name: str,
469+
rbd_pool: str = "rbd",
470+
nsid: Optional[str] = None,
471+
create_image: Optional[bool] = False,
472+
size: Optional[int] = None,
473+
rbd_image_size: Optional[int] = None,
474+
trash_image: Optional[bool] = False,
475+
block_size: int = 512,
476+
load_balancing_group: Optional[int] = None,
477+
force: Optional[bool] = False,
478+
no_auto_visible: Optional[bool] = False,
479+
disable_auto_resize: Optional[bool] = False,
480+
read_only: Optional[bool] = False,
481+
gw_group: Optional[str] = None,
482+
traddr: Optional[str] = None,
483+
):
484+
return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.namespace_add(
485+
NVMeoFClient.pb2.namespace_add_req(
486+
subsystem_nqn=nqn,
487+
nsid=int(nsid) if nsid else None,
488+
rbd_image_name=rbd_image_name,
489+
rbd_pool_name=rbd_pool,
490+
block_size=block_size,
491+
create_image=create_image,
492+
size=rbd_image_size or size,
493+
trash_image=trash_image,
494+
anagrpid=load_balancing_group,
495+
force=force,
496+
no_auto_visible=no_auto_visible,
497+
disable_auto_resize=disable_auto_resize,
498+
read_only=read_only
499+
)
500+
)
501+
502+
@NvmeofCLICommand(
503+
"nvmeof namespace add", model.NamespaceCreation, alias="nvmeof ns add"
504+
)
505+
@convert_to_model(model.NamespaceCreation)
506+
@handle_nvmeof_error
507+
def create_cli(
469508
self,
470509
nqn: str,
471510
rbd_image_name: str,
@@ -594,9 +633,6 @@ def change_load_balancing_group(
594633

595634
@ReadPermission
596635
@Endpoint('PUT', '{nsid}/resize')
597-
@NvmeofCLICommand(
598-
"nvmeof namespace resize", model=model.RequestStatus, alias="nvmeof ns resize"
599-
)
600636
@EndpointDoc(
601637
"resize the specified NVMeoF namespace",
602638
parameters={
@@ -626,7 +662,8 @@ def resize(
626662
)
627663
)
628664

629-
@NvmeofCLICommand("nvmeof ns resize", model=model.RequestStatus)
665+
@NvmeofCLICommand("nvmeof namespace resize", model=model.RequestStatus,
666+
alias="nvmeof ns resize")
630667
@convert_to_model(model.RequestStatus)
631668
@handle_nvmeof_error
632669
def resize_cli(

0 commit comments

Comments
 (0)