From 5f15de40f9f98ba264526434ff3881af524f87af Mon Sep 17 00:00:00 2001 From: Rodrigo Barbieri Date: Tue, 5 Mar 2019 21:09:51 -0300 Subject: [PATCH] [pylint] Fix Manage-Unmanage with DHSS=True pylint issues There were some pylint issues in change https://review.openstack.org/635831. This patch corrects those. Change-Id: Ic57510271c5617115fa1018b09105ab480ce06e4 --- manila/api/v2/share_snapshots.py | 5 +++-- manila/api/v2/shares.py | 5 +++-- ...auto_deletable_and_identifier_fields_for_share_servers.py | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manila/api/v2/share_snapshots.py b/manila/api/v2/share_snapshots.py index 1db4ec5999..bbf973ac1c 100644 --- a/manila/api/v2/share_snapshots.py +++ b/manila/api/v2/share_snapshots.py @@ -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') diff --git a/manila/api/v2/shares.py b/manila/api/v2/shares.py index 91cf829896..13bb08fc08 100644 --- a/manila/api/v2/shares.py +++ b/manila/api/v2/shares.py @@ -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') diff --git a/manila/db/migrations/alembic/versions/6a3fd2984bc31_add_is_auto_deletable_and_identifier_fields_for_share_servers.py b/manila/db/migrations/alembic/versions/6a3fd2984bc31_add_is_auto_deletable_and_identifier_fields_for_share_servers.py index f7e27ad8ac..2f6487aaf4 100644 --- a/manila/db/migrations/alembic/versions/6a3fd2984bc31_add_is_auto_deletable_and_identifier_fields_for_share_servers.py +++ b/manila/db/migrations/alembic/versions/6a3fd2984bc31_add_is_auto_deletable_and_identifier_fields_for_share_servers.py @@ -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,