[goal] Migrate tox based testing to ubuntu focal

As per victoria cycle testing runtime and community goal[1]
we need to migrate upstream CI/CD to Ubuntu Focal(20.04).

Fixing:
- bug#1886298
Bump the lower constraints for required deps which added python3.8 support
in their later version.

Story: #2007865
Task: #40194
Depends-On: https://review.opendev.org/#/c/738328/

Closes-Bug: #1886298

Change-Id: Ib0f84e8c3815be48bca0ae8d4fe15a56b5256c20

lower-constraints.txt

@@ -7,7 +7,7 @@ bashate==0.5.1
 bcrypt==3.1.4
 cachetools==2.0.1
 certifi==2018.1.18
-cffi==1.11.5
+cffi==1.14.0
 chardet==3.0.4
 cliff==2.11.0
 cmd2==0.8.1
@@ -28,7 +28,7 @@ fasteners==0.14.1
 fixtures==3.0.0
 future==0.16.0
 futurist==1.6.0
-greenlet==0.4.10
+greenlet==0.4.15
 idna==2.6
 imagesize==1.0.0
 ipaddress==1.0.17
@@ -39,11 +39,11 @@ jsonpatch==1.21
 jsonpointer==2.0
 keystoneauth1==3.4.0
 keystonemiddleware==4.17.0
-kombu==4.1.0
+kombu==4.3.0
 linecache2==1.0.0
-lxml==3.4.1
+lxml==4.5.0
 Mako==1.0.7
-MarkupSafe==1.0
+MarkupSafe==1.1.1
 mccabe==0.2.1
 monotonic==1.4
 mox3==0.25.0
@@ -61,7 +61,7 @@ oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.19.2
-oslo.db==4.27.0
+oslo.db==5.1.1
 oslo.i18n==3.15.3
 oslo.log==3.36.0
 oslo.messaging==6.4.0
@@ -75,7 +75,7 @@ oslo.upgradecheck==0.1.0
 oslo.utils==3.40.2
 oslotest==3.2.0
 packaging==17.1
-paramiko==2.0.0
+paramiko==2.7.1
 Paste==2.0.2
 PasteDeploy==1.5.0
 pbr==2.0.0
@@ -89,7 +89,7 @@ pycadf==2.7.0
 pycparser==2.18
 Pygments==2.2.0
 pyinotify==0.9.6
-PyMySQL==0.7.6
+PyMySQL==0.8.0
 PyNaCl==1.2.1
 pyparsing==2.1.0
 pyperclip==1.6.0
@@ -103,7 +103,7 @@ python-neutronclient==6.7.0
 python-novaclient==9.1.0
 python-subunit==1.2.0
 pytz==2018.3
-PyYAML==3.12
+PyYAML==3.13
 repoze.lru==0.7
 requests==2.14.2
 requests-mock==1.2.0
@@ -121,7 +121,7 @@ statsd==3.2.2
 stestr==2.0.0
 stevedore==1.20.0
 Tempita==0.5.2
-tenacity==4.9.0
+tenacity==6.0.0
 testrepository==0.0.20
 testresources==2.0.0
 testscenarios==0.4

manila/api/v1/scheduler_stats.py

@@ -39,7 +39,7 @@ class SchedulerStatsController(wsgi.Controller):
 
     @wsgi.Controller.api_version('2.23')   # noqa
     @wsgi.Controller.authorize('index')
-    def pools_index(self, req):  # pylint: disable=function-redefined
+    def pools_index(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._pools(req, action='index', enable_share_type=True)
 
     @wsgi.Controller.api_version('1.0', '2.22')
@@ -50,7 +50,7 @@ class SchedulerStatsController(wsgi.Controller):
 
     @wsgi.Controller.api_version('2.23')   # noqa
     @wsgi.Controller.authorize('detail')
-    def pools_detail(self, req):  # pylint: disable=function-redefined
+    def pools_detail(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._pools(req, action='detail', enable_share_type=True)
 
     def _pools(self, req, action='index', enable_share_type=False):

manila/api/v1/share_types_extra_specs.py

@@ -153,7 +153,7 @@ class ShareTypeExtraSpecsController(wsgi.Controller):
 
     @wsgi.Controller.api_version('2.24')  # noqa
     @wsgi.Controller.authorize
-    def delete(self, req, type_id, id):  # pylint: disable=function-redefined
+    def delete(self, req, type_id, id):  # pylint: disable=function-redefined  # noqa F811
         """Deletes an existing extra spec."""
         context = req.environ['manila.context']
         self._check_type(context, type_id)

manila/api/v2/messages.py

@@ -95,7 +95,7 @@ class MessagesController(wsgi.Controller):
 
     @wsgi.Controller.api_version(MESSAGES_QUERY_BY_TIMESTAMP)   # noqa: F811
     @wsgi.Controller.authorize('get_all')
-    def index(self, req):                 # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         """Returns a list of messages, transformed through view builder."""
         context = req.environ['manila.context']
         filters = req.params.copy()

manila/api/v2/share_export_locations.py

@@ -77,7 +77,7 @@ class ShareExportLocationController(wsgi.Controller):
         return self._index(req, share_id)
 
     @wsgi.Controller.api_version('2.47')  # noqa: F811
-    def index(self, req, share_id):  # pylint: disable=function-redefined
+    def index(self, req, share_id):  # pylint: disable=function-redefined  # noqa F811
         """Return a list of export locations for share."""
         return self._index(req, share_id,
                            ignore_secondary_replicas=True)
@@ -88,7 +88,7 @@ class ShareExportLocationController(wsgi.Controller):
         return self._show(req, share_id, export_location_uuid)
 
     @wsgi.Controller.api_version('2.47')  # noqa: F811
-    def show(self, req, share_id,  # pylint: disable=function-redefined
+    def show(self, req, share_id,  # pylint: disable=function-redefined  # noqa F811
              export_location_uuid):
         """Return data about the requested export location."""
         return self._show(req, share_id, export_location_uuid,

manila/api/v2/share_group_snapshots.py

@@ -63,7 +63,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._show(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def show(self, req, id):  # pylint: disable=function-redefined
+    def show(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._show(req, id)
 
     @wsgi.Controller.authorize('delete')
@@ -85,7 +85,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._delete_group_snapshot(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def delete(self, req, id):  # pylint: disable=function-redefined
+    def delete(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._delete_group_snapshot(req, id)
 
     @wsgi.Controller.api_version('2.31', '2.54', experimental=True)
@@ -94,7 +94,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_share_group_snaps(req, is_detail=False)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         """Returns a summary list of share group snapshots."""
         return self._get_share_group_snaps(req, is_detail=False)
 
@@ -104,7 +104,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_share_group_snaps(req, is_detail=True)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def detail(self, req):  # pylint: disable=function-redefined
+    def detail(self, req):  # pylint: disable=function-redefined  # noqa F811
         """Returns a detailed list of share group snapshots."""
         return self._get_share_group_snaps(req, is_detail=True)
 
@@ -163,7 +163,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._update_group_snapshot(req, id, body)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def update(self, req, id, body):  # pylint: disable=function-redefined
+    def update(self, req, id, body):  # pylint: disable=function-redefined  # noqa F811
         return self._update_group_snapshot(req, id, body)
 
     @wsgi.Controller.authorize('create')
@@ -208,7 +208,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.response(202)
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(req, body)
 
     @wsgi.Controller.authorize('get')
@@ -229,7 +229,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._members(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def members(self, req, id):  # pylint: disable=function-redefined
+    def members(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._members(req, id)
 
     def _update(self, *args, **kwargs):
@@ -249,7 +249,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('reset_status')
-    def share_group_snapshot_reset_status(self, req, id, body):
+    def share_group_snapshot_reset_status(self, req, id, body):  # noqa F811
         return self._reset_status(req, id, body)
 
     # pylint: enable=function-redefined
@@ -261,7 +261,7 @@ class ShareGroupSnapshotController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('force_delete')
-    def share_group_snapshot_force_delete(self, req, id, body):
+    def share_group_snapshot_force_delete(self, req, id, body):  # noqa F811
         return self._force_delete(req, id, body)
 
 

manila/api/v2/share_group_type_specs.py

@@ -72,7 +72,7 @@ class ShareGroupTypeSpecsController(wsgi.Controller):
         return self._index(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def index(self, req, id):  # pylint: disable=function-redefined
+    def index(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._index(req, id)
 
     @wsgi.Controller.authorize('create')
@@ -93,7 +93,7 @@ class ShareGroupTypeSpecsController(wsgi.Controller):
         return self._create(req, id, body)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def create(self, req, id, body=None):  # pylint: disable=function-redefined
+    def create(self, req, id, body=None):  # pylint: disable=function-redefined   # noqa F811
         return self._create(req, id, body)
 
     @wsgi.Controller.authorize('update')
@@ -119,7 +119,7 @@ class ShareGroupTypeSpecsController(wsgi.Controller):
 
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def update(self, req, id, key, body=None):
+    def update(self, req, id, key, body=None):  # noqa F811
         return self._update(req, id, key, body)
 
     @wsgi.Controller.authorize('show')
@@ -139,7 +139,7 @@ class ShareGroupTypeSpecsController(wsgi.Controller):
         return self._show(req, id, key)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def show(self, req, id, key):  # pylint: disable=function-redefined
+    def show(self, req, id, key):  # pylint: disable=function-redefined   # noqa F811
         return self._show(req, id, key)
 
     @wsgi.Controller.authorize('delete')
@@ -158,7 +158,7 @@ class ShareGroupTypeSpecsController(wsgi.Controller):
         return self._delete(req, id, key)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def delete(self, req, id, key):  # pylint: disable=function-redefined
+    def delete(self, req, id, key):  # pylint: disable=function-redefined   # noqa F811
         return self._delete(req, id, key)
 
     def _check_key_names(self, keys):

manila/api/v2/share_group_types.py

@@ -54,7 +54,7 @@ class ShareGroupTypesController(wsgi.Controller):
         return self._index(req)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._index(req)
 
     @wsgi.Controller.authorize('show')
@@ -75,7 +75,7 @@ class ShareGroupTypesController(wsgi.Controller):
         return self._show(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def show(self, req, id):  # pylint: disable=function-redefined
+    def show(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._show(req, id)
 
     @wsgi.Controller.authorize('default')
@@ -95,7 +95,7 @@ class ShareGroupTypesController(wsgi.Controller):
         return self._default(req)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def default(self, req):  # pylint: disable=function-redefined
+    def default(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._default(req)
 
     def _get_share_group_types(self, req):
@@ -181,7 +181,7 @@ class ShareGroupTypesController(wsgi.Controller):
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action("create")
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(req, body)
 
     @wsgi.Controller.authorize('delete')
@@ -205,7 +205,7 @@ class ShareGroupTypesController(wsgi.Controller):
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action("delete")
-    def delete(self, req, id):  # pylint: disable=function-redefined
+    def delete(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._delete(req, id)
 
     @wsgi.Controller.authorize('list_project_access')
@@ -236,7 +236,7 @@ class ShareGroupTypesController(wsgi.Controller):
 
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def share_group_type_access(self, req, id):
+    def share_group_type_access(self, req, id):  # noqa F811
         return self._share_group_type_access(req, id)
 
     @wsgi.Controller.authorize('add_project_access')
@@ -261,7 +261,7 @@ class ShareGroupTypesController(wsgi.Controller):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('addProjectAccess')
-    def add_project_access(self, req, id, body):
+    def add_project_access(self, req, id, body):  # noqa F811
         return self._add_project_access(req, id, body)
 
     @wsgi.Controller.authorize('remove_project_access')
@@ -286,7 +286,7 @@ class ShareGroupTypesController(wsgi.Controller):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('removeProjectAccess')
-    def remove_project_access(self, req, id, body):
+    def remove_project_access(self, req, id, body):  # noqa F811
         return self._remove_project_access(req, id, body)
 
     def _assert_non_public_share_group_type(self, context, type_id):

manila/api/v2/share_groups.py

@@ -65,7 +65,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._show(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def show(self, req, id):  # pylint: disable=function-redefined
+    def show(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._show(req, id)
 
     @wsgi.Controller.authorize('delete')
@@ -86,7 +86,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._delete_share_group(req, id)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def delete(self, req, id):  # pylint: disable=function-redefined
+    def delete(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._delete_share_group(req, id)
 
     @wsgi.Controller.api_version('2.31', '2.54', experimental=True)
@@ -94,7 +94,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_share_groups(req, is_detail=False)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._get_share_groups(req, is_detail=False)
 
     @wsgi.Controller.api_version('2.31', '2.54', experimental=True)
@@ -102,7 +102,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_share_groups(req, is_detail=True)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def detail(self, req):  # pylint: disable=function-redefined
+    def detail(self, req):  # pylint: disable=function-redefined  # noqa F811
         return self._get_share_groups(req, is_detail=True)
 
     @wsgi.Controller.authorize('get_all')
@@ -164,7 +164,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._update_share_group(req, id, body)
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
-    def update(self, req, id, body):  # pylint: disable=function-redefined
+    def update(self, req, id, body):  # pylint: disable=function-redefined  # noqa F811
         return self._update_share_group(req, id, body)
 
     @wsgi.Controller.authorize('create')
@@ -292,7 +292,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
 
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.response(202)
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(req, body)
 
     def _update(self, *args, **kwargs):
@@ -320,7 +320,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('reset_status')
-    def share_group_reset_status(self, req, id, body):
+    def share_group_reset_status(self, req, id, body):  # noqa F811
         return self._reset_status(req, id, body)
 
     # pylint: enable=function-redefined
@@ -332,7 +332,7 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(SG_GRADUATION_VERSION)  # noqa
     @wsgi.action('force_delete')
-    def share_group_force_delete(self, req, id, body):
+    def share_group_force_delete(self, req, id, body):  # noqa F811
         return self._force_delete(req, id, body)
 
 

manila/api/v2/share_instances.py

@@ -74,7 +74,7 @@ class ShareInstancesController(wsgi.Controller, wsgi.AdminActionsMixin):
 
     @wsgi.Controller.api_version("2.35")  # noqa
     @wsgi.Controller.authorize
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         context = req.environ['manila.context']
         filters = {}
         filters.update(req.GET)

manila/api/v2/share_replica_export_locations.py

@@ -47,7 +47,7 @@ class ShareReplicaExportLocationController(wsgi.Controller):
 
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def index(self, req, share_replica_id):
+    def index(self, req, share_replica_id):  # noqa F811
         return self._index(req, share_replica_id)
 
     # pylint: enable=function-redefined
@@ -71,7 +71,7 @@ class ShareReplicaExportLocationController(wsgi.Controller):
 
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def show(self, req, share_replica_id, export_location_uuid):
+    def show(self, req, share_replica_id, export_location_uuid):  # noqa F811
         return self._show(req, share_replica_id, export_location_uuid)
 
     # pylint: enable=function-redefined

manila/api/v2/share_replicas.py

@@ -64,7 +64,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_replicas(req)
 
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined  # noqa F811
         """Return a summary list of replicas."""
         return self._get_replicas(req)
 
@@ -75,7 +75,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._get_replicas(req, is_detail=True)
 
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def detail(self, req):  # pylint: disable=function-redefined
+    def detail(self, req):  # pylint: disable=function-redefined  # noqa F811
         """Returns a detailed list of replicas."""
         return self._get_replicas(req, is_detail=True)
 
@@ -110,7 +110,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._show(req, id)
 
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def show(self, req, id):  # pylint: disable=function-redefined
+    def show(self, req, id):  # pylint: disable=function-redefined   # noqa F811
         """Return data about the given replica."""
         return self._show(req, id)
 
@@ -135,7 +135,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
 
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.response(202)
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(req, body)
 
     @wsgi.Controller.authorize('create')
@@ -181,7 +181,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
         return self._delete_share_replica(req, id)
 
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
-    def delete(self, req, id):  # pylint: disable=function-redefined
+    def delete(self, req, id):  # pylint: disable=function-redefined  # noqa F811
         return self._delete_share_replica(req, id)
 
     @wsgi.Controller.authorize('delete')
@@ -212,7 +212,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.response(202)
     @wsgi.action('promote')
-    def promote(self, req, id, body):  # pylint: disable=function-redefined
+    def promote(self, req, id, body):  # pylint: disable=function-redefined  # noqa F811
         return self._promote(req, id, body)
 
     @wsgi.Controller.authorize('promote')
@@ -250,7 +250,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.action('reset_status')
-    def reset_status(self, req, id, body):
+    def reset_status(self, req, id, body):  # noqa F811
         """Reset the 'status' attribute in the database."""
         return self._reset_status(req, id, body)
 
@@ -265,7 +265,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
     # pylint: disable=function-redefined
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.action('force_delete')
-    def force_delete(self, req, id, body):
+    def force_delete(self, req, id, body):  # noqa F811
         """Force deletion on the database, attempt on the backend."""
         return self._force_delete(req, id, body)
 
@@ -282,7 +282,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.action('reset_replica_state')
     @wsgi.Controller.authorize
-    def reset_replica_state(self, req, id, body):
+    def reset_replica_state(self, req, id, body):  # noqa F811
         """Reset the 'replica_state' attribute in the database."""
         return self._reset_status(req, id, body, status_attr='replica_state')
 
@@ -297,7 +297,7 @@ class ShareReplicationController(wsgi.Controller, wsgi.AdminActionsMixin):
     @wsgi.Controller.api_version(GRADUATION_VERSION)  # noqa
     @wsgi.response(202)
     @wsgi.action('resync')
-    def resync(self, req, id, body):  # pylint: disable=function-redefined
+    def resync(self, req, id, body):  # pylint: disable=function-redefined  # noqa F811
         return self._resync(req, id, body)
 
     @wsgi.Controller.authorize('resync')

manila/api/v2/share_servers.py

@@ -88,7 +88,7 @@ class ShareServerController(share_servers.ShareServerController,
 
     @wsgi.Controller.api_version('2.49')  # noqa
     @wsgi.response(202)
-    def manage(self, req, body):  # pylint: disable=function-redefined
+    def manage(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         body.get('share_server', {}).pop('share_network_subnet_id', None)
         return self._manage(req, body)
 

manila/api/v2/share_snapshots.py

@@ -272,8 +272,8 @@ class ShareSnapshotsController(share_snapshots.ShareSnapshotMixin,
 
     @wsgi.Controller.api_version('2.49')  # noqa
     @wsgi.action('unmanage')
-    def unmanage(self, req, id,
+    def unmanage(self, req, id,   # pylint: disable=function-redefined  # noqa F811
-                 body=None):  # pylint: disable=function-redefined
+                 body=None):
         return self._unmanage(req, id, body, allow_dhss_true=True)
 
     @wsgi.Controller.api_version('2.32')

manila/api/v2/share_types.py

@@ -175,7 +175,7 @@ class ShareTypesController(wsgi.Controller):
 
     @wsgi.Controller.api_version("2.24")  # noqa
     @wsgi.action("create")
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(req, body, set_defaults=False)
 
     @wsgi.Controller.authorize('create')

manila/api/v2/shares.py

@@ -184,18 +184,18 @@ class ShareController(shares.ShareMixin,
                             check_availability_zones_extra_spec=True)
 
     @wsgi.Controller.api_version("2.31", "2.47")  # noqa
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         return self._create(
             req, body, check_create_share_from_snapshot_support=True)
 
     @wsgi.Controller.api_version("2.24", "2.30")  # noqa
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         body.get('share', {}).pop('share_group_id', None)
         return self._create(req, body,
                             check_create_share_from_snapshot_support=True)
 
     @wsgi.Controller.api_version("2.0", "2.23")  # noqa
-    def create(self, req, body):  # pylint: disable=function-redefined
+    def create(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         body.get('share', {}).pop('share_group_id', None)
         return self._create(req, body)
 
@@ -410,12 +410,12 @@ class ShareController(shares.ShareMixin,
         return detail
 
     @wsgi.Controller.api_version("2.8", "2.48")  # noqa
-    def manage(self, req, body):  # pylint: disable=function-redefined
+    def manage(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         detail = self._manage(req, body, allow_dhss_true=False)
         return detail
 
     @wsgi.Controller.api_version("2.49")  # noqa
-    def manage(self, req, body):  # pylint: disable=function-redefined
+    def manage(self, req, body):  # pylint: disable=function-redefined  # noqa F811
         detail = self._manage(req, body, allow_dhss_true=True)
         return detail
 
@@ -426,8 +426,8 @@ class ShareController(shares.ShareMixin,
 
     @wsgi.Controller.api_version('2.49')  # noqa
     @wsgi.action('unmanage')
-    def unmanage(self, req, id,
+    def unmanage(self, req, id,  # pylint: disable=function-redefined # noqa F811
-                 body=None):  # pylint: disable=function-redefined
+                 body=None):
         return self._unmanage(req, id, body, allow_dhss_true=True)
 
     @wsgi.Controller.api_version('2.27')

manila/api/versions.py

@@ -86,7 +86,7 @@ class VersionsController(wsgi.Controller):
         return builder.build_versions(known_versions)
 
     @wsgi.Controller.api_version('2.0')  # noqa
-    def index(self, req):  # pylint: disable=function-redefined
+    def index(self, req):  # pylint: disable=function-redefined   # noqa F811
         """Return versions supported after the start of microversions."""
         builder = views_versions.get_view_builder(req)
         known_versions = copy.deepcopy(_KNOWN_VERSIONS)

manila/tests/api/test_versions.py

@@ -270,7 +270,7 @@ class ExperimentalAPITestCase(test.TestCase):
             return {'fake_key': 'fake_value'}
 
         @wsgi.Controller.api_version('2.1', '2.1', experimental=True)  # noqa
-        def index(self, req):  # pylint: disable=function-redefined
+        def index(self, req):  # pylint: disable=function-redefined  # noqa F811
             return {'fake_key': 'fake_value'}
 
     def setUp(self):

requirements.txt

@@ -7,12 +7,12 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 alembic>=0.8.10 # MIT
 eventlet>=0.22.0,!=0.23.0,!=0.25.0 # MIT
-greenlet>=0.4.10 # MIT
+greenlet>=0.4.15 # MIT
-lxml!=3.7.0,>=3.4.1 # BSD
+lxml>=4.5.0 # BSD
 netaddr>=0.7.18 # BSD
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
-oslo.db>=4.27.0 # Apache-2.0
+oslo.db>=5.1.1 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.messaging>=6.4.0 # Apache-2.0
@@ -25,7 +25,7 @@ oslo.service>=2.1.1 # Apache-2.0
 oslo.upgradecheck>=0.1.0 # Apache-2.0
 oslo.utils>=3.40.2 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
-paramiko>=2.0.0 # LGPLv2.1+
+paramiko>=2.7.1 # LGPLv2.1+
 Paste>=2.0.2 # MIT
 PasteDeploy>=1.5.0 # MIT
 pyparsing>=2.1.0 # MIT

test-requirements.txt

@@ -15,7 +15,7 @@ oslotest>=3.2.0 # Apache-2.0
 # Do not remove 'PyMySQL' and 'psycopg2-binary' dependencies. They are used
 # by oslo_db lib for running MySQL and PostgreSQL DB migration tests.
 # See https://docs.openstack.org/oslo.db/latest/contributor/index.html#how-to-run-unit-tests
-PyMySQL>=0.7.6 # MIT License
+PyMySQL>=0.8.0 # MIT License
 psycopg2-binary>=2.8.5 # LGPL/ZPL
 
 requests-mock>=1.2.0 # Apache-2.0

tools/check_exec.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain