Skip to content

Commit 7b71919

Browse files
author
Tomer Haskalovitch
committed
mgr/dashboard: fix the separation between CLI and API only commands
Signed-off-by: Tomer Haskalovitch <[email protected]>
1 parent f42d7db commit 7b71919

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
@@ -431,9 +431,6 @@ def io_stats(self, nqn: str, nsid: str, gw_group: Optional[str] = None,
431431
subsystem_nqn=nqn, nsid=int(nsid))
432432
)
433433

434-
@NvmeofCLICommand(
435-
"nvmeof namespace add", model.NamespaceCreation, alias="nvmeof ns add"
436-
)
437434
@EndpointDoc(
438435
"Create a new NVMeoF namespace",
439436
parameters={
@@ -463,6 +460,48 @@ def io_stats(self, nqn: str, nsid: str, gw_group: Optional[str] = None,
463460
@convert_to_model(model.NamespaceCreation)
464461
@handle_nvmeof_error
465462
def create(
463+
self,
464+
nqn: str,
465+
rbd_image_name: str,
466+
rbd_pool: str = "rbd",
467+
nsid: Optional[str] = None,
468+
create_image: Optional[bool] = False,
469+
size: Optional[int] = None,
470+
rbd_image_size: Optional[int] = None,
471+
trash_image: Optional[bool] = False,
472+
block_size: int = 512,
473+
load_balancing_group: Optional[int] = None,
474+
force: Optional[bool] = False,
475+
no_auto_visible: Optional[bool] = False,
476+
disable_auto_resize: Optional[bool] = False,
477+
read_only: Optional[bool] = False,
478+
gw_group: Optional[str] = None,
479+
traddr: Optional[str] = None,
480+
):
481+
return NVMeoFClient(gw_group=gw_group, traddr=traddr).stub.namespace_add(
482+
NVMeoFClient.pb2.namespace_add_req(
483+
subsystem_nqn=nqn,
484+
nsid=int(nsid) if nsid else None,
485+
rbd_image_name=rbd_image_name,
486+
rbd_pool_name=rbd_pool,
487+
block_size=block_size,
488+
create_image=create_image,
489+
size=rbd_image_size or size,
490+
trash_image=trash_image,
491+
anagrpid=load_balancing_group,
492+
force=force,
493+
no_auto_visible=no_auto_visible,
494+
disable_auto_resize=disable_auto_resize,
495+
read_only=read_only
496+
)
497+
)
498+
499+
@NvmeofCLICommand(
500+
"nvmeof namespace add", model.NamespaceCreation, alias="nvmeof ns add"
501+
)
502+
@convert_to_model(model.NamespaceCreation)
503+
@handle_nvmeof_error
504+
def create_cli(
466505
self,
467506
nqn: str,
468507
rbd_image_name: str,
@@ -591,9 +630,6 @@ def change_load_balancing_group(
591630

592631
@ReadPermission
593632
@Endpoint('PUT', '{nsid}/resize')
594-
@NvmeofCLICommand(
595-
"nvmeof namespace resize", model=model.RequestStatus, alias="nvmeof ns resize"
596-
)
597633
@EndpointDoc(
598634
"resize the specified NVMeoF namespace",
599635
parameters={
@@ -623,7 +659,8 @@ def resize(
623659
)
624660
)
625661

626-
@NvmeofCLICommand("nvmeof ns resize", model=model.RequestStatus)
662+
@NvmeofCLICommand("nvmeof namespace resize", model=model.RequestStatus,
663+
alias="nvmeof ns resize")
627664
@convert_to_model(model.RequestStatus)
628665
@handle_nvmeof_error
629666
def resize_cli(

0 commit comments

Comments
 (0)