mgr/rbd_support: clean up and enable flake8

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/src/pybind/mgr/rbd_support/__init__.py b/src/pybind/mgr/rbd_support/__init__.py
index 8f210ac9247ea49624b20582ca8206e56055fbcd..ee85dc9d376e61235d719cf25585769bd07299a6 100644 (file)
--- a/src/pybind/mgr/rbd_support/__init__.py
+++ b/src/pybind/mgr/rbd_support/__init__.py
@@ -1 +1,2 @@
+# flake8: noqa
 from .module import Module

diff --git a/src/pybind/mgr/rbd_support/common.py b/src/pybind/mgr/rbd_support/common.py
index 9c9c9248fb571118528e7eb7e41008ee45041122..a6c041bf72948c41aa1277127b854a442e709f30 100644 (file)
--- a/src/pybind/mgr/rbd_support/common.py
+++ b/src/pybind/mgr/rbd_support/common.py
@@ -1,10 +1,11 @@
 import re
 
-from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING, Union
+from typing import Dict, Optional, Tuple, TYPE_CHECKING, Union
 
 
 GLOBAL_POOL_KEY = (None, None)
 
+
 class NotAuthorizedError(Exception):
     pass
 
@@ -45,4 +46,3 @@ def get_rbd_pools(module: 'Module') -> Dict[int, str]:
     osd_map = module.get('osd_map')
     return {pool['pool']: pool['pool_name'] for pool in osd_map['pools']
             if 'rbd' in pool.get('application_metadata', {})}
-

diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
index c8cf4e4ee7ea303745bfcf9f3cd9f6f00b27e008..47efa57e82c8c3618e010a0a83f2834924fa2268 100644 (file)
--- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
+++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py
@@ -2,15 +2,15 @@ import errno
 import json
 import rados
 import rbd
-import re
 import traceback
 
 from datetime import datetime
 from threading import Condition, Lock, Thread
-from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, Union
+from typing import Any, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 
 from .common import get_rbd_pools
-from .schedule import LevelSpec, Interval, StartTime, Schedule, Schedules
+from .schedule import LevelSpec, Schedules
+
 
 def namespace_validator(ioctx: rados.Ioctx) -> None:
     mode = rbd.RBD().mirror_mode_get(ioctx)
@@ -18,6 +18,7 @@ def namespace_validator(ioctx: rados.Ioctx) -> None:
         raise ValueError("namespace {} is not in mirror image mode".format(
             ioctx.get_namespace()))
 
+
 def image_validator(image: rbd.Image) -> None:
     mode = image.mirror_image_get_mode()
     if mode != rbd.RBD_MIRROR_IMAGE_MODE_SNAPSHOT:
@@ -224,7 +225,6 @@ class CreateSnapshotRequests:
                     pool_id, namespace, image_id, e))
             self.close_image(image_spec, image)
 
-
     def handle_create_snapshot(self,
                                image_spec: ImageSpec,
                                image: rbd.Image,
@@ -601,8 +601,8 @@ class MirrorSnapshotScheduleHandler:
                         continue
                     image_name = self.images[pool_id][namespace][image_id]
                     scheduled_images.append({
-                        'schedule_time' : schedule_time,
-                        'image' : image_name
+                        'schedule_time': schedule_time,
+                        'image': image_name
                     })
-        return 0, json.dumps({'scheduled_images' : scheduled_images},
+        return 0, json.dumps({'scheduled_images': scheduled_images},
                              indent=4, sort_keys=True), ""

diff --git a/src/pybind/mgr/rbd_support/module.py b/src/pybind/mgr/rbd_support/module.py
index 7a3f4d6260922f5ae5712c179d3ee6f58fecd192..86bb385883052ab75768f0ccb905ea8fa8383792 100644 (file)
--- a/src/pybind/mgr/rbd_support/module.py
+++ b/src/pybind/mgr/rbd_support/module.py
@@ -8,7 +8,6 @@ import functools
 import inspect
 import rados
 import rbd
-import traceback
 from typing import cast, Any, Callable, Optional, Tuple, TypeVar
 
 from mgr_module import CLIReadCommand, CLIWriteCommand, MgrModule, Option

diff --git a/src/pybind/mgr/rbd_support/schedule.py b/src/pybind/mgr/rbd_support/schedule.py
index b8507a1b8fe5b8876ed05d44171ac17a7dc7cf29..a91309c98c91e66c61542d879a78841e7bf4eeae 100644 (file)
--- a/src/pybind/mgr/rbd_support/schedule.py
+++ b/src/pybind/mgr/rbd_support/schedule.py
@@ -424,7 +424,6 @@ class Schedules:
                        ioctx: rados.Ioctx,
                        namespace_validator: Optional[Callable],
                        image_validator: Optional[Callable]) -> None:
-        pool_id = ioctx.get_pool_id()
         pool_name = ioctx.get_pool_name()
         stale_keys = []
         start_after = ''
@@ -569,7 +568,7 @@ class Schedules:
             ls = self.level_specs[level_spec_id]
             if ls == parent or ls == level_spec or ls.is_child_of(level_spec):
                 result[level_spec_id] = {
-                    'name' : schedule.name,
-                    'schedule' : schedule.to_list(),
+                    'name': schedule.name,
+                    'schedule': schedule.to_list(),
                 }
         return result

diff --git a/src/pybind/mgr/rbd_support/task.py b/src/pybind/mgr/rbd_support/task.py
index d283962a365e3f07f1c84fa9da352360d0caf97b..3c89acbb8cbc1843f5ddfccd7bd2c35a3474657f 100644 (file)
--- a/src/pybind/mgr/rbd_support/task.py
+++ b/src/pybind/mgr/rbd_support/task.py
@@ -149,6 +149,7 @@ ImageSpecT = Tuple[str, str, str]
 PoolSpecT = Tuple[str, str]
 MigrationStatusT = Dict[str, str]
 
+
 class TaskHandler:
     lock = Lock()
     condition = Condition(lock)

diff --git a/src/pybind/mgr/rbd_support/trash_purge_schedule.py b/src/pybind/mgr/rbd_support/trash_purge_schedule.py
index 5f817bd8038870227b2b75372e8cdde13c6f2767..e12fec457320624c9ceeacf235096859c760c6a2 100644 (file)
--- a/src/pybind/mgr/rbd_support/trash_purge_schedule.py
+++ b/src/pybind/mgr/rbd_support/trash_purge_schedule.py
@@ -1,8 +1,6 @@
-import errno
 import json
 import rados
 import rbd
-import re
 import traceback
 
 from datetime import datetime
@@ -10,7 +8,7 @@ from threading import Condition, Lock, Thread
 from typing import Any, Dict, List, Optional, Tuple
 
 from .common import get_rbd_pools
-from .schedule import LevelSpec, Interval, StartTime, Schedule, Schedules
+from .schedule import LevelSpec, Schedules
 
 
 class TrashPurgeScheduleHandler:
@@ -262,10 +260,10 @@ class TrashPurgeScheduleHandler:
                         continue
                     pool_name = self.pools[pool_id][namespace]
                     scheduled.append({
-                        'schedule_time' : schedule_time,
-                        'pool_id' : pool_id,
-                        'pool_name' : pool_name,
-                        'namespace' : namespace
+                        'schedule_time': schedule_time,
+                        'pool_id': pool_id,
+                        'pool_name': pool_name,
+                        'namespace': namespace
                     })
-        return 0, json.dumps({'scheduled' : scheduled}, indent=4,
+        return 0, json.dumps({'scheduled': scheduled}, indent=4,
                              sort_keys=True), ""

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index bf18491575698b95733bf5cd615aa7550530a375..d078d8c097d89dad66f3398c9c0582ab0081a8db 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -179,6 +179,7 @@ modules =
     nfs
     orchestrator
     prometheus
+    rbd_support
     selftest
 commands =
     flake8 --config=tox.ini {posargs} \