RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/nfs: convert _cmd_nfs_cluster_create to use EmptyResponder decorator

Browse Source 
Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2022-05-05 15:38:44 -04:00
parent ee34bd9361
commit 3c9102bcba
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pybind/mgr/nfs/cluster.py
View File

@ -11,8 +11,12 @@ from object_format import ErrorResponse
import orchestrator
from .exception import NFSInvalidOperation, ClusterNotFound
from .utils import (available_clusters, restart_nfs_service, conf_obj_name,
user_conf_obj_name)
from .utils import (
NonFatalError,
available_clusters,
conf_obj_name,
restart_nfs_service,
user_conf_obj_name)
from .export import NFSRados, exception_handler
if TYPE_CHECKING:
@ -105,8 +109,7 @@ class NFSCluster:
virtual_ip: Optional[str],
ingress: Optional[bool] = None,
port: Optional[int] = None,
) -> Tuple[int, str, str]:
) -> None:
try:
if virtual_ip:
# validate virtual_ip value: ip_address throws a ValueError
@ -128,10 +131,11 @@ class NFSCluster:
if cluster_id not in available_clusters(self.mgr):
self._call_orch_apply_nfs(cluster_id, placement, virtual_ip, port)
return 0, "", ""
return 0, "", f"{cluster_id} cluster already exists"
return
raise NonFatalError(f"{cluster_id} cluster already exists")
except Exception as e:
return exception_handler(e, f"NFS Cluster {cluster_id} could not be created")
log.exception(f"NFS Cluster {cluster_id} could not be created")
raise ErrorResponse.wrap(e)
def delete_nfs_cluster(self, cluster_id: str) -> Tuple[int, str, str]:
try:

3
src/pybind/mgr/nfs/module.py
View File

@ -114,12 +114,13 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
return self.export_mgr.apply_export(cluster_id, export_config=inbuf)
@CLICommand('nfs cluster create', perm='rw')
@object_format.EmptyResponder()
def _cmd_nfs_cluster_create(self,
cluster_id: str,
placement: Optional[str] = None,
ingress: Optional[bool] = None,
virtual_ip: Optional[str] = None,
port: Optional[int] = None) -> Tuple[int, str, str]:
port: Optional[int] = None) -> None:
"""Create an NFS Cluster"""
return self.nfs.create_nfs_cluster(cluster_id=cluster_id, placement=placement,
virtual_ip=virtual_ip, ingress=ingress,