From 9bcd7b673d7206a35abc9bf612ec3ff05f491ba7 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Fri, 15 May 2020 23:26:13 +0530 Subject: [PATCH] mgr/volumes/nfs: Remove type option from export create interface Signed-off-by: Varsha Rao --- doc/cephfs/fs-nfs-exports.rst | 5 ++--- src/pybind/mgr/volumes/fs/nfs.py | 5 +---- src/pybind/mgr/volumes/module.py | 12 +++++------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/doc/cephfs/fs-nfs-exports.rst b/doc/cephfs/fs-nfs-exports.rst index 2c8f5e203f0..5776d77f166 100644 --- a/doc/cephfs/fs-nfs-exports.rst +++ b/doc/cephfs/fs-nfs-exports.rst @@ -50,11 +50,10 @@ Create CephFS Export .. code:: bash - $ ceph nfs export create [--readonly] [--path=/path/in/cephfs] + $ ceph nfs export create cephfs [--readonly] [--path=/path/in/cephfs] It creates export rados objects containing the export block. Here binding is -the pseudo root name and type is export type. Currently only CephFS is -supported. +the pseudo root name and type is export type. Delete CephFS Export ==================== diff --git a/src/pybind/mgr/volumes/fs/nfs.py b/src/pybind/mgr/volumes/fs/nfs.py index b3f68ed60ca..0df2751895a 100644 --- a/src/pybind/mgr/volumes/fs/nfs.py +++ b/src/pybind/mgr/volumes/fs/nfs.py @@ -294,10 +294,7 @@ class FSExport(object): self._write_raw_config(conf_block, "export-{}".format(export.export_id)) self._update_common_conf(export.cluster_id, export.export_id) - def create_export(self, export_type, fs_name, cluster_id, pseudo_path, read_only, path): - if export_type != 'cephfs': - return -errno.EINVAL,"", f"Invalid export type: {export_type}" - + def create_export(self, fs_name, cluster_id, pseudo_path, read_only, path): if not self.check_fs(fs_name): return -errno.EINVAL,"", "Invalid CephFS name" diff --git a/src/pybind/mgr/volumes/module.py b/src/pybind/mgr/volumes/module.py index 08f7b2613ce..3ce6f81f8a9 100644 --- a/src/pybind/mgr/volumes/module.py +++ b/src/pybind/mgr/volumes/module.py @@ -223,8 +223,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): 'perm': 'r' }, { - 'cmd': 'nfs export create ' - 'name=type,type=CephString ' + 'cmd': 'nfs export create cephfs ' 'name=fsname,type=CephString ' 'name=attach,type=CephString ' 'name=binding,type=CephString ' @@ -432,14 +431,13 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): return self.vc.clone_cancel( vol_name=cmd['vol_name'], clone_name=cmd['clone_name'], group_name=cmd.get('group_name', None)) - def _cmd_nfs_export_create(self, inbuf, cmd): + def _cmd_nfs_export_create_cephfs(self, inbuf, cmd): #TODO Extend export creation for rgw. - return self.fs_export.create_export(export_type=cmd['type'], fs_name=cmd['fsname'], - cluster_id=cmd.get('attach'), pseudo_path=cmd.get('binding'), - read_only=cmd.get('readonly', False), path=cmd.get('path', '/')) + return self.fs_export.create_export(fs_name=cmd['fsname'], cluster_id=cmd['attach'], + pseudo_path=cmd['binding'], read_only=cmd.get('readonly', False), path=cmd.get('path', '/')) def _cmd_nfs_export_delete(self, inbuf, cmd): - return self.fs_export.delete_export(cluster_id=cmd.get('attach'), pseudo_path=cmd.get('binding')) + return self.fs_export.delete_export(cluster_id=cmd['attach'], pseudo_path=cmd['binding']) def _cmd_nfs_cluster_create(self, inbuf, cmd): return self.nfs.create_nfs_cluster(cluster_id=cmd['clusterid'], export_type=cmd['type'], -- 2.39.5