openstack/manila
Code Issues Proposed changes

Merge "[pylint] Fix Manage-Unmanage with DHSS=True pylint issues"

Browse Source
This commit is contained in:
Zuul 2019-03-06 03:06:33 +00:00 committed by Gerrit Code Review
commit 9bcbeeed1f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/api/v2/share_snapshots.py
View File

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

5
manila/api/v2/shares.py
View File

@ -425,8 +425,9 @@ class ShareController(shares.ShareMixin,
return self._unmanage(req, id, body, allow_dhss_true=False)
@wsgi.Controller.api_version('2.49') # noqa
@wsgi.action('unmanage') # pylint: disable=function-redefined
def unmanage(self, req, id, body=None):
@wsgi.action('unmanage')
def unmanage(self, req, id,
body=None): # pylint: disable=function-redefined
return self._unmanage(req, id, body, allow_dhss_true=True)
@wsgi.Controller.api_version('2.27')

1
manila/db/migrations/alembic/versions/6a3fd2984bc31_add_is_auto_deletable_and_identifier_fields_for_share_servers.py
View File

@ -51,6 +51,7 @@ def upgrade():
connection = op.get_bind()
share_servers_table = utils.load_table('share_servers', connection)
for server in connection.execute(share_servers_table.select()):
# pylint: disable=no-value-for-parameter
connection.execute(
share_servers_table.update().where(
share_servers_table.c.id == server.id,