From 6045c4690b75b8be8969c67d5a5d5caf6196abea Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Sat, 10 Apr 2021 14:52:07 +0530 Subject: [PATCH] mgr/nfs: reorg nfs files This patch does the following: - removed export dir and moved its files to nfs dir - renamed nfs.py to export.py Signed-off-by: Varsha Rao --- src/pybind/mgr/nfs/{export => }/cluster.py | 2 +- src/pybind/mgr/nfs/{export => }/exception.py | 0 src/pybind/mgr/nfs/{export/nfs.py => export.py} | 0 src/pybind/mgr/nfs/export/__init__.py | 0 src/pybind/mgr/nfs/{export => }/export_utils.py | 0 src/pybind/mgr/nfs/module.py | 4 ++-- src/pybind/mgr/nfs/{export => }/utils.py | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename src/pybind/mgr/nfs/{export => }/cluster.py (99%) rename src/pybind/mgr/nfs/{export => }/exception.py (100%) rename src/pybind/mgr/nfs/{export/nfs.py => export.py} (100%) delete mode 100644 src/pybind/mgr/nfs/export/__init__.py rename src/pybind/mgr/nfs/{export => }/export_utils.py (100%) rename src/pybind/mgr/nfs/{export => }/utils.py (100%) diff --git a/src/pybind/mgr/nfs/export/cluster.py b/src/pybind/mgr/nfs/cluster.py similarity index 99% rename from src/pybind/mgr/nfs/export/cluster.py rename to src/pybind/mgr/nfs/cluster.py index 19bf4dd8e6507..8694194e5ce9a 100644 --- a/src/pybind/mgr/nfs/export/cluster.py +++ b/src/pybind/mgr/nfs/cluster.py @@ -8,7 +8,7 @@ import orchestrator from .exception import NFSInvalidOperation, ClusterNotFound from .utils import POOL_NAME, available_clusters, restart_nfs_service -from .nfs import NFSRados, exception_handler +from .export import NFSRados, exception_handler log = logging.getLogger(__name__) diff --git a/src/pybind/mgr/nfs/export/exception.py b/src/pybind/mgr/nfs/exception.py similarity index 100% rename from src/pybind/mgr/nfs/export/exception.py rename to src/pybind/mgr/nfs/exception.py diff --git a/src/pybind/mgr/nfs/export/nfs.py b/src/pybind/mgr/nfs/export.py similarity index 100% rename from src/pybind/mgr/nfs/export/nfs.py rename to src/pybind/mgr/nfs/export.py diff --git a/src/pybind/mgr/nfs/export/__init__.py b/src/pybind/mgr/nfs/export/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/src/pybind/mgr/nfs/export/export_utils.py b/src/pybind/mgr/nfs/export_utils.py similarity index 100% rename from src/pybind/mgr/nfs/export/export_utils.py rename to src/pybind/mgr/nfs/export_utils.py diff --git a/src/pybind/mgr/nfs/module.py b/src/pybind/mgr/nfs/module.py index d40a33a8a1e9b..11b9723236e77 100644 --- a/src/pybind/mgr/nfs/module.py +++ b/src/pybind/mgr/nfs/module.py @@ -7,8 +7,8 @@ from mgr_module import MgrModule from volumes.module import mgr_cmd_wrap import orchestrator -from .export.nfs import ExportMgr -from .export.cluster import NFSCluster +from .export import ExportMgr +from .cluster import NFSCluster log = logging.getLogger(__name__) diff --git a/src/pybind/mgr/nfs/export/utils.py b/src/pybind/mgr/nfs/utils.py similarity index 100% rename from src/pybind/mgr/nfs/export/utils.py rename to src/pybind/mgr/nfs/utils.py -- 2.39.5