From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Jun 2021 18:41:15 +0000 (-0400)
Subject: mgr/nfs/export: wrap long lines
X-Git-Tag: v17.1.0~1551^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cb98a04974da044af81b9ab6c998c6f746c6473;p=ceph.git

mgr/nfs/export: wrap long lines

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/nfs/export.py b/src/pybind/mgr/nfs/export.py
index 04bd83c4541..93cd29d16a7 100644
--- a/src/pybind/mgr/nfs/export.py
+++ b/src/pybind/mgr/nfs/export.py
@@ -20,7 +20,11 @@ log = logging.getLogger(__name__)
 
 
 def export_cluster_checker(func: FuncT) -> FuncT:
-    def cluster_check(fs_export: 'ExportMgr', *args: Any, **kwargs: Any) -> Tuple[int, str, str]:
+    def cluster_check(
+            fs_export: 'ExportMgr',
+            *args: Any,
+            **kwargs: Any
+    ) -> Tuple[int, str, str]:
         """
         This method checks if cluster exists and sets rados namespace.
         """
@@ -30,7 +34,10 @@ def export_cluster_checker(func: FuncT) -> FuncT:
     return cast(FuncT, cluster_check)
 
 
-def exception_handler(exception_obj: Exception, log_msg: str = "") -> Tuple[int, str, str]:
+def exception_handler(
+        exception_obj: Exception,
+        log_msg: str = ""
+) -> Tuple[int, str, str]:
     if log_msg:
         log.exception(log_msg)
     return getattr(exception_obj, 'errno', -1), "", str(exception_obj)
@@ -100,7 +107,11 @@ class NFSRados:
 
 
 class ExportMgr:
-    def __init__(self, mgr: 'Module', export_ls: Optional[Dict[str, List[Export]]] = None) -> None:
+    def __init__(
+            self,
+            mgr: 'Module',
+            export_ls: Optional[Dict[str, List[Export]]] = None
+    ) -> None:
         self.mgr = mgr
         self.rados_pool = POOL_NAME
         self._exports: Optional[Dict[str, List[Export]]] = export_ls
@@ -124,7 +135,11 @@ class ExportMgr:
                 log.info(f"Exports parsed successfully {self.exports.items()}")
         return self._exports
 
-    def _fetch_export(self, cluster_id: str, pseudo_path: Optional[str]) -> Optional[Export]:
+    def _fetch_export(
+            self,
+            cluster_id: str,
+            pseudo_path: Optional[str]
+    ) -> Optional[Export]:
         try:
             for ex in self.exports[cluster_id]:
                 if ex.pseudo == pseudo_path:
@@ -173,7 +188,12 @@ class ExportMgr:
             f'conf-nfs.{export.cluster_id}'
         )
 
-    def _delete_export(self, cluster_id: str, pseudo_path: Optional[str], export_obj: Optional[Export] = None) -> Tuple[int, str, str]:
+    def _delete_export(
+            self,
+            cluster_id: str,
+            pseudo_path: Optional[str],
+            export_obj: Optional[Export] = None
+    ) -> Tuple[int, str, str]:
         try:
             if export_obj:
                 export: Optional[Export] = export_obj
@@ -199,8 +219,12 @@ class ExportMgr:
         try:
             with self.mgr.rados.open_ioctx(self.rados_pool) as ioctx:
                 ioctx.set_namespace(cluster_id)
-                export = Export.from_export_block(GaneshaConfParser(ioctx.read(f"export-{ex_id}"
-                                                                               ).decode("utf-8")).parse()[0], cluster_id)
+                export = Export.from_export_block(
+                    GaneshaConfParser(
+                        ioctx.read(f"export-{ex_id}").decode("utf-8")
+                    ).parse()[0],
+                    cluster_id
+                )
                 return export
         except ObjectNotFound:
             log.exception(f"Export ID: {ex_id} not found")
@@ -265,7 +289,11 @@ class ExportMgr:
             return exception_handler(e, f"Failed to list exports for {cluster_id}")
 
     @export_cluster_checker
-    def get_export(self, cluster_id: str, pseudo_path: Optional[str]) -> Tuple[int, str, str]:
+    def get_export(
+            self,
+            cluster_id: str,
+            pseudo_path: Optional[str]
+    ) -> Tuple[int, str, str]:
         try:
             export = self._fetch_export(cluster_id, pseudo_path)
             if export:
@@ -303,7 +331,14 @@ class FSExport(ExportMgr):
         super().__init__(export_mgr_obj.mgr,
                          export_mgr_obj._exports)
 
-    def _update_user_id(self, cluster_id: str, path: str, access_type: str, fs_name: str, user_id: str) -> None:
+    def _update_user_id(
+            self,
+            cluster_id: str,
+            path: str,
+            access_type: str,
+            fs_name: str,
+            user_id: str
+    ) -> None:
         osd_cap = 'allow rw pool={} namespace={}, allow rw tag cephfs data={}'.format(
             self.rados_pool, cluster_id, fs_name)
         access_type = 'r' if access_type == 'RO' else 'rw'
@@ -317,7 +352,14 @@ class FSExport(ExportMgr):
 
         log.info(f"Export user updated {user_id}")
 
-    def _create_user_key(self, cluster_id: str, entity: str, path: str, fs_name: str, fs_ro: bool) -> Tuple[str, str]:
+    def _create_user_key(
+            self,
+            cluster_id: str,
+            entity: str,
+            path: str,
+            fs_name: str,
+            fs_ro: bool
+    ) -> Tuple[str, str]:
         osd_cap = 'allow rw pool={} namespace={}, allow rw tag cephfs data={}'.format(
             self.rados_pool, cluster_id, fs_name)
         access_type = 'r' if fs_ro else 'rw'
@@ -353,7 +395,9 @@ class FSExport(ExportMgr):
         if not self._fetch_export(cluster_id, pseudo_path):
             ex_id = self._gen_export_id(cluster_id)
             user_id = f"nfs.{cluster_id}.{ex_id}"
-            user_out, key = self._create_user_key(cluster_id, user_id, path, fs_name, read_only)
+            user_out, key = self._create_user_key(
+                cluster_id, user_id, path, fs_name, read_only
+            )
             if clients:
                 access_type = "none"
             elif read_only:
@@ -431,8 +475,12 @@ class FSExport(ExportMgr):
             return (0, json.dumps(result, indent=4), '')
         return 0, "", "Export already exists"
 
-    def update_export_1(self, cluster_id: str, new_export: Dict, can_create: bool) -> Tuple[int, str, str]:
-
+    def update_export_1(
+            self,
+            cluster_id: str,
+            new_export: Dict,
+            can_create: bool
+    ) -> Tuple[int, str, str]:
         for k in ['cluster_id', 'path', 'pseudo']:
             if k not in new_export:
                 raise NFSInvalidOperation(f'Export missing required field {k}')