openstack/python-manilaclient
Code Issues Proposed changes

Fix outstanding ruff issues

Browse Source 
Some of these are genuine bugs caused by missing imports.

Change-Id: Iae120aaf0f2849ec6af941d764b8bd0ef8375a96
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2025-10-10 11:07:54 +01:00
parent 0ef57c0f49
commit 95bd3aca64
13 changed files with 175 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manilaclient/base.py
View File

@@ -25,6 +25,8 @@ import copy
import hashlib
import os
from oslo_utils import strutils
from manilaclient import api_versions
from manilaclient.common import cliutils
from manilaclient import exceptions

4
manilaclient/common/httpclient.py
View File

@@ -32,7 +32,7 @@ from time import sleep # noqa
try:
osprofiler_web = importutils.try_import("osprofiler.web")
except Exception:
except ImportError:
pass
@@ -136,7 +136,7 @@ class HTTPClient:
options['data'] = jsonutils.dumps(kwargs['body'])
self.log_request(method, url, headers, options.get('data', None))
resp = requests.request(method, url, headers=headers, **options)
resp = requests.request(method, url, headers=headers, **options) # noqa: S113
self.log_response(resp)
body = None

3
manilaclient/osc/plugin.py
View File

@@ -32,9 +32,8 @@ CLIENT_CLASS = 'manilaclient.v2.client.Client'
LATEST_VERSION = api_versions.MAX_VERSION
LATEST_MINOR_VERSION = api_versions.MAX_VERSION.split('.')[-1]
API_VERSIONS = {
'2.%d' % i: CLIENT_CLASS for i in range(0, int(LATEST_MINOR_VERSION) + 1)
f'2.{i}': CLIENT_CLASS for i in range(0, int(LATEST_MINOR_VERSION) + 1)
}

1
manilaclient/osc/v2/resource_locks.py
View File

@@ -279,6 +279,7 @@ class ListResourceLock(command.Lister):
def take_action(self, parsed_args):
share_client = self.app.client_manager.share
identity_client = self.app.client_manager.identity
columns = (
LOCK_SUMMARY_ATTRIBUTES

2
manilaclient/osc/v2/share_groups.py
View File

@@ -368,7 +368,7 @@ class ListShareGroup(command.Lister):
snapshot = None
if parsed_args.snapshot:
snapshot = apiutils.find_resource(
snapshot = osc_utils.find_resource(
share_client.share_snapshots, parsed_args.snapshot
).id

2
manilaclient/shell.py
View File

@@ -46,7 +46,7 @@ V2_MAJOR_VERSION = '2'
try:
osprofiler_profiler = importutils.try_import("osprofiler.profiler")
except Exception:
except ImportError:
pass

8
manilaclient/tests/functional/osc/base.py
View File

@@ -101,8 +101,8 @@ class OSCClientTestBase(base.ClientTestBase):
time.sleep(interval)
else:
self.fail(
"%s %s did not reach status %s after %d seconds."
% (object_name, object_id, status, timeout)
f"{object_name} {object_id} did not reach status {status} "
f"after {timeout} seconds."
)
def check_object_deleted(
@@ -122,8 +122,8 @@ class OSCClientTestBase(base.ClientTestBase):
time.sleep(interval)
else:
self.fail(
"%s %s not deleted after %d seconds."
% (object_name, object_id, timeout)
f"{object_name} {object_id} not deleted after {timeout} "
f"seconds."
)
def openstack(

8
manilaclient/tests/functional/test_share_access.py
View File

@@ -63,13 +63,13 @@ class ShareAccessReadWriteBase(base.BaseTestCase):
# NOTE(vponomaryov): list of unique values is required for ability
# to create lots of access rules for one share using different
# API microversions.
'ip': ['99.88.77.%d' % i for i in int_range],
'ip': [f'99.88.77.{i}' for i in int_range],
# NOTE(vponomaryov): following users are fakes and access rules
# that use it are expected to fail, but they are used only for
# API testing.
'user': ['foo_user_%d' % i for i in int_range],
'cert': ['tenant_%d.example.com' % i for i in int_range],
'ipv6': ['2001:db8::%d' % i for i in int_range],
'user': [f'foo_user_{i}' for i in int_range],
'cert': [f'tenant_{i}.example.com' for i in int_range],
'ipv6': [f'2001:db8::{i}' for i in int_range],
}
def _test_create_list_access_rule_for_share(

6
manilaclient/tests/functional/test_snapshot_access.py
View File

@@ -46,9 +46,9 @@ class SnapshotAccessReadBase(base.BaseTestCase):
int_range = range(0, 10)
self.access_to = {
'ip': ['99.88.77.%d' % i for i in int_range],
'user': ['foo_user_%d' % i for i in int_range],
'cert': ['tenant_%d.example.com' % i for i in int_range],
'ip': [f'99.88.77.{i}' for i in int_range],
'user': [f'foo_user_{i}' for i in int_range],
'cert': [f'tenant_{i}.example.com' for i in int_range],
}
def _test_create_list_access_rule_for_snapshot(self, snapshot_id):

1
manilaclient/tests/unit/osc/v2/fakes.py
View File

@@ -18,6 +18,7 @@ from unittest import mock
import uuid
from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
from osc_lib.cli import format_columns
from manilaclient.tests.unit.osc import osc_fakes
from manilaclient.tests.unit.osc import osc_utils

217
manilaclient/tests/unit/v2/test_shell.py
View File

@@ -667,8 +667,9 @@ class ShellTest(test_utils.TestCase):
),
)
self.run_command(
'share-instance-force-delete %s --wait'
% ' '.join(instances_to_delete)
'share-instance-force-delete {} --wait'.format(
' '.join(instances_to_delete)
)
)
shell_v2._find_share_instance.assert_has_calls(
[
@@ -754,7 +755,7 @@ class ShellTest(test_utils.TestCase):
}
}
self.run_command(
'type-create test-type-3 false --is-public %s' % str(public)
f'type-create test-type-3 false --is-public {str(public)}'
)
self.assert_called('POST', '/types', body=expected)
@@ -1068,18 +1069,17 @@ class ShellTest(test_utils.TestCase):
self.mock_object(shell_v2, '_wait_for_resource_status', mock.Mock())
command = (
'share-server-manage '
'%(host)s '
'%(share_network_id)s '
'%(identifier)s '
'%(driver_args)s '
% {
'host': 'fake_host',
'share_network_id': fake_share_network.id,
'identifier': '88-as-23-f3-45',
'driver_args': driver_args,
}
'{host} '
'{share_network_id} '
'{identifier} '
'{driver_args} '.format(
host='fake_host',
share_network_id=fake_share_network.id,
identifier='88-as-23-f3-45',
driver_args=driver_args,
)
)
command += '--share-network-subnet %s' % subnet_id if subnet_id else ''
command += f'--share-network-subnet {subnet_id}' if subnet_id else ''
self.run_command(command, version=version)
@@ -1117,7 +1117,7 @@ class ShellTest(test_utils.TestCase):
constants.STATUS_CREATING,
)
def test_share_server_reset_state(self, status):
self.run_command('share-server-reset-state 1234 --state %s ' % status)
self.run_command(f'share-server-reset-state 1234 --state {status} ')
expected = {'reset_status': {'status': status}}
self.assert_called('POST', '/share-servers/1234/action', body=expected)
@@ -1153,14 +1153,14 @@ class ShellTest(test_utils.TestCase):
shares.ShareManager, 'get', mock.Mock(return_value=fake_share)
)
self.run_command('unmanage %s xyzzyspoon' % wait_option)
self.run_command(f'unmanage {wait_option} xyzzyspoon')
expected_get_share_calls = 4 if wait_option else 1
shell_v2._find_share.assert_has_calls(
[mock.call(self.shell.cs, fake_share.id)]
* expected_get_share_calls
)
uri = '/shares/%s/action' % fake_share.id
uri = f'/shares/{fake_share.id}/action'
api.client.post.assert_called_once_with(uri, body={'unmanage': None})
def test_share_server_unmanage(self):
@@ -1372,7 +1372,7 @@ class ShellTest(test_utils.TestCase):
fake_sg = type('FakeShareGroup', (object,), {'id': sg_cmd.split()[-1]})
shell_v2._find_share_group.return_value = fake_sg
self.run_command('delete 1234 %s' % sg_cmd)
self.run_command(f'delete 1234 {sg_cmd}')
self.assert_called('DELETE', '/shares/1234?share_group_id=sg1313')
self.assertTrue(shell_v2._find_share_group.called)
@@ -1401,13 +1401,13 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=(fake_shares + shares_are_not_found_errors)),
)
self.run_command('delete %s --wait' % ' '.join(shares_to_delete))
self.run_command('delete {} --wait'.format(' '.join(shares_to_delete)))
shell_v2._find_share.assert_has_calls(
[mock.call(self.shell.cs, share) for share in shares_to_delete]
)
for share in fake_shares:
uri = '/shares/%s' % share.id
uri = f'/shares/{share.id}'
self.assert_called_anytime('DELETE', uri, clear_callstack=False)
@ddt.data(('share_xyz',), ('share_abc', 'share_xyz'))
@@ -1430,7 +1430,9 @@ class ShellTest(test_utils.TestCase):
'_find_share',
mock.Mock(side_effect=(fake_shares + shares_are_not_found_errors)),
)
self.run_command('force-delete %s --wait' % ' '.join(shares_to_delete))
self.run_command(
'force-delete {} --wait'.format(' '.join(shares_to_delete))
)
shell_v2._find_share.assert_has_calls(
[mock.call(self.shell.cs, share) for share in shares_to_delete]
)
@@ -1658,8 +1660,8 @@ class ShellTest(test_utils.TestCase):
@ddt.unpack
def test_type_create_duplicate_switch_and_extra_spec(self, key, value):
cmd = (
'type-create test True --%(key)s %(value)s --extra-specs '
'%(key)s=%(value)s' % {'key': key, 'value': value}
f'type-create test True --{key} {value} --extra-specs '
f'{key}={value}'
)
self.assertRaises(exceptions.CommandError, self.run_command, cmd)
@@ -1826,7 +1828,7 @@ class ShellTest(test_utils.TestCase):
self.assertRaises(
exceptions.CommandError,
self.run_command,
'type-create test false --%s fake' % value,
f'type-create test false --{value} fake',
)
@ddt.data('snapshot_support', 'create_share_from_snapshot_support')
@@ -1834,7 +1836,7 @@ class ShellTest(test_utils.TestCase):
self.assertRaises(
exceptions.CommandError,
self.run_command,
'type-create test false --extra-specs %s=fake' % value,
f'type-create test false --extra-specs {value}=fake',
)
@ddt.unpack
@@ -1938,10 +1940,7 @@ class ShellTest(test_utils.TestCase):
# update is_public attr
valid_is_public_values = strutils.TRUE_STRINGS + strutils.FALSE_STRINGS
for is_public in valid_is_public_values:
self.run_command(
'update 1234 %(alias)s %(value)s'
% {'alias': alias, 'value': is_public}
)
self.run_command(f'update 1234 {alias} {is_public}')
expected = {
'share': {
'is_public': strutils.bool_from_string(
@@ -1954,14 +1953,13 @@ class ShellTest(test_utils.TestCase):
self.assertRaises(
ValueError,
self.run_command,
'update 1234 %(alias)s %(value)s'
% {'alias': alias, 'value': invalid_val},
f'update 1234 {alias} {invalid_val}',
)
# update all attributes
self.run_command(
'update 1234 --name new-name '
'--description=new-description '
'%s True' % alias
f'{alias} True'
)
expected = {
'share': {
@@ -2066,7 +2064,7 @@ class ShellTest(test_utils.TestCase):
shell_v2, '_find_share', mock.Mock(side_effect=fake_shares)
)
expected_extend_body = {'extend': {'new_size': 77}}
self.run_command('extend 1234 77 %s' % wait_option)
self.run_command(f'extend 1234 77 {wait_option}')
self.assert_called_anytime(
'POST',
'/shares/1234/action',
@@ -2105,7 +2103,7 @@ class ShellTest(test_utils.TestCase):
shell_v2, '_find_share', mock.Mock(side_effect=fake_shares)
)
expected_shrink_body = {'shrink': {'new_size': 77}}
self.run_command('shrink 1234 77 %s' % wait_option)
self.run_command(f'shrink 1234 77 {wait_option}')
self.assert_called_anytime(
'POST',
'/shares/1234/action',
@@ -2247,13 +2245,10 @@ class ShellTest(test_utils.TestCase):
ss = type('FakeSecurityService', (object,), {'id': 'fake-ss-id'})
shell_v2._find_security_service.return_value = ss
for command in ['--security_service', '--security-service']:
self.run_command(
'share-network-list %(command)s %(ss_id)s'
% {'command': command, 'ss_id': ss.id}
)
self.run_command(f'share-network-list {command} {ss.id}')
self.assert_called(
'GET',
'/share-networks/detail?security_service_id=%s' % ss.id,
f'/share-networks/detail?security_service_id={ss.id}',
)
shell_v2._find_security_service.assert_called_with(mock.ANY, ss.id)
cliutils.print_list.assert_called_with(
@@ -2263,7 +2258,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_project_id_aliases(self):
for command in ['--project-id', '--project_id']:
self.run_command('share-network-list %s 1234' % command)
self.run_command(f'share-network-list {command} 1234')
self.assert_called(
'GET',
'/share-networks/detail?project_id=1234',
@@ -2275,7 +2270,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_created_before_aliases(self):
for command in ['--created-before', '--created_before']:
self.run_command('share-network-list %s 2001-01-01' % command)
self.run_command(f'share-network-list {command} 2001-01-01')
self.assert_called(
'GET',
'/share-networks/detail?created_before=2001-01-01',
@@ -2287,7 +2282,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_created_since_aliases(self):
for command in ['--created-since', '--created_since']:
self.run_command('share-network-list %s 2001-01-01' % command)
self.run_command(f'share-network-list {command} 2001-01-01')
self.assert_called(
'GET',
'/share-networks/detail?created_since=2001-01-01',
@@ -2304,7 +2299,7 @@ class ShellTest(test_utils.TestCase):
'--neutron_net-id',
'--neutron_net_id',
]:
self.run_command('share-network-list %s fake-id' % command)
self.run_command(f'share-network-list {command} fake-id')
self.assert_called(
'GET',
'/share-networks/detail?neutron_net_id=fake-id',
@@ -2321,7 +2316,7 @@ class ShellTest(test_utils.TestCase):
'--neutron_subnet-id',
'--neutron_subnet_id',
]:
self.run_command('share-network-list %s fake-id' % command)
self.run_command(f'share-network-list {command} fake-id')
self.assert_called(
'GET',
'/share-networks/detail?neutron_subnet_id=fake-id',
@@ -2333,7 +2328,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_network_type_aliases(self):
for command in ['--network_type', '--network-type']:
self.run_command('share-network-list %s local' % command)
self.run_command(f'share-network-list {command} local')
self.assert_called(
'GET',
'/share-networks/detail?network_type=local',
@@ -2345,7 +2340,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_segmentation_id_aliases(self):
for command in ['--segmentation-id', '--segmentation_id']:
self.run_command('share-network-list %s 1234' % command)
self.run_command(f'share-network-list {command} 1234')
self.assert_called(
'GET',
'/share-networks/detail?segmentation_id=1234',
@@ -2357,7 +2352,7 @@ class ShellTest(test_utils.TestCase):
@mock.patch.object(cliutils, 'print_list', mock.Mock())
def test_share_network_list_ip_version_aliases(self):
for command in ['--ip-version', '--ip_version']:
self.run_command('share-network-list %s 4' % command)
self.run_command(f'share-network-list {command} 4')
self.assert_called(
'GET',
'/share-networks/detail?ip_version=4',
@@ -2384,17 +2379,14 @@ class ShellTest(test_utils.TestCase):
}
command_str = 'share-network-list'
for key, value in filters.items():
command_str += ' --%(key)s=%(value)s' % {
'key': key,
'value': value,
}
command_str += f' --{key}={value}'
self.run_command(command_str)
query = utils.safe_urlencode(
sorted([(k.replace('-', '_'), v) for (k, v) in filters.items()])
)
self.assert_called(
'GET',
'/share-networks/detail?%s' % query,
f'/share-networks/detail?{query}',
)
cliutils.print_list.assert_called_once_with(
mock.ANY, fields=['id', 'name']
@@ -2573,11 +2565,10 @@ class ShellTest(test_utils.TestCase):
]
self.run_command(
'share-network-subnet-delete %(network_id)s %(subnet_ids)s'
% {
'network_id': fake_share_network.id,
'subnet_ids': ' '.join(subnet_ids),
}
'share-network-subnet-delete {network_id} {subnet_ids}'.format(
network_id=fake_share_network.id,
subnet_ids=' '.join(subnet_ids),
)
)
shell_v2._find_share_network.assert_called_once_with(
@@ -2586,15 +2577,15 @@ class ShellTest(test_utils.TestCase):
for subnet in fake_share_network_subnets:
self.assert_called_anytime(
'DELETE',
'/share-networks/1234/subnets/%s' % subnet.id,
f'/share-networks/1234/subnets/{subnet.id}',
clear_callstack=False,
)
def test_share_network_subnet_delete_invalid_share_network(self):
command = 'share-network-subnet-delete %(net_id)s %(subnet_id)s' % {
'net_id': 'not-found-id',
'subnet_id': '1234',
}
command = 'share-network-subnet-delete {net_id} {subnet_id}'.format(
net_id='not-found-id',
subnet_id='1234',
)
self.assertRaises(exceptions.CommandError, self.run_command, command)
@@ -2607,10 +2598,10 @@ class ShellTest(test_utils.TestCase):
'_find_share_network',
mock.Mock(return_value=fake_share_network),
)
command = 'share-network-subnet-delete %(net_id)s %(subnet_id)s' % {
'net_id': fake_share_network.id,
'subnet_id': 'not-found-id',
}
command = 'share-network-subnet-delete {net_id} {subnet_id}'.format(
net_id=fake_share_network.id,
subnet_id='not-found-id',
)
self.assertRaises(exceptions.CommandError, self.run_command, command)
@@ -2630,20 +2621,24 @@ class ShellTest(test_utils.TestCase):
}
self.run_command(
'share-network-subnet-show %(share_net_id)s %(subnet_id)s' % args
'share-network-subnet-show {share_net_id} {subnet_id}'.format(
**args
)
)
self.assert_called(
'GET',
'/share-networks/%(share_net_id)s/subnets/%(subnet_id)s' % args,
'/share-networks/{share_net_id}/subnets/{subnet_id}'.format(
**args
),
)
cliutils.print_dict.assert_called_once_with(mock.ANY)
def test_share_network_subnet_show_invalid_share_network(self):
command = 'share-network-subnet-show %(net_id)s %(subnet_id)s' % {
'net_id': 'not-found-id',
'subnet_id': 1234,
}
command = 'share-network-subnet-show {net_id} {subnet_id}'.format(
net_id='not-found-id',
subnet_id=1234,
)
self.assertRaises(exceptions.CommandError, self.run_command, command)
@@ -2676,7 +2671,7 @@ class ShellTest(test_utils.TestCase):
shell_v2, "_find_share_network", mock.Mock(return_value=sn)
):
self.run_command(
"create nfs 1 --share-type test_type --share-network %s" % sn
f"create nfs 1 --share-type test_type --share-network {sn}"
)
expected = self.create_share_body.copy()
expected['share']['share_network_id'] = sn
@@ -2714,7 +2709,7 @@ class ShellTest(test_utils.TestCase):
self.assertRaises(
exceptions.CommandError,
self.run_command,
"create nfs 1 --name %s --share-type test_type" % name,
f"create nfs 1 --name {name} --share-type test_type",
)
def test_allow_access_cert(self):
@@ -2733,7 +2728,7 @@ class ShellTest(test_utils.TestCase):
self.assertRaises(
exceptions.CommandError,
self.run_command,
("access-allow 1234 cert %s" % common_name),
(f"access-allow 1234 cert {common_name}"),
)
def test_allow_access_cert_error_zero(self):
@@ -2999,13 +2994,10 @@ class ShellTest(test_utils.TestCase):
sn = FakeShareNetwork()
shell_v2._find_share_network.return_value = sn
for command in ['--share-network', '--share_network']:
self.run_command(
'security-service-list %(command)s %(sn_id)s'
% {'command': command, 'sn_id': sn.id}
)
self.run_command(f'security-service-list {command} {sn.id}')
self.assert_called(
'GET',
'/security-services?share_network_id=%s' % sn.id,
f'/security-services?share_network_id={sn.id}',
)
shell_v2._find_share_network.assert_called_with(mock.ANY, sn.id)
cliutils.print_list.assert_called_with(
@@ -3050,10 +3042,7 @@ class ShellTest(test_utils.TestCase):
}
command_str = 'security-service-list'
for key, value in filters.items():
command_str += ' --%(key)s=%(value)s' % {
'key': key,
'value': value,
}
command_str += f' --{key}={value}'
self.run_command(command_str)
self.assert_called(
'GET',
@@ -3179,12 +3168,12 @@ class ShellTest(test_utils.TestCase):
@mock.patch('manilaclient.common.cliutils.print_dict')
def test_quota_show_with_share_type(self, share_type_id, mock_print_dict):
self.run_command(
'quota-show --tenant 1234 --share_type %s' % share_type_id
f'quota-show --tenant 1234 --share_type {share_type_id}'
)
self.assert_called(
'GET',
'/quota-sets/1234?share_type=%s' % share_type_id,
f'/quota-sets/1234?share_type={share_type_id}',
)
mock_print_dict.assert_called_once_with(mock.ANY)
@@ -3204,7 +3193,7 @@ class ShellTest(test_utils.TestCase):
)
@ddt.unpack
def test_quota_update(self, cmd, expected_body):
self.run_command('quota-update 1234 %s' % cmd)
self.run_command(f'quota-update 1234 {cmd}')
expected = {'quota_set': dict(expected_body, tenant_id='1234')}
self.assert_called('PUT', '/quota-sets/1234', body=expected)
@@ -3293,7 +3282,7 @@ class ShellTest(test_utils.TestCase):
self.assert_called(
'GET',
'/scheduler-stats/pools?backend=backend1&host=host1&'
'pool=pool1&share_type=%s' % param.split()[-1],
f'pool=pool1&share_type={param.split()[-1]}',
)
cliutils.print_list.assert_called_with(
mock.ANY, fields=["Name", "Host", "Backend", "Pool"]
@@ -3532,7 +3521,7 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=[fake_share_group]),
)
self.run_command('share-group-update 1234 %s' % cmd)
self.run_command(f'share-group-update 1234 {cmd}')
shell_v2._find_share_group.assert_has_calls(
[mock.call(self.shell.cs, '1234')]
@@ -3576,7 +3565,9 @@ class ShellTest(test_utils.TestCase):
)
self.mock_object(shell_v2, '_wait_for_resource_status', mock.Mock())
self.run_command(
'share-group-delete %s --wait' % ' '.join(share_group_to_delete)
'share-group-delete {} --wait'.format(
' '.join(share_group_to_delete)
)
)
shell_v2._find_share_group.assert_has_calls(
[
@@ -3784,7 +3775,7 @@ class ShellTest(test_utils.TestCase):
)
@ddt.unpack
def test_share_group_snapshot_update(self, cmd, expected_body):
self.run_command('share-group-snapshot-update 1234 %s' % cmd)
self.run_command(f'share-group-snapshot-update 1234 {cmd}')
expected = {'share_group_snapshot': expected_body}
self.assert_called('PUT', '/share-group-snapshots/1234', body=expected)
@@ -3937,8 +3928,8 @@ class ShellTest(test_utils.TestCase):
self.run_command(
'share-group-type-create test-group-type-1 '
'type1,type2 --is-public %s --group-specs '
'spec1=value1' % str(public)
f'type1,type2 --is-public {str(public)} --group-specs '
'spec1=value1'
)
self.assert_called_anytime('POST', '/share-group-types', body=expected)
@@ -4092,7 +4083,7 @@ class ShellTest(test_utils.TestCase):
cmd = 'quota-class-update test'
expected = dict()
for k, v in data.items():
cmd += ' %(arg)s %(val)s' % {'arg': k, 'val': v}
cmd += f' {k} {v}'
expected[k[2:].replace('-', '_')] = v
expected['class_name'] = 'test'
expected = dict(quota_class_set=expected)
@@ -4159,7 +4150,7 @@ class ShellTest(test_utils.TestCase):
all_replicas = []
existing_replicas = []
for counter in range(replica_count):
replica = 'fake-replica-%d' % counter
replica = f'fake-replica-{counter}'
if counter >= replica_errors:
existing_replicas.append(replica)
all_replicas.append(replica)
@@ -4167,7 +4158,7 @@ class ShellTest(test_utils.TestCase):
shell_v2._find_share_replica.side_effect = StubbedFindWithErrors(
existing_replicas
)
cmd = 'share-replica-delete %s' % ' '.join(all_replicas)
cmd = 'share-replica-delete {}'.format(' '.join(all_replicas))
if replica_count == replica_errors:
self.assertRaises(exceptions.CommandError, self.run_command, cmd)
@@ -4308,7 +4299,7 @@ class ShellTest(test_utils.TestCase):
shell_v2._find_share_replica.return_value = fake_replica
cmd = 'share-replica-export-location-list ' + fake_replica.id
if columns is not None:
cmd = cmd + ' --columns=%s' % columns
cmd = cmd + f' --columns={columns}'
expected_columns = list(
map(lambda x: x.strip().title(), columns.split(","))
)
@@ -4454,7 +4445,7 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=fake_security_services),
)
self.run_command('security-service-delete %s' % ' '.join(ss_ids))
self.run_command('security-service-delete {}'.format(' '.join(ss_ids)))
shell_v2._find_security_service.assert_has_calls(
[mock.call(self.shell.cs, ss_id) for ss_id in ss_ids]
@@ -4462,7 +4453,7 @@ class ShellTest(test_utils.TestCase):
for ss in fake_security_services:
self.assert_called_anytime(
'DELETE',
'/security-services/%s' % ss.id,
f'/security-services/{ss.id}',
clear_callstack=False,
)
@@ -4481,14 +4472,14 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=fake_share_networks),
)
self.run_command('share-network-delete %s' % ' '.join(sn_ids))
self.run_command('share-network-delete {}'.format(' '.join(sn_ids)))
shell_v2._find_share_network.assert_has_calls(
[mock.call(self.shell.cs, sn_id) for sn_id in sn_ids]
)
for sn in fake_share_networks:
self.assert_called_anytime(
'DELETE', '/share-networks/%s' % sn.id, clear_callstack=False
'DELETE', f'/share-networks/{sn.id}', clear_callstack=False
)
@mock.patch.object(shell_v2, '_find_share', mock.Mock())
@@ -4539,14 +4530,14 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=fake_snapshots),
)
self.run_command('snapshot-delete %s' % ' '.join(snapshot_ids))
self.run_command('snapshot-delete {}'.format(' '.join(snapshot_ids)))
shell_v2._find_share_snapshot.assert_has_calls(
[mock.call(self.shell.cs, s_id) for s_id in snapshot_ids]
)
for snapshot in fake_snapshots:
self.assert_called_anytime(
'DELETE', '/snapshots/%s' % snapshot.id, clear_callstack=False
'DELETE', f'/snapshots/{snapshot.id}', clear_callstack=False
)
@mock.patch.object(shell_v2, '_find_share_snapshot', mock.Mock())
@@ -4596,7 +4587,9 @@ class ShellTest(test_utils.TestCase):
),
)
self.run_command(
'snapshot-force-delete %s --wait' % ' '.join(snapshots_to_delete)
'snapshot-force-delete {} --wait'.format(
' '.join(snapshots_to_delete)
)
)
shell_v2._find_share_snapshot.assert_has_calls(
[
@@ -4623,7 +4616,7 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=fake_share_types),
)
self.run_command('type-delete %s' % ' '.join(type_ids))
self.run_command('type-delete {}'.format(' '.join(type_ids)))
shell_v2._find_share_type.assert_has_calls(
[mock.call(self.shell.cs, t_id) for t_id in type_ids]
@@ -4631,7 +4624,7 @@ class ShellTest(test_utils.TestCase):
for fake_share_type in fake_share_types:
self.assert_called_anytime(
'DELETE',
'/types/%s' % fake_share_type.id,
f'/types/{fake_share_type.id}',
clear_callstack=False,
)
@@ -4666,7 +4659,9 @@ class ShellTest(test_utils.TestCase):
self.mock_object(shell_v2, '_wait_for_resource_status', mock.Mock())
self.run_command(
'share-server-delete %s --wait' % ' '.join(share_servers_to_delete)
'share-server-delete {} --wait'.format(
' '.join(share_servers_to_delete)
)
)
shell_v2._find_share_server.assert_has_calls(
@@ -4772,7 +4767,7 @@ class ShellTest(test_utils.TestCase):
mock.Mock(side_effect=_find_message_with_errors),
)
cmd = 'message-delete %s' % ' '.join(ids)
cmd = 'message-delete {}'.format(' '.join(ids))
if len(fake_messages) == 0:
self.assertRaises(exceptions.CommandError, self.run_command, cmd)
@@ -4785,7 +4780,7 @@ class ShellTest(test_utils.TestCase):
for fake_message in fake_messages.values():
self.assert_called_anytime(
'DELETE',
'/messages/%s' % fake_message.id,
f'/messages/{fake_message.id}',
clear_callstack=False,
)
@@ -4827,10 +4822,10 @@ class ShellTest(test_utils.TestCase):
@ddt.data('migration-start', 'migration-check')
def test_share_server_migration_start_and_check(self, method):
command = (
"share-server-%s "
f"share-server-{method} "
"1234 host@backend --new-share-network 1111 "
"--writable False --nondisruptive True "
"--preserve-snapshots True" % method
"--preserve-snapshots True"
)
self.run_command(command)
method = method.replace('-', '_')

109
manilaclient/v2/shell.py
View File

@@ -372,7 +372,7 @@ def _quota_set_pretty_show(quotas):
for quota_k, quota_v in sorted(quotas.to_dict().items()):
if isinstance(quota_v, dict):
quota_v = '\n'.join(
['%s = %s' % (k, v) for k, v in sorted(quota_v.items())]
[f'{k} = {v}' for k, v in sorted(quota_v.items())]
)
new_quotas[quota_k] = quota_v
@@ -452,7 +452,7 @@ def _extract_key_value_options(args, option_name, allow_empty_key=True):
if len(duplicate_options) > 0:
duplicate_str = ', '.join(duplicate_options)
msg = "Following options were duplicated: %s" % duplicate_str
msg = f"Following options were duplicated: {duplicate_str}"
raise exceptions.CommandError(msg)
return result_dict
@@ -1974,7 +1974,7 @@ def do_share_server_unmanage(cs, args):
except Exception as e:
failure_count += 1
print(
"Unmanage for share server %s failed: %s" % (server, e),
f"Unmanage for share server {server} failed: {e}",
file=sys.stderr,
)
@@ -2011,7 +2011,7 @@ def do_snapshot_unmanage(cs, args):
except Exception as e:
failure_count += 1
print(
"Unmanage for share snapshot %s failed: %s" % (snapshot, e),
f"Unmanage for share snapshot {snapshot} failed: {e}",
file=sys.stderr,
)
@@ -2073,9 +2073,7 @@ def do_delete(cs, args):
cs.shares.delete(share_ref)
except Exception as e:
failure_count += 1
print(
"Delete for share %s failed: %s" % (share, e), file=sys.stderr
)
print(f"Delete for share {share} failed: {e}", file=sys.stderr)
if failure_count == len(args.share):
raise exceptions.CommandError(
@@ -2109,9 +2107,7 @@ def do_force_delete(cs, args):
share_ref.force_delete()
except Exception as e:
failure_count += 1
print(
"Delete for share %s failed: %s" % (share, e), file=sys.stderr
)
print(f"Delete for share {share} failed: {e}", file=sys.stderr)
if failure_count == len(args.share):
raise exceptions.CommandError(
"Unable to force delete any of specified shares."
@@ -2140,7 +2136,7 @@ def do_soft_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Soft deletion of share %s failed: %s" % (share, e),
f"Soft deletion of share {share} failed: {e}",
file=sys.stderr,
)
@@ -2166,7 +2162,7 @@ def do_restore(cs, args):
except Exception as e:
failure_count += 1
print(
"Restoration of share %s failed: %s" % (share, e),
f"Restoration of share {share} failed: {e}",
file=sys.stderr,
)
@@ -2369,8 +2365,7 @@ def do_snapshot_access_deny(cs, args):
except Exception as e:
failure_count += 1
print(
"Failed to remove rule %(access)s: %(reason)s."
% {'access': access_id, 'reason': e},
f"Failed to remove rule {access_id}: {e}.",
file=sys.stderr,
)
@@ -2633,8 +2628,8 @@ def do_snapshot_access_list(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. '
'OPTIONAL: Default=None.' % {'keys': constants.SHARE_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.SHARE_SORT_KEY_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--sort-dir',
@@ -2643,8 +2638,8 @@ def do_snapshot_access_list(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'OPTIONAL: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--snapshot',
@@ -2871,7 +2866,7 @@ def do_list(cs, args):
setattr(share, 'export_location', els[0] if els else None)
cliutils.print_list(shares, list_of_keys, sortby_index=None)
if args.count:
print("Shares in total: %s" % total_count)
print(f"Shares in total: {total_count}")
with cs.shares.completion_cache(
'uuid', manilaclient.v2.shares.Share, mode="w"
@@ -2995,7 +2990,7 @@ def do_share_instance_force_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share instance %s failed: %s" % (instance, e),
f"Delete for share instance {instance} failed: {e}",
file=sys.stderr,
)
if failure_count == len(args.instance):
@@ -3163,8 +3158,8 @@ def do_share_instance_export_location_show(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. '
'Default=None.' % {'keys': constants.SNAPSHOT_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.SNAPSHOT_SORT_KEY_VALUES}. '
'Default=None.',
)
@cliutils.arg(
'--sort-dir',
@@ -3173,8 +3168,8 @@ def do_share_instance_export_location_show(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'OPTIONAL: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--columns',
@@ -3291,7 +3286,7 @@ def do_snapshot_list(cs, args):
cliutils.print_list(snapshots, list_of_keys, sortby_index=None)
if args.count:
print("Share snapshots in total: %s" % total_count)
print(f"Share snapshots in total: {total_count}")
@cliutils.arg(
@@ -3546,7 +3541,7 @@ def do_snapshot_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for snapshot %s failed: %s" % (snapshot, e),
f"Delete for snapshot {snapshot} failed: {e}",
file=sys.stderr,
)
@@ -3582,7 +3577,7 @@ def do_snapshot_force_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for snapshot %s failed: %s" % (snapshot, e),
f"Delete for snapshot {snapshot} failed: {e}",
file=sys.stderr,
)
@@ -4666,7 +4661,7 @@ def do_share_network_subnet_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Deletion of share network subnet %s failed: %s" % (subnet, e),
f"Deletion of share network subnet {subnet} failed: {e}",
file=sys.stderr,
)
@@ -4713,7 +4708,7 @@ def do_share_network_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share network %s failed: %s" % (share_network, e),
f"Delete for share network {share_network} failed: {e}",
file=sys.stderr,
)
@@ -5115,8 +5110,7 @@ def do_security_service_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for security service %s failed: %s"
% (security_service, e),
f"Delete for security service {security_service} failed: {e}",
file=sys.stderr,
)
@@ -5252,7 +5246,7 @@ def do_share_server_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share server %s failed: %s" % (server_id, e),
f"Delete for share server {server_id} failed: {e}",
file=sys.stderr,
)
@@ -5378,7 +5372,7 @@ def _print_dict(data_dict):
formatted_data = []
for date in data_dict:
formatted_data.append("%s : %s" % (date, data_dict[date]))
formatted_data.append(f"{date} : {data_dict[date]}")
return "\n".join(formatted_data)
@@ -5805,7 +5799,7 @@ def do_type_create(cs, args):
except ValueError as e:
msg = (
"Argument spec_driver_handles_share_servers "
"argument is not valid: %s" % str(e)
f"argument is not valid: {str(e)}"
)
raise exceptions.CommandError(msg)
@@ -5840,7 +5834,7 @@ def do_type_create(cs, args):
value = getattr(args, key)
if value is not None and key in kwargs['extra_specs']:
msg = "Argument '%s' value specified twice." % key
msg = f"Argument '{key}' value specified twice."
raise exceptions.CommandError(msg)
try:
@@ -5854,8 +5848,8 @@ def do_type_create(cs, args):
)
except ValueError as e:
msg = (
"Argument '%s' is of boolean "
"type and has invalid value: %s" % (key, str(e))
f"Argument '{key}' is of boolean "
f"type and has invalid value: {str(e)}"
)
raise exceptions.CommandError(msg)
@@ -5933,7 +5927,7 @@ def do_type_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share type %s failed: %s" % (name_or_id, e),
f"Delete for share type {name_or_id} failed: {e}",
file=sys.stderr,
)
@@ -6503,8 +6497,7 @@ def do_share_group_create(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. Default=None.'
% {'keys': constants.SHARE_GROUP_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.SHARE_GROUP_SORT_KEY_VALUES}. Default=None.',
)
@cliutils.arg(
'--sort-dir',
@@ -6513,8 +6506,8 @@ def do_share_group_create(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'OPTIONAL: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--columns',
@@ -6683,7 +6676,7 @@ def do_share_group_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share group %s failed: %s" % (share_group, e),
f"Delete for share group {share_group} failed: {e}",
file=sys.stderr,
)
@@ -6826,8 +6819,7 @@ def do_share_group_snapshot_create(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. Default=None.'
% {'keys': constants.SHARE_GROUP_SNAPSHOT_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.SHARE_GROUP_SNAPSHOT_SORT_KEY_VALUES}. Default=None.',
)
@cliutils.arg(
'--sort-dir',
@@ -6836,8 +6828,8 @@ def do_share_group_snapshot_create(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'OPTIONAL: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--detailed',
@@ -7030,8 +7022,7 @@ def do_share_group_snapshot_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share group snapshot %s failed: %s"
% (sg_snapshot, e),
f"Delete for share group snapshot {sg_snapshot} failed: {e}",
file=sys.stderr,
)
@@ -7298,7 +7289,7 @@ def do_share_replica_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share replica %s failed: %s" % (replica, e),
f"Delete for share replica {replica} failed: {e}",
file=sys.stderr,
)
@@ -7496,7 +7487,7 @@ def do_share_transfer_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for share transfer %s failed: %s" % (transfer, e),
f"Delete for share transfer {transfer} failed: {e}",
file=sys.stderr,
)
@@ -7602,8 +7593,7 @@ def do_share_transfer_accept(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. Default=None.'
% {'keys': constants.SHARE_TRANSFER_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.SHARE_TRANSFER_SORT_KEY_VALUES}. Default=None.',
)
@cliutils.arg(
'--sort-dir',
@@ -7612,8 +7602,8 @@ def do_share_transfer_accept(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'Optional: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'Optional: Default=None.',
)
@cliutils.arg(
'--detailed',
@@ -7771,8 +7761,7 @@ def do_share_transfer_show(cs, args):
type=str,
default=None,
action='single_alias',
help='Key to be sorted, available keys are %(keys)s. Default=desc.'
% {'keys': constants.MESSAGE_SORT_KEY_VALUES},
help=f'Key to be sorted, available keys are {constants.MESSAGE_SORT_KEY_VALUES}. Default=desc.',
)
@cliutils.arg(
'--sort-dir',
@@ -7781,8 +7770,8 @@ def do_share_transfer_show(cs, args):
type=str,
default=None,
action='single_alias',
help='Sort direction, available values are %(values)s. '
'OPTIONAL: Default=None.' % {'values': constants.SORT_DIR_VALUES},
help=f'Sort direction, available values are {constants.SORT_DIR_VALUES}. '
'OPTIONAL: Default=None.',
)
@cliutils.arg(
'--columns',
@@ -7874,7 +7863,7 @@ def do_message_delete(cs, args):
except Exception as e:
failure_count += 1
print(
"Delete for message %s failed: %s" % (message, e),
f"Delete for message {message} failed: {e}",
file=sys.stderr,
)

6
pyproject.toml
View File

@@ -208,12 +208,6 @@ docstring-code-format = true
[tool.ruff.lint]
select = ["E4", "E7", "E9", "F", "S", "U"]
# The following will be addressed in subsequent commits
# F821
# UP031
# S110
# S113
ignore = ["F821", "UP031", "S110", "S113"]
[tool.ruff.lint.per-file-ignores]
"manilaclient/tests/*" = ["S"]