diff options
Diffstat (limited to 'openstackclient/tests/unit/volume/v3')
12 files changed, 986 insertions, 748 deletions
diff --git a/openstackclient/tests/unit/volume/v3/fakes.py b/openstackclient/tests/unit/volume/v3/fakes.py index 62383580..c8b8e9f4 100644 --- a/openstackclient/tests/unit/volume/v3/fakes.py +++ b/openstackclient/tests/unit/volume/v3/fakes.py @@ -455,7 +455,8 @@ def create_service_log_level_entry(attrs=None): service_log_level_info.update(attrs) service_log_level = fakes.FakeResource( - None, service_log_level_info, loaded=True) + None, service_log_level_info, loaded=True + ) return service_log_level @@ -481,10 +482,13 @@ def create_cleanup_records(): cleaning_records.append(cleaning_work_info) unavailable_records.append(unavailable_work_info) - cleaning = [fakes.FakeResource( - None, obj, loaded=True) for obj in cleaning_records] - unavailable = [fakes.FakeResource( - None, obj, loaded=True) for obj in unavailable_records] + cleaning = [ + fakes.FakeResource(None, obj, loaded=True) for obj in cleaning_records + ] + unavailable = [ + fakes.FakeResource(None, obj, loaded=True) + for obj in unavailable_records + ] return cleaning, unavailable @@ -513,7 +517,8 @@ def create_volume_manage_list_records(count=2): volume_manage_list = [] for i in range(count): volume_manage_list.append( - create_one_manage_record({'size': str(i + 1)})) + create_one_manage_record({'size': str(i + 1)}) + ) return volume_manage_list @@ -522,6 +527,7 @@ def create_snapshot_manage_list_records(count=2): snapshot_manage_list = [] for i in range(count): snapshot_manage_list.append( - create_one_manage_record({'size': str(i + 1)}, snapshot=True)) + create_one_manage_record({'size': str(i + 1)}, snapshot=True) + ) return snapshot_manage_list diff --git a/openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py b/openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py index b48ce2f9..7739dbc2 100644 --- a/openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py +++ b/openstackclient/tests/unit/volume/v3/test_block_storage_cleanup.py @@ -20,7 +20,6 @@ from openstackclient.volume.v3 import block_storage_cleanup class TestBlockStorage(volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -30,7 +29,6 @@ class TestBlockStorage(volume_fakes.TestVolume): class TestBlockStorageCleanup(TestBlockStorage): - cleaning, unavailable = volume_fakes.create_cleanup_records() def setUp(self): @@ -39,15 +37,14 @@ class TestBlockStorageCleanup(TestBlockStorage): self.worker_mock.clean.return_value = (self.cleaning, self.unavailable) # Get the command object to test - self.cmd = \ - block_storage_cleanup.BlockStorageCleanup(self.app, None) + self.cmd = block_storage_cleanup.BlockStorageCleanup(self.app, None) def test_cleanup(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.24') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.24' + ) - arglist = [ - ] + arglist = [] verifylist = [ ('cluster', None), ('host', None), @@ -62,22 +59,12 @@ class TestBlockStorageCleanup(TestBlockStorage): expected_columns = ('ID', 'Cluster Name', 'Host', 'Binary', 'Status') cleaning_data = tuple( - ( - obj.id, - obj.cluster_name, - obj.host, - obj.binary, - 'Cleaning' - ) for obj in self.cleaning + (obj.id, obj.cluster_name, obj.host, obj.binary, 'Cleaning') + for obj in self.cleaning ) unavailable_data = tuple( - ( - obj.id, - obj.cluster_name, - obj.host, - obj.binary, - 'Unavailable' - ) for obj in self.unavailable + (obj.id, obj.cluster_name, obj.host, obj.binary, 'Unavailable') + for obj in self.unavailable ) expected_data = cleaning_data + unavailable_data columns, data = self.cmd.take_action(parsed_args) @@ -91,8 +78,7 @@ class TestBlockStorageCleanup(TestBlockStorage): self.worker_mock.clean.assert_called_once_with() def test_block_storage_cleanup_pre_324(self): - arglist = [ - ] + arglist = [] verifylist = [ ('cluster', None), ('host', None), @@ -104,14 +90,17 @@ class TestBlockStorageCleanup(TestBlockStorage): ('service_id', None), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.24 or greater is required', str(exc)) + '--os-volume-api-version 3.24 or greater is required', str(exc) + ) def test_cleanup_with_args(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.24') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.24' + ) fake_cluster = 'fake-cluster' fake_host = 'fake-host' @@ -120,14 +109,20 @@ class TestBlockStorageCleanup(TestBlockStorage): fake_resource_type = 'Volume' fake_service_id = 1 arglist = [ - '--cluster', fake_cluster, - '--host', fake_host, - '--binary', fake_binary, + '--cluster', + fake_cluster, + '--host', + fake_host, + '--binary', + fake_binary, '--down', '--enabled', - '--resource-id', fake_resource_id, - '--resource-type', fake_resource_type, - '--service-id', str(fake_service_id), + '--resource-id', + fake_resource_id, + '--resource-type', + fake_resource_type, + '--service-id', + str(fake_service_id), ] verifylist = [ ('cluster', fake_cluster), @@ -143,22 +138,12 @@ class TestBlockStorageCleanup(TestBlockStorage): expected_columns = ('ID', 'Cluster Name', 'Host', 'Binary', 'Status') cleaning_data = tuple( - ( - obj.id, - obj.cluster_name, - obj.host, - obj.binary, - 'Cleaning' - ) for obj in self.cleaning + (obj.id, obj.cluster_name, obj.host, obj.binary, 'Cleaning') + for obj in self.cleaning ) unavailable_data = tuple( - ( - obj.id, - obj.cluster_name, - obj.host, - obj.binary, - 'Unavailable' - ) for obj in self.unavailable + (obj.id, obj.cluster_name, obj.host, obj.binary, 'Unavailable') + for obj in self.unavailable ) expected_data = cleaning_data + unavailable_data columns, data = self.cmd.take_action(parsed_args) @@ -175,4 +160,5 @@ class TestBlockStorageCleanup(TestBlockStorage): disabled=False, resource_id=fake_resource_id, resource_type=fake_resource_type, - service_id=fake_service_id) + service_id=fake_service_id, + ) diff --git a/openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py b/openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py index fdfd1100..c6ba6340 100644 --- a/openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py +++ b/openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py @@ -18,7 +18,6 @@ from openstackclient.volume.v3 import block_storage_cluster class TestBlockStorageCluster(volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -28,7 +27,6 @@ class TestBlockStorageCluster(volume_fakes.TestVolume): class TestBlockStorageClusterList(TestBlockStorageCluster): - # The cluster to be listed fake_clusters = volume_fakes.create_clusters() @@ -38,15 +36,16 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): self.cluster_mock.list.return_value = self.fake_clusters # Get the command object to test - self.cmd = \ - block_storage_cluster.ListBlockStorageCluster(self.app, None) + self.cmd = block_storage_cluster.ListBlockStorageCluster( + self.app, None + ) def test_cluster_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) - arglist = [ - ] + arglist = [] verifylist = [ ('cluster', None), ('binary', None), @@ -65,7 +64,8 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): cluster.binary, cluster.state, cluster.status, - ) for cluster in self.fake_clusters + ) + for cluster in self.fake_clusters ) columns, data = self.cmd.take_action(parsed_args) @@ -84,16 +84,21 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): ) def test_cluster_list_with_full_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ - '--cluster', 'foo', - '--binary', 'bar', + '--cluster', + 'foo', + '--binary', + 'bar', '--up', '--disabled', - '--num-hosts', '5', - '--num-down-hosts', '0', + '--num-hosts', + '5', + '--num-down-hosts', + '0', '--long', ] verifylist = [ @@ -131,7 +136,8 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): cluster.disabled_reason, cluster.created_at, cluster.updated_at, - ) for cluster in self.fake_clusters + ) + for cluster in self.fake_clusters ) columns, data = self.cmd.take_action(parsed_args) @@ -150,11 +156,11 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): ) def test_cluster_list_pre_v37(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.6') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.6' + ) - arglist = [ - ] + arglist = [] verifylist = [ ('cluster', None), ('binary', None), @@ -167,15 +173,14 @@ class TestBlockStorageClusterList(TestBlockStorageCluster): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.7 or greater is required', str(exc)) + '--os-volume-api-version 3.7 or greater is required', str(exc) + ) class TestBlockStorageClusterSet(TestBlockStorageCluster): - cluster = volume_fakes.create_one_cluster() columns = ( 'Name', @@ -213,12 +218,12 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): self.cluster_mock.update.return_value = self.cluster - self.cmd = \ - block_storage_cluster.SetBlockStorageCluster(self.app, None) + self.cmd = block_storage_cluster.SetBlockStorageCluster(self.app, None) def test_cluster_set(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ '--enable', @@ -245,13 +250,16 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): ) def test_cluster_set_disable_with_reason(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ - '--binary', self.cluster.binary, + '--binary', + self.cluster.binary, '--disable', - '--disable-reason', 'foo', + '--disable-reason', + 'foo', self.cluster.name, ] verifylist = [ @@ -274,11 +282,13 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): ) def test_cluster_set_only_with_disable_reason(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ - '--disable-reason', 'foo', + '--disable-reason', + 'foo', self.cluster.name, ] verifylist = [ @@ -290,19 +300,21 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - "Cannot specify --disable-reason without --disable", str(exc)) + "Cannot specify --disable-reason without --disable", str(exc) + ) def test_cluster_set_enable_with_disable_reason(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ '--enable', - '--disable-reason', 'foo', + '--disable-reason', + 'foo', self.cluster.name, ] verifylist = [ @@ -314,15 +326,16 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - "Cannot specify --disable-reason without --disable", str(exc)) + "Cannot specify --disable-reason without --disable", str(exc) + ) def test_cluster_set_pre_v37(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.6') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.6' + ) arglist = [ '--enable', @@ -338,15 +351,14 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.7 or greater is required', str(exc)) + '--os-volume-api-version 3.7 or greater is required', str(exc) + ) class TestBlockStorageClusterShow(TestBlockStorageCluster): - cluster = volume_fakes.create_one_cluster() columns = ( 'Name', @@ -384,15 +396,18 @@ class TestBlockStorageClusterShow(TestBlockStorageCluster): self.cluster_mock.show.return_value = self.cluster - self.cmd = \ - block_storage_cluster.ShowBlockStorageCluster(self.app, None) + self.cmd = block_storage_cluster.ShowBlockStorageCluster( + self.app, None + ) def test_cluster_show(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.7') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.7' + ) arglist = [ - '--binary', self.cluster.binary, + '--binary', + self.cluster.binary, self.cluster.name, ] verifylist = [ @@ -412,11 +427,13 @@ class TestBlockStorageClusterShow(TestBlockStorageCluster): ) def test_cluster_show_pre_v37(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.6') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.6' + ) arglist = [ - '--binary', self.cluster.binary, + '--binary', + self.cluster.binary, self.cluster.name, ] verifylist = [ @@ -427,8 +444,8 @@ class TestBlockStorageClusterShow(TestBlockStorageCluster): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.7 or greater is required', str(exc)) + '--os-volume-api-version 3.7 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py b/openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py index 35ea6274..769954a2 100644 --- a/openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py +++ b/openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py @@ -22,7 +22,6 @@ from openstackclient.volume.v3 import block_storage_log_level as service class TestService(volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -32,7 +31,6 @@ class TestService(volume_fakes.TestVolume): class TestBlockStorageLogLevelList(TestService): - service_log = volume_fakes.create_service_log_level_entry() def setUp(self): @@ -44,12 +42,16 @@ class TestBlockStorageLogLevelList(TestService): self.cmd = service.BlockStorageLogLevelList(self.app, None) def test_block_storage_log_level_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ - '--host', self.service_log.host, - '--service', self.service_log.binary, - '--log-prefix', self.service_log.prefix, + '--host', + self.service_log.host, + '--service', + self.service_log.binary, + '--log-prefix', + self.service_log.prefix, ] verifylist = [ ('host', self.service_log.host), @@ -70,12 +72,14 @@ class TestBlockStorageLogLevelList(TestService): # confirming if all expected columns are present in the result. self.assertEqual(expected_columns, columns) - datalist = (( - self.service_log.binary, - self.service_log.host, - self.service_log.prefix, - self.service_log.level, - ), ) + datalist = ( + ( + self.service_log.binary, + self.service_log.host, + self.service_log.prefix, + self.service_log.level, + ), + ) # confirming if all expected values are present in the result. self.assertEqual(datalist, tuple(data)) @@ -89,9 +93,12 @@ class TestBlockStorageLogLevelList(TestService): def test_block_storage_log_level_list_pre_332(self): arglist = [ - '--host', self.service_log.host, - '--service', 'cinder-api', - '--log-prefix', 'cinder_test.api.common', + '--host', + self.service_log.host, + '--service', + 'cinder-api', + '--log-prefix', + 'cinder_test.api.common', ] verifylist = [ ('host', self.service_log.host), @@ -100,18 +107,24 @@ class TestBlockStorageLogLevelList(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.32 or greater is required', str(exc)) + '--os-volume-api-version 3.32 or greater is required', str(exc) + ) def test_block_storage_log_level_list_invalid_service_name(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ - '--host', self.service_log.host, - '--service', 'nova-api', - '--log-prefix', 'cinder_test.api.common', + '--host', + self.service_log.host, + '--service', + 'nova-api', + '--log-prefix', + 'cinder_test.api.common', ] verifylist = [ ('host', self.service_log.host), @@ -119,13 +132,17 @@ class TestBlockStorageLogLevelList(TestService): ('log_prefix', 'cinder_test.api.common'), ] - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) @ddt.ddt class TestBlockStorageLogLevelSet(TestService): - service_log = volume_fakes.create_service_log_level_entry() def setUp(self): @@ -135,13 +152,17 @@ class TestBlockStorageLogLevelSet(TestService): self.cmd = service.BlockStorageLogLevelSet(self.app, None) def test_block_storage_log_level_set(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ 'ERROR', - '--host', self.service_log.host, - '--service', self.service_log.binary, - '--log-prefix', self.service_log.prefix, + '--host', + self.service_log.host, + '--service', + self.service_log.binary, + '--log-prefix', + self.service_log.prefix, ] verifylist = [ ('level', 'ERROR'), @@ -164,9 +185,12 @@ class TestBlockStorageLogLevelSet(TestService): def test_block_storage_log_level_set_pre_332(self): arglist = [ 'ERROR', - '--host', self.service_log.host, - '--service', 'cinder-api', - '--log-prefix', 'cinder_test.api.common', + '--host', + self.service_log.host, + '--service', + 'cinder-api', + '--log-prefix', + 'cinder_test.api.common', ] verifylist = [ ('level', 'ERROR'), @@ -176,19 +200,25 @@ class TestBlockStorageLogLevelSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.32 or greater is required', str(exc)) + '--os-volume-api-version 3.32 or greater is required', str(exc) + ) def test_block_storage_log_level_set_invalid_service_name(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ 'ERROR', - '--host', self.service_log.host, - '--service', 'nova-api', - '--log-prefix', 'cinder.api.common', + '--host', + self.service_log.host, + '--service', + 'nova-api', + '--log-prefix', + 'cinder.api.common', ] verifylist = [ ('level', 'ERROR'), @@ -197,18 +227,27 @@ class TestBlockStorageLogLevelSet(TestService): ('log_prefix', 'cinder.api.common'), ] - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) @ddt.data('WARNING', 'info', 'Error', 'debuG', 'fake-log-level') def test_block_storage_log_level_set_log_level(self, log_level): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ log_level, - '--host', self.service_log.host, - '--service', 'cinder-api', - '--log-prefix', 'cinder.api.common', + '--host', + self.service_log.host, + '--service', + 'cinder-api', + '--log-prefix', + 'cinder.api.common', ] verifylist = [ ('level', log_level.upper()), @@ -218,8 +257,13 @@ class TestBlockStorageLogLevelSet(TestService): ] if log_level == 'fake-log-level': - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) else: parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -230,4 +274,5 @@ class TestBlockStorageLogLevelSet(TestService): level=log_level.upper(), server=self.service_log.host, binary=self.service_log.binary, - prefix=self.service_log.prefix) + prefix=self.service_log.prefix, + ) diff --git a/openstackclient/tests/unit/volume/v3/test_block_storage_manage.py b/openstackclient/tests/unit/volume/v3/test_block_storage_manage.py index afd0fd35..27a7bf35 100644 --- a/openstackclient/tests/unit/volume/v3/test_block_storage_manage.py +++ b/openstackclient/tests/unit/volume/v3/test_block_storage_manage.py @@ -21,7 +21,6 @@ from openstackclient.volume.v3 import block_storage_manage class TestBlockStorageManage(v2_volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -32,22 +31,24 @@ class TestBlockStorageManage(v2_volume_fakes.TestVolume): class TestBlockStorageVolumeManage(TestBlockStorageManage): - volume_manage_list = volume_fakes.create_volume_manage_list_records() def setUp(self): super().setUp() self.volumes_mock.list_manageable.return_value = ( - self.volume_manage_list) + self.volume_manage_list + ) # Get the command object to test self.cmd = block_storage_manage.BlockStorageManageVolumes( - self.app, None) + self.app, None + ) def test_block_storage_volume_manage_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.8') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.8' + ) host = 'fake_host' arglist = [ host, @@ -108,51 +109,65 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.8 or greater is required', str(exc)) + '--os-volume-api-version 3.8 or greater is required', str(exc) + ) def test_block_storage_volume_manage_pre_317(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.16') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.16' + ) cluster = 'fake_cluster' arglist = [ - '--cluster', cluster, + '--cluster', + cluster, ] verifylist = [ ('cluster', cluster), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.17 or greater is required', str(exc)) + '--os-volume-api-version 3.17 or greater is required', str(exc) + ) self.assertIn('--cluster', str(exc)) def test_block_storage_volume_manage_host_and_cluster(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.17') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.17' + ) host = 'fake_host' cluster = 'fake_cluster' arglist = [ host, - '--cluster', cluster, + '--cluster', + cluster, ] verifylist = [ ('host', host), ('cluster', cluster), ] - exc = self.assertRaises(tests_utils.ParserException, - self.check_parser, self.cmd, - arglist, verifylist) + exc = self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) self.assertIn( - 'argument --cluster: not allowed with argument <host>', str(exc)) + 'argument --cluster: not allowed with argument <host>', str(exc) + ) def test_block_storage_volume_manage_list_all_args(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.8') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.8' + ) host = 'fake_host' detailed = True marker = 'fake_marker' @@ -161,11 +176,16 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage): sort = 'size:asc' arglist = [ host, - '--detailed', str(detailed), - '--marker', marker, - '--limit', limit, - '--offset', offset, - '--sort', sort, + '--detailed', + str(detailed), + '--marker', + marker, + '--limit', + limit, + '--offset', + offset, + '--sort', + sort, ] verifylist = [ ('host', host), @@ -220,22 +240,24 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage): class TestBlockStorageSnapshotManage(TestBlockStorageManage): - snapshot_manage_list = volume_fakes.create_snapshot_manage_list_records() def setUp(self): super().setUp() self.snapshots_mock.list_manageable.return_value = ( - self.snapshot_manage_list) + self.snapshot_manage_list + ) # Get the command object to test self.cmd = block_storage_manage.BlockStorageManageSnapshots( - self.app, None) + self.app, None + ) def test_block_storage_snapshot_manage_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.8') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.8' + ) host = 'fake_host' arglist = [ host, @@ -298,51 +320,65 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.8 or greater is required', str(exc)) + '--os-volume-api-version 3.8 or greater is required', str(exc) + ) def test_block_storage_volume_manage_pre_317(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.16') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.16' + ) cluster = 'fake_cluster' arglist = [ - '--cluster', cluster, + '--cluster', + cluster, ] verifylist = [ ('cluster', cluster), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - exc = self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + exc = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.17 or greater is required', str(exc)) + '--os-volume-api-version 3.17 or greater is required', str(exc) + ) self.assertIn('--cluster', str(exc)) def test_block_storage_volume_manage_host_and_cluster(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.17') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.17' + ) host = 'fake_host' cluster = 'fake_cluster' arglist = [ host, - '--cluster', cluster, + '--cluster', + cluster, ] verifylist = [ ('host', host), ('cluster', cluster), ] - exc = self.assertRaises(tests_utils.ParserException, - self.check_parser, self.cmd, - arglist, verifylist) + exc = self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) self.assertIn( - 'argument --cluster: not allowed with argument <host>', str(exc)) + 'argument --cluster: not allowed with argument <host>', str(exc) + ) def test_block_storage_volume_manage_list_all_args(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.8') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.8' + ) host = 'fake_host' detailed = True marker = 'fake_marker' @@ -351,11 +387,16 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage): sort = 'size:asc' arglist = [ host, - '--detailed', str(detailed), - '--marker', marker, - '--limit', limit, - '--offset', offset, - '--sort', sort, + '--detailed', + str(detailed), + '--marker', + marker, + '--limit', + limit, + '--offset', + offset, + '--sort', + sort, ] verifylist = [ ('host', host), diff --git a/openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py b/openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py index 086339ff..782da15d 100644 --- a/openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py +++ b/openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py @@ -18,34 +18,38 @@ from openstackclient.volume.v3 import block_storage_resource_filter class TestBlockStorageResourceFilter(volume_fakes.TestVolume): - def setUp(self): super().setUp() # Get a shortcut to the ResourceFilterManager Mock - self.resource_filter_mock = \ + self.resource_filter_mock = ( self.app.client_manager.volume.resource_filters + ) self.resource_filter_mock.reset_mock() class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter): - # The resource filters to be listed fake_resource_filters = volume_fakes.create_resource_filters() def setUp(self): super().setUp() - self.resource_filter_mock.list.return_value = \ + self.resource_filter_mock.list.return_value = ( self.fake_resource_filters + ) # Get the command object to test - self.cmd = block_storage_resource_filter\ - .ListBlockStorageResourceFilter(self.app, None) + self.cmd = ( + block_storage_resource_filter.ListBlockStorageResourceFilter( + self.app, None + ) + ) def test_resource_filter_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.33') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.33' + ) arglist = [] verifylist = [] @@ -56,7 +60,8 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter): ( resource_filter.resource, resource_filter.filters, - ) for resource_filter in self.fake_resource_filters + ) + for resource_filter in self.fake_resource_filters ) columns, data = self.cmd.take_action(parsed_args) @@ -67,39 +72,44 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter): self.resource_filter_mock.list.assert_called_with() def test_resource_filter_list_pre_v333(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [] verifylist = [] parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.33 or greater is required', str(exc)) + '--os-volume-api-version 3.33 or greater is required', str(exc) + ) class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter): - # The resource filters to be listed fake_resource_filter = volume_fakes.create_one_resource_filter() def setUp(self): super().setUp() - self.resource_filter_mock.list.return_value = \ - iter([self.fake_resource_filter]) + self.resource_filter_mock.list.return_value = iter( + [self.fake_resource_filter] + ) # Get the command object to test - self.cmd = block_storage_resource_filter\ - .ShowBlockStorageResourceFilter(self.app, None) + self.cmd = ( + block_storage_resource_filter.ShowBlockStorageResourceFilter( + self.app, None + ) + ) def test_resource_filter_show(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.33') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.33' + ) arglist = [ self.fake_resource_filter.resource, @@ -123,8 +133,9 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter): self.resource_filter_mock.list.assert_called_with(resource='volume') def test_resource_filter_show_pre_v333(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.32') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.32' + ) arglist = [ self.fake_resource_filter.resource, @@ -135,8 +146,8 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.33 or greater is required', str(exc)) + '--os-volume-api-version 3.33 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_volume.py b/openstackclient/tests/unit/volume/v3/test_volume.py index ed72bfa1..507edc42 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume.py +++ b/openstackclient/tests/unit/volume/v3/test_volume.py @@ -25,7 +25,6 @@ from openstackclient.volume.v3 import volume class TestVolumeSummary(volume_fakes.TestVolume): - columns = [ 'Total Count', 'Total Size', @@ -41,15 +40,18 @@ class TestVolumeSummary(volume_fakes.TestVolume): self.return_dict = { 'volume-summary': { 'total_count': 2, - 'total_size': self.mock_vol_1.size + self.mock_vol_2.size}} + 'total_size': self.mock_vol_1.size + self.mock_vol_2.size, + } + } self.volumes_mock.summary.return_value = self.return_dict # Get the command object to test self.cmd = volume.VolumeSummary(self.app, None) def test_volume_summary(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.12') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.12' + ) arglist = [ '--all-projects', ] @@ -66,9 +68,7 @@ class TestVolumeSummary(volume_fakes.TestVolume): self.assertEqual(self.columns, columns) - datalist = ( - 2, - self.mock_vol_1.size + self.mock_vol_2.size) + datalist = (2, self.mock_vol_1.size + self.mock_vol_2.size) self.assertCountEqual(datalist, tuple(data)) def test_volume_summary_pre_312(self): @@ -81,16 +81,16 @@ class TestVolumeSummary(volume_fakes.TestVolume): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.12 or greater is required', - str(exc)) + '--os-volume-api-version 3.12 or greater is required', str(exc) + ) def test_volume_summary_with_metadata(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.36') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.36' + ) combine_meta = {**self.mock_vol_1.metadata, **self.mock_vol_2.metadata} meta_dict = copy.deepcopy(self.return_dict) @@ -119,12 +119,12 @@ class TestVolumeSummary(volume_fakes.TestVolume): datalist = ( 2, self.mock_vol_1.size + self.mock_vol_2.size, - format_columns.DictColumn(combine_meta)) + format_columns.DictColumn(combine_meta), + ) self.assertCountEqual(datalist, tuple(data)) class TestVolumeRevertToSnapshot(volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -134,7 +134,8 @@ class TestVolumeRevertToSnapshot(volume_fakes.TestVolume): self.snapshots_mock.reset_mock() self.mock_volume = volume_fakes.create_one_volume() self.mock_snapshot = volume_fakes.create_one_snapshot( - attrs={'volume_id': self.volumes_mock.id}) + attrs={'volume_id': self.volumes_mock.id} + ) # Get the command object to test self.cmd = volume.VolumeRevertToSnapshot(self.app, None) @@ -149,16 +150,16 @@ class TestVolumeRevertToSnapshot(volume_fakes.TestVolume): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.40 or greater is required', - str(exc)) + '--os-volume-api-version 3.40 or greater is required', str(exc) + ) def test_volume_revert_to_snapshot(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.40') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.40' + ) arglist = [ self.mock_snapshot.id, ] @@ -168,8 +169,9 @@ class TestVolumeRevertToSnapshot(volume_fakes.TestVolume): parsed_args = self.check_parser(self.cmd, arglist, verifylist) find_mock_result = [self.mock_snapshot, self.mock_volume] - with mock.patch.object(utils, 'find_resource', - side_effect=find_mock_result) as find_mock: + with mock.patch.object( + utils, 'find_resource', side_effect=find_mock_result + ) as find_mock: self.cmd.take_action(parsed_args) self.volumes_mock.revert_to_snapshot.assert_called_once_with( diff --git a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py index c0bf5ae7..783f4552 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py @@ -21,15 +21,15 @@ from openstackclient.volume.v3 import volume_attachment class TestVolumeAttachment(volume_fakes.TestVolume): - def setUp(self): super().setUp() self.volumes_mock = self.app.client_manager.volume.volumes self.volumes_mock.reset_mock() - self.volume_attachments_mock = \ + self.volume_attachments_mock = ( self.app.client_manager.volume.attachments + ) self.volume_attachments_mock.reset_mock() self.projects_mock = self.app.client_manager.identity.projects @@ -40,7 +40,6 @@ class TestVolumeAttachment(volume_fakes.TestVolume): class TestVolumeAttachmentCreate(TestVolumeAttachment): - volume = volume_fakes.create_one_volume() server = compute_fakes.FakeServer.create_one_server() volume_attachment = volume_fakes.create_one_volume_attachment( @@ -74,14 +73,16 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): self.volumes_mock.get.return_value = self.volume self.servers_mock.get.return_value = self.server # VolumeAttachmentManager.create returns a dict - self.volume_attachments_mock.create.return_value = \ + self.volume_attachments_mock.create.return_value = ( self.volume_attachment.to_dict() + ) self.cmd = volume_attachment.CreateVolumeAttachment(self.app, None) def test_volume_attachment_create(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.27') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.27' + ) arglist = [ self.volume.id, @@ -107,27 +108,38 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): self.volumes_mock.get.assert_called_once_with(self.volume.id) self.servers_mock.get.assert_called_once_with(self.server.id) self.volume_attachments_mock.create.assert_called_once_with( - self.volume.id, {}, self.server.id, None, + self.volume.id, + {}, + self.server.id, + None, ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_attachment_create_with_connect(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.54') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.54' + ) arglist = [ self.volume.id, self.server.id, '--connect', - '--initiator', 'iqn.1993-08.org.debian:01:cad181614cec', - '--ip', '192.168.1.20', - '--host', 'my-host', - '--platform', 'x86_64', - '--os-type', 'linux2', + '--initiator', + 'iqn.1993-08.org.debian:01:cad181614cec', + '--ip', + '192.168.1.20', + '--host', + 'my-host', + '--platform', + 'x86_64', + '--os-type', + 'linux2', '--multipath', - '--mountpoint', '/dev/vdb', - '--mode', 'null', + '--mountpoint', + '/dev/vdb', + '--mode', + 'null', ] verifylist = [ ('volume', self.volume.id), @@ -146,27 +158,33 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): columns, data = self.cmd.take_action(parsed_args) - connect_info = dict([ - ('initiator', 'iqn.1993-08.org.debian:01:cad181614cec'), - ('ip', '192.168.1.20'), - ('host', 'my-host'), - ('platform', 'x86_64'), - ('os_type', 'linux2'), - ('multipath', True), - ('mountpoint', '/dev/vdb'), - ]) + connect_info = dict( + [ + ('initiator', 'iqn.1993-08.org.debian:01:cad181614cec'), + ('ip', '192.168.1.20'), + ('host', 'my-host'), + ('platform', 'x86_64'), + ('os_type', 'linux2'), + ('multipath', True), + ('mountpoint', '/dev/vdb'), + ] + ) self.volumes_mock.get.assert_called_once_with(self.volume.id) self.servers_mock.get.assert_called_once_with(self.server.id) self.volume_attachments_mock.create.assert_called_once_with( - self.volume.id, connect_info, self.server.id, 'null', + self.volume.id, + connect_info, + self.server.id, + 'null', ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_attachment_create_pre_v327(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.26') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.26' + ) arglist = [ self.volume.id, @@ -179,21 +197,22 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.27 or greater is required', - str(exc)) + '--os-volume-api-version 3.27 or greater is required', str(exc) + ) def test_volume_attachment_create_with_mode_pre_v354(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.53') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.53' + ) arglist = [ self.volume.id, self.server.id, - '--mode', 'rw', + '--mode', + 'rw', ] verifylist = [ ('volume', self.volume.id), @@ -203,21 +222,22 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.54 or greater is required', - str(exc)) + '--os-volume-api-version 3.54 or greater is required', str(exc) + ) def test_volume_attachment_create_with_connect_missing_arg(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.54') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.54' + ) arglist = [ self.volume.id, self.server.id, - '--initiator', 'iqn.1993-08.org.debian:01:cad181614cec', + '--initiator', + 'iqn.1993-08.org.debian:01:cad181614cec', ] verifylist = [ ('volume', self.volume.id), @@ -228,16 +248,14 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - 'You must specify the --connect option for any', - str(exc)) + 'You must specify the --connect option for any', str(exc) + ) class TestVolumeAttachmentDelete(TestVolumeAttachment): - volume_attachment = volume_fakes.create_one_volume_attachment() def setUp(self): @@ -248,8 +266,9 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment): self.cmd = volume_attachment.DeleteVolumeAttachment(self.app, None) def test_volume_attachment_delete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.27') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.27' + ) arglist = [ self.volume_attachment.id, @@ -267,8 +286,9 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment): self.assertIsNone(result) def test_volume_attachment_delete_pre_v327(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.26') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.26' + ) arglist = [ self.volume_attachment.id, @@ -279,16 +299,14 @@ class TestVolumeAttachmentDelete(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.27 or greater is required', - str(exc)) + '--os-volume-api-version 3.27 or greater is required', str(exc) + ) class TestVolumeAttachmentSet(TestVolumeAttachment): - volume_attachment = volume_fakes.create_one_volume_attachment() columns = ( @@ -315,24 +333,32 @@ class TestVolumeAttachmentSet(TestVolumeAttachment): def setUp(self): super().setUp() - self.volume_attachments_mock.update.return_value = \ + self.volume_attachments_mock.update.return_value = ( self.volume_attachment + ) self.cmd = volume_attachment.SetVolumeAttachment(self.app, None) def test_volume_attachment_set(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.27') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.27' + ) arglist = [ self.volume_attachment.id, - '--initiator', 'iqn.1993-08.org.debian:01:cad181614cec', - '--ip', '192.168.1.20', - '--host', 'my-host', - '--platform', 'x86_64', - '--os-type', 'linux2', + '--initiator', + 'iqn.1993-08.org.debian:01:cad181614cec', + '--ip', + '192.168.1.20', + '--host', + 'my-host', + '--platform', + 'x86_64', + '--os-type', + 'linux2', '--multipath', - '--mountpoint', '/dev/vdb', + '--mountpoint', + '/dev/vdb', ] verifylist = [ ('attachment', self.volume_attachment.id), @@ -348,29 +374,34 @@ class TestVolumeAttachmentSet(TestVolumeAttachment): columns, data = self.cmd.take_action(parsed_args) - connect_info = dict([ - ('initiator', 'iqn.1993-08.org.debian:01:cad181614cec'), - ('ip', '192.168.1.20'), - ('host', 'my-host'), - ('platform', 'x86_64'), - ('os_type', 'linux2'), - ('multipath', True), - ('mountpoint', '/dev/vdb'), - ]) + connect_info = dict( + [ + ('initiator', 'iqn.1993-08.org.debian:01:cad181614cec'), + ('ip', '192.168.1.20'), + ('host', 'my-host'), + ('platform', 'x86_64'), + ('os_type', 'linux2'), + ('multipath', True), + ('mountpoint', '/dev/vdb'), + ] + ) self.volume_attachments_mock.update.assert_called_once_with( - self.volume_attachment.id, connect_info, + self.volume_attachment.id, + connect_info, ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_attachment_set_pre_v327(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.26') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.26' + ) arglist = [ self.volume_attachment.id, - '--initiator', 'iqn.1993-08.org.debian:01:cad181614cec', + '--initiator', + 'iqn.1993-08.org.debian:01:cad181614cec', ] verifylist = [ ('attachment', self.volume_attachment.id), @@ -379,16 +410,14 @@ class TestVolumeAttachmentSet(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.27 or greater is required', - str(exc)) + '--os-volume-api-version 3.27 or greater is required', str(exc) + ) class TestVolumeAttachmentComplete(TestVolumeAttachment): - volume_attachment = volume_fakes.create_one_volume_attachment() def setUp(self): @@ -399,8 +428,9 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment): self.cmd = volume_attachment.CompleteVolumeAttachment(self.app, None) def test_volume_attachment_complete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.44') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.44' + ) arglist = [ self.volume_attachment.id, @@ -418,8 +448,9 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment): self.assertIsNone(result) def test_volume_attachment_complete_pre_v344(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.43') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.43' + ) arglist = [ self.volume_attachment.id, @@ -430,16 +461,14 @@ class TestVolumeAttachmentComplete(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.44 or greater is required', - str(exc)) + '--os-volume-api-version 3.44 or greater is required', str(exc) + ) class TestVolumeAttachmentList(TestVolumeAttachment): - project = identity_fakes.FakeProject.create_one_project() volume_attachments = volume_fakes.create_volume_attachments() @@ -455,21 +484,24 @@ class TestVolumeAttachmentList(TestVolumeAttachment): volume_attachment.volume_id, volume_attachment.instance, volume_attachment.status, - ) for volume_attachment in volume_attachments + ) + for volume_attachment in volume_attachments ] def setUp(self): super().setUp() self.projects_mock.get.return_value = self.project - self.volume_attachments_mock.list.return_value = \ + self.volume_attachments_mock.list.return_value = ( self.volume_attachments + ) self.cmd = volume_attachment.ListVolumeAttachment(self.app, None) def test_volume_attachment_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.27') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.27' + ) arglist = [] verifylist = [ @@ -498,15 +530,21 @@ class TestVolumeAttachmentList(TestVolumeAttachment): self.assertCountEqual(tuple(self.data), data) def test_volume_attachment_list_with_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.27') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.27' + ) arglist = [ - '--project', self.project.name, - '--volume-id', 'volume-id', - '--status', 'attached', - '--marker', 'volume-attachment-id', - '--limit', '2', + '--project', + self.project.name, + '--volume-id', + 'volume-id', + '--status', + 'attached', + '--marker', + 'volume-attachment-id', + '--limit', + '2', ] verifylist = [ ('project', self.project.name), @@ -534,8 +572,9 @@ class TestVolumeAttachmentList(TestVolumeAttachment): self.assertCountEqual(tuple(self.data), data) def test_volume_attachment_list_pre_v327(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.26') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.26' + ) arglist = [] verifylist = [ @@ -549,9 +588,8 @@ class TestVolumeAttachmentList(TestVolumeAttachment): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.27 or greater is required', - str(exc)) + '--os-volume-api-version 3.27 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_volume_group.py b/openstackclient/tests/unit/volume/v3/test_volume_group.py index 78717de8..e79eefb5 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_group.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_group.py @@ -21,27 +21,27 @@ from openstackclient.volume.v3 import volume_group class TestVolumeGroup(volume_fakes.TestVolume): - def setUp(self): super().setUp() self.volume_groups_mock = self.app.client_manager.volume.groups self.volume_groups_mock.reset_mock() - self.volume_group_types_mock = \ + self.volume_group_types_mock = ( self.app.client_manager.volume.group_types + ) self.volume_group_types_mock.reset_mock() self.volume_types_mock = self.app.client_manager.volume.volume_types self.volume_types_mock.reset_mock() - self.volume_group_snapshots_mock = \ + self.volume_group_snapshots_mock = ( self.app.client_manager.volume.group_snapshots + ) self.volume_group_snapshots_mock.reset_mock() class TestVolumeGroupCreate(TestVolumeGroup): - fake_volume_type = volume_fakes.create_one_volume_type() fake_volume_group_type = volume_fakes.create_one_volume_group_type() fake_volume_group = volume_fakes.create_one_volume_group( @@ -50,8 +50,9 @@ class TestVolumeGroupCreate(TestVolumeGroup): 'volume_types': [fake_volume_type.id], }, ) - fake_volume_group_snapshot = \ + fake_volume_group_snapshot = ( volume_fakes.create_one_volume_group_snapshot() + ) columns = ( 'ID', @@ -84,24 +85,30 @@ class TestVolumeGroupCreate(TestVolumeGroup): super().setUp() self.volume_types_mock.get.return_value = self.fake_volume_type - self.volume_group_types_mock.get.return_value = \ + self.volume_group_types_mock.get.return_value = ( self.fake_volume_group_type + ) self.volume_groups_mock.create.return_value = self.fake_volume_group self.volume_groups_mock.get.return_value = self.fake_volume_group - self.volume_groups_mock.create_from_src.return_value = \ + self.volume_groups_mock.create_from_src.return_value = ( self.fake_volume_group - self.volume_group_snapshots_mock.get.return_value = \ + ) + self.volume_group_snapshots_mock.get.return_value = ( self.fake_volume_group_snapshot + ) self.cmd = volume_group.CreateVolumeGroup(self.app, None) def test_volume_group_create(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ - '--volume-group-type', self.fake_volume_group_type.id, - '--volume-type', self.fake_volume_type.id, + '--volume-group-type', + self.fake_volume_group_type.id, + '--volume-type', + self.fake_volume_type.id, ] verifylist = [ ('volume_group_type', self.fake_volume_group_type.id), @@ -115,9 +122,11 @@ class TestVolumeGroupCreate(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.get.assert_called_once_with( - self.fake_volume_group_type.id) + self.fake_volume_group_type.id + ) self.volume_types_mock.get.assert_called_once_with( - self.fake_volume_type.id) + self.fake_volume_type.id + ) self.volume_groups_mock.create.assert_called_once_with( self.fake_volume_group_type.id, self.fake_volume_type.id, @@ -129,8 +138,9 @@ class TestVolumeGroupCreate(TestVolumeGroup): self.assertCountEqual(self.data, data) def test_volume_group_create__legacy(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ self.fake_volume_group_type.id, @@ -149,9 +159,11 @@ class TestVolumeGroupCreate(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.get.assert_called_once_with( - self.fake_volume_group_type.id) + self.fake_volume_group_type.id + ) self.volume_types_mock.get.assert_called_once_with( - self.fake_volume_type.id) + self.fake_volume_type.id + ) self.volume_groups_mock.create.assert_called_once_with( self.fake_volume_group_type.id, self.fake_volume_type.id, @@ -168,11 +180,13 @@ class TestVolumeGroupCreate(TestVolumeGroup): ) def test_volume_group_create_no_volume_type(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ - '--volume-group-type', self.fake_volume_group_type.id, + '--volume-group-type', + self.fake_volume_group_type.id, ] verifylist = [ ('volume_group_type', self.fake_volume_group_type.id), @@ -183,23 +197,28 @@ class TestVolumeGroupCreate(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--volume-types is a required argument when creating ', - str(exc)) + '--volume-types is a required argument when creating ', str(exc) + ) def test_volume_group_create_with_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ - '--volume-group-type', self.fake_volume_group_type.id, - '--volume-type', self.fake_volume_type.id, - '--name', 'foo', - '--description', 'hello, world', - '--availability-zone', 'bar', + '--volume-group-type', + self.fake_volume_group_type.id, + '--volume-type', + self.fake_volume_type.id, + '--name', + 'foo', + '--description', + 'hello, world', + '--availability-zone', + 'bar', ] verifylist = [ ('volume_group_type', self.fake_volume_group_type.id), @@ -213,9 +232,11 @@ class TestVolumeGroupCreate(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.get.assert_called_once_with( - self.fake_volume_group_type.id) + self.fake_volume_group_type.id + ) self.volume_types_mock.get.assert_called_once_with( - self.fake_volume_type.id) + self.fake_volume_type.id + ) self.volume_groups_mock.create.assert_called_once_with( self.fake_volume_group_type.id, self.fake_volume_type.id, @@ -227,12 +248,15 @@ class TestVolumeGroupCreate(TestVolumeGroup): self.assertCountEqual(self.data, data) def test_volume_group_create_pre_v313(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.12') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.12' + ) arglist = [ - '--volume-group-type', self.fake_volume_group_type.id, - '--volume-type', self.fake_volume_type.id, + '--volume-group-type', + self.fake_volume_group_type.id, + '--volume-type', + self.fake_volume_type.id, ] verifylist = [ ('volume_group_type', self.fake_volume_group_type.id), @@ -244,19 +268,20 @@ class TestVolumeGroupCreate(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.13 or greater is required', - str(exc)) + '--os-volume-api-version 3.13 or greater is required', str(exc) + ) def test_volume_group_create_from_source_group(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ - '--source-group', self.fake_volume_group.id, + '--source-group', + self.fake_volume_group.id, ] verifylist = [ ('source_group', self.fake_volume_group.id), @@ -266,8 +291,11 @@ class TestVolumeGroupCreate(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_groups_mock.get.assert_has_calls( - [mock.call(self.fake_volume_group.id), - mock.call(self.fake_volume_group.id)]) + [ + mock.call(self.fake_volume_group.id), + mock.call(self.fake_volume_group.id), + ] + ) self.volume_groups_mock.create_from_src.assert_called_once_with( None, self.fake_volume_group.id, @@ -278,11 +306,13 @@ class TestVolumeGroupCreate(TestVolumeGroup): self.assertCountEqual(self.data, data) def test_volume_group_create_from_group_snapshot(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ - '--group-snapshot', self.fake_volume_group_snapshot.id, + '--group-snapshot', + self.fake_volume_group_snapshot.id, ] verifylist = [ ('group_snapshot', self.fake_volume_group_snapshot.id), @@ -292,9 +322,11 @@ class TestVolumeGroupCreate(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_group_snapshots_mock.get.assert_called_once_with( - self.fake_volume_group_snapshot.id) + self.fake_volume_group_snapshot.id + ) self.volume_groups_mock.get.assert_called_once_with( - self.fake_volume_group.id) + self.fake_volume_group.id + ) self.volume_groups_mock.create_from_src.assert_called_once_with( self.fake_volume_group_snapshot.id, None, @@ -305,11 +337,13 @@ class TestVolumeGroupCreate(TestVolumeGroup): self.assertCountEqual(self.data, data) def test_volume_group_create_from_src_pre_v314(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ - '--source-group', self.fake_volume_group.id, + '--source-group', + self.fake_volume_group.id, ] verifylist = [ ('source_group', self.fake_volume_group.id), @@ -317,38 +351,42 @@ class TestVolumeGroupCreate(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.14 or greater is required', - str(exc)) + '--os-volume-api-version 3.14 or greater is required', str(exc) + ) def test_volume_group_create_from_src_source_group_group_snapshot(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ - '--source-group', self.fake_volume_group.id, - '--group-snapshot', self.fake_volume_group_snapshot.id, + '--source-group', + self.fake_volume_group.id, + '--group-snapshot', + self.fake_volume_group_snapshot.id, ] verifylist = [ ('source_group', self.fake_volume_group.id), ('group_snapshot', self.fake_volume_group_snapshot.id), ] - exc = self.assertRaises(tests_utils.ParserException, - self.check_parser, - self.cmd, - arglist, - verifylist) + exc = self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) self.assertIn( '--group-snapshot: not allowed with argument --source-group', - str(exc)) + str(exc), + ) class TestVolumeGroupDelete(TestVolumeGroup): - fake_volume_group = volume_fakes.create_one_volume_group() def setUp(self): @@ -360,8 +398,9 @@ class TestVolumeGroupDelete(TestVolumeGroup): self.cmd = volume_group.DeleteVolumeGroup(self.app, None) def test_volume_group_delete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ self.fake_volume_group.id, @@ -376,13 +415,15 @@ class TestVolumeGroupDelete(TestVolumeGroup): result = self.cmd.take_action(parsed_args) self.volume_groups_mock.delete.assert_called_once_with( - self.fake_volume_group.id, delete_volumes=True, + self.fake_volume_group.id, + delete_volumes=True, ) self.assertIsNone(result) def test_volume_group_delete_pre_v313(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.12') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.12' + ) arglist = [ self.fake_volume_group.id, @@ -394,16 +435,14 @@ class TestVolumeGroupDelete(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.13 or greater is required', - str(exc)) + '--os-volume-api-version 3.13 or greater is required', str(exc) + ) class TestVolumeGroupSet(TestVolumeGroup): - fake_volume_group = volume_fakes.create_one_volume_group() columns = ( @@ -442,13 +481,16 @@ class TestVolumeGroupSet(TestVolumeGroup): self.cmd = volume_group.SetVolumeGroup(self.app, None) def test_volume_group_set(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ self.fake_volume_group.id, - '--name', 'foo', - '--description', 'hello, world', + '--name', + 'foo', + '--description', + 'hello, world', ] verifylist = [ ('group', self.fake_volume_group.id), @@ -460,14 +502,17 @@ class TestVolumeGroupSet(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_groups_mock.update.assert_called_once_with( - self.fake_volume_group.id, name='foo', description='hello, world', + self.fake_volume_group.id, + name='foo', + description='hello, world', ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_with_enable_replication_option(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.38') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.38' + ) arglist = [ self.fake_volume_group.id, @@ -482,18 +527,22 @@ class TestVolumeGroupSet(TestVolumeGroup): columns, data = self.cmd.take_action(parsed_args) self.volume_groups_mock.enable_replication.assert_called_once_with( - self.fake_volume_group.id) + self.fake_volume_group.id + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_set_pre_v313(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.12') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.12' + ) arglist = [ self.fake_volume_group.id, - '--name', 'foo', - '--description', 'hello, world', + '--name', + 'foo', + '--description', + 'hello, world', ] verifylist = [ ('group', self.fake_volume_group.id), @@ -503,16 +552,16 @@ class TestVolumeGroupSet(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.13 or greater is required', - str(exc)) + '--os-volume-api-version 3.13 or greater is required', str(exc) + ) def test_volume_group_with_enable_replication_option_pre_v338(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.37') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.37' + ) arglist = [ self.fake_volume_group.id, @@ -525,16 +574,14 @@ class TestVolumeGroupSet(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.38 or greater is required', - str(exc)) + '--os-volume-api-version 3.38 or greater is required', str(exc) + ) class TestVolumeGroupList(TestVolumeGroup): - fake_volume_groups = volume_fakes.create_volume_groups() columns = ( @@ -547,7 +594,8 @@ class TestVolumeGroupList(TestVolumeGroup): fake_volume_group.id, fake_volume_group.status, fake_volume_group.name, - ) for fake_volume_group in fake_volume_groups + ) + for fake_volume_group in fake_volume_groups ] def setUp(self): @@ -558,8 +606,9 @@ class TestVolumeGroupList(TestVolumeGroup): self.cmd = volume_group.ListVolumeGroup(self.app, None) def test_volume_group_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ '--all-projects', @@ -580,8 +629,9 @@ class TestVolumeGroupList(TestVolumeGroup): self.assertCountEqual(tuple(self.data), data) def test_volume_group_list_pre_v313(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.12') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.12' + ) arglist = [ '--all-projects', @@ -592,16 +642,14 @@ class TestVolumeGroupList(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.13 or greater is required', - str(exc)) + '--os-volume-api-version 3.13 or greater is required', str(exc) + ) class TestVolumeGroupFailover(TestVolumeGroup): - fake_volume_group = volume_fakes.create_one_volume_group() def setUp(self): @@ -613,13 +661,15 @@ class TestVolumeGroupFailover(TestVolumeGroup): self.cmd = volume_group.FailoverVolumeGroup(self.app, None) def test_volume_group_failover(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.38') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.38' + ) arglist = [ self.fake_volume_group.id, '--allow-attached-volume', - '--secondary-backend-id', 'foo', + '--secondary-backend-id', + 'foo', ] verifylist = [ ('group', self.fake_volume_group.id), @@ -638,13 +688,15 @@ class TestVolumeGroupFailover(TestVolumeGroup): self.assertIsNone(result) def test_volume_group_failover_pre_v338(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.37') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.37' + ) arglist = [ self.fake_volume_group.id, '--allow-attached-volume', - '--secondary-backend-id', 'foo', + '--secondary-backend-id', + 'foo', ] verifylist = [ ('group', self.fake_volume_group.id), @@ -654,9 +706,8 @@ class TestVolumeGroupFailover(TestVolumeGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.38 or greater is required', - str(exc)) + '--os-volume-api-version 3.38 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py b/openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py index 2a5a30f0..664e56e6 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_group_snapshot.py @@ -18,23 +18,23 @@ from openstackclient.volume.v3 import volume_group_snapshot class TestVolumeGroupSnapshot(volume_fakes.TestVolume): - def setUp(self): super().setUp() self.volume_groups_mock = self.app.client_manager.volume.groups self.volume_groups_mock.reset_mock() - self.volume_group_snapshots_mock = \ + self.volume_group_snapshots_mock = ( self.app.client_manager.volume.group_snapshots + ) self.volume_group_snapshots_mock.reset_mock() class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot): - fake_volume_group = volume_fakes.create_one_volume_group() - fake_volume_group_snapshot = \ + fake_volume_group_snapshot = ( volume_fakes.create_one_volume_group_snapshot() + ) columns = ( 'ID', @@ -57,17 +57,21 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot): super().setUp() self.volume_groups_mock.get.return_value = self.fake_volume_group - self.volume_group_snapshots_mock.create.return_value = \ + self.volume_group_snapshots_mock.create.return_value = ( self.fake_volume_group_snapshot - self.volume_group_snapshots_mock.get.return_value = \ + ) + self.volume_group_snapshots_mock.get.return_value = ( self.fake_volume_group_snapshot + ) self.cmd = volume_group_snapshot.CreateVolumeGroupSnapshot( - self.app, None) + self.app, None + ) def test_volume_group_snapshot_create(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ self.fake_volume_group.id, @@ -82,21 +86,27 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot): columns, data = self.cmd.take_action(parsed_args) self.volume_groups_mock.get.assert_called_once_with( - self.fake_volume_group.id) + self.fake_volume_group.id + ) self.volume_group_snapshots_mock.create.assert_called_once_with( - self.fake_volume_group.id, None, None, + self.fake_volume_group.id, + None, + None, ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_snapshot_create_with_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ self.fake_volume_group.id, - '--name', 'foo', - '--description', 'hello, world', + '--name', + 'foo', + '--description', + 'hello, world', ] verifylist = [ ('volume_group', self.fake_volume_group.id), @@ -108,16 +118,20 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot): columns, data = self.cmd.take_action(parsed_args) self.volume_groups_mock.get.assert_called_once_with( - self.fake_volume_group.id) + self.fake_volume_group.id + ) self.volume_group_snapshots_mock.create.assert_called_once_with( - self.fake_volume_group.id, 'foo', 'hello, world', + self.fake_volume_group.id, + 'foo', + 'hello, world', ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_snapshot_create_pre_v314(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ self.fake_volume_group.id, @@ -130,32 +144,34 @@ class TestVolumeGroupSnapshotCreate(TestVolumeGroupSnapshot): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.14 or greater is required', - str(exc)) + '--os-volume-api-version 3.14 or greater is required', str(exc) + ) class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot): - - fake_volume_group_snapshot = \ + fake_volume_group_snapshot = ( volume_fakes.create_one_volume_group_snapshot() + ) def setUp(self): super().setUp() - self.volume_group_snapshots_mock.get.return_value = \ + self.volume_group_snapshots_mock.get.return_value = ( self.fake_volume_group_snapshot + ) self.volume_group_snapshots_mock.delete.return_value = None self.cmd = volume_group_snapshot.DeleteVolumeGroupSnapshot( - self.app, None) + self.app, None + ) def test_volume_group_snapshot_delete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ self.fake_volume_group_snapshot.id, @@ -173,8 +189,9 @@ class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot): self.assertIsNone(result) def test_volume_group_snapshot_delete_pre_v314(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) arglist = [ self.fake_volume_group_snapshot.id, @@ -185,16 +202,14 @@ class TestVolumeGroupSnapshotDelete(TestVolumeGroupSnapshot): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.14 or greater is required', - str(exc)) + '--os-volume-api-version 3.14 or greater is required', str(exc) + ) class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot): - fake_volume_group_snapshots = volume_fakes.create_volume_group_snapshots() columns = ( @@ -207,21 +222,25 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot): fake_volume_group_snapshot.id, fake_volume_group_snapshot.status, fake_volume_group_snapshot.name, - ) for fake_volume_group_snapshot in fake_volume_group_snapshots + ) + for fake_volume_group_snapshot in fake_volume_group_snapshots ] def setUp(self): super().setUp() - self.volume_group_snapshots_mock.list.return_value = \ + self.volume_group_snapshots_mock.list.return_value = ( self.fake_volume_group_snapshots + ) self.cmd = volume_group_snapshot.ListVolumeGroupSnapshot( - self.app, None) + self.app, None + ) def test_volume_group_snapshot_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.14') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.14' + ) arglist = [ '--all-projects', @@ -242,20 +261,19 @@ class TestVolumeGroupSnapshotList(TestVolumeGroupSnapshot): self.assertCountEqual(tuple(self.data), data) def test_volume_group_snapshot_list_pre_v314(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.13') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.13' + ) - arglist = [ - ] + arglist = [] verifylist = [ ('all_projects', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.14 or greater is required', - str(exc)) + '--os-volume-api-version 3.14 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_volume_group_type.py b/openstackclient/tests/unit/volume/v3/test_volume_group_type.py index 34b4e501..7ea2a2da 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_group_type.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_group_type.py @@ -21,17 +21,16 @@ from openstackclient.volume.v3 import volume_group_type class TestVolumeGroupType(volume_fakes.TestVolume): - def setUp(self): super().setUp() - self.volume_group_types_mock = \ + self.volume_group_types_mock = ( self.app.client_manager.volume.group_types + ) self.volume_group_types_mock.reset_mock() class TestVolumeGroupTypeCreate(TestVolumeGroupType): - maxDiff = 2000 fake_volume_group_type = volume_fakes.create_one_volume_group_type() @@ -54,14 +53,16 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType): def setUp(self): super().setUp() - self.volume_group_types_mock.create.return_value = \ + self.volume_group_types_mock.create.return_value = ( self.fake_volume_group_type + ) self.cmd = volume_group_type.CreateVolumeGroupType(self.app, None) def test_volume_group_type_create(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ self.fake_volume_group_type.name, @@ -76,19 +77,20 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.create.assert_called_once_with( - self.fake_volume_group_type.name, - None, - True) + self.fake_volume_group_type.name, None, True + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_type_create_with_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ self.fake_volume_group_type.name, - '--description', 'foo', + '--description', + 'foo', '--private', ] verifylist = [ @@ -101,15 +103,15 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.create.assert_called_once_with( - self.fake_volume_group_type.name, - 'foo', - False) + self.fake_volume_group_type.name, 'foo', False + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_type_create_pre_v311(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.10') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.10' + ) arglist = [ self.fake_volume_group_type.name, @@ -122,30 +124,30 @@ class TestVolumeGroupTypeCreate(TestVolumeGroupType): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.11 or greater is required', - str(exc)) + '--os-volume-api-version 3.11 or greater is required', str(exc) + ) class TestVolumeGroupTypeDelete(TestVolumeGroupType): - fake_volume_group_type = volume_fakes.create_one_volume_group_type() def setUp(self): super().setUp() - self.volume_group_types_mock.get.return_value = \ + self.volume_group_types_mock.get.return_value = ( self.fake_volume_group_type + ) self.volume_group_types_mock.delete.return_value = None self.cmd = volume_group_type.DeleteVolumeGroupType(self.app, None) def test_volume_group_type_delete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ self.fake_volume_group_type.id, @@ -163,8 +165,9 @@ class TestVolumeGroupTypeDelete(TestVolumeGroupType): self.assertIsNone(result) def test_volume_group_type_delete_pre_v311(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.10') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.10' + ) arglist = [ self.fake_volume_group_type.id, @@ -175,16 +178,14 @@ class TestVolumeGroupTypeDelete(TestVolumeGroupType): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.11 or greater is required', - str(exc)) + '--os-volume-api-version 3.11 or greater is required', str(exc) + ) class TestVolumeGroupTypeSet(TestVolumeGroupType): - fake_volume_group_type = volume_fakes.create_one_volume_group_type( methods={ 'get_keys': {'foo': 'bar'}, @@ -211,25 +212,31 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType): def setUp(self): super().setUp() - self.volume_group_types_mock.get.return_value = \ + self.volume_group_types_mock.get.return_value = ( self.fake_volume_group_type - self.volume_group_types_mock.update.return_value = \ + ) + self.volume_group_types_mock.update.return_value = ( self.fake_volume_group_type + ) self.cmd = volume_group_type.SetVolumeGroupType(self.app, None) def test_volume_group_type_set(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) self.fake_volume_group_type.set_keys.return_value = None arglist = [ self.fake_volume_group_type.id, - '--name', 'foo', - '--description', 'hello, world', + '--name', + 'foo', + '--description', + 'hello, world', '--public', - '--property', 'fizz=buzz', + '--property', + 'fizz=buzz', ] verifylist = [ ('group_type', self.fake_volume_group_type.id), @@ -256,13 +263,15 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType): self.assertCountEqual(self.data, data) def test_volume_group_type_with_no_property_option(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ self.fake_volume_group_type.id, '--no-property', - '--property', 'fizz=buzz', + '--property', + 'fizz=buzz', ] verifylist = [ ('group_type', self.fake_volume_group_type.id), @@ -277,21 +286,26 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType): columns, data = self.cmd.take_action(parsed_args) self.volume_group_types_mock.get.assert_called_once_with( - self.fake_volume_group_type.id) + self.fake_volume_group_type.id + ) self.fake_volume_group_type.get_keys.assert_called_once_with() self.fake_volume_group_type.unset_keys.assert_called_once_with( - {'foo': 'bar'}.keys()) + {'foo': 'bar'}.keys() + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_type_set_pre_v311(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.10') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.10' + ) arglist = [ self.fake_volume_group_type.id, - '--name', 'foo', - '--description', 'hello, world', + '--name', + 'foo', + '--description', + 'hello, world', ] verifylist = [ ('group_type', self.fake_volume_group_type.id), @@ -304,16 +318,14 @@ class TestVolumeGroupTypeSet(TestVolumeGroupType): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.11 or greater is required', - str(exc)) + '--os-volume-api-version 3.11 or greater is required', str(exc) + ) class TestVolumeGroupTypeUnset(TestVolumeGroupType): - fake_volume_group_type = volume_fakes.create_one_volume_group_type( methods={'unset_keys': None}, ) @@ -336,18 +348,21 @@ class TestVolumeGroupTypeUnset(TestVolumeGroupType): def setUp(self): super().setUp() - self.volume_group_types_mock.get.return_value = \ + self.volume_group_types_mock.get.return_value = ( self.fake_volume_group_type + ) self.cmd = volume_group_type.UnsetVolumeGroupType(self.app, None) def test_volume_group_type_unset(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ self.fake_volume_group_type.id, - '--property', 'fizz', + '--property', + 'fizz', ] verifylist = [ ('group_type', self.fake_volume_group_type.id), @@ -357,22 +372,27 @@ class TestVolumeGroupTypeUnset(TestVolumeGroupType): columns, data = self.cmd.take_action(parsed_args) - self.volume_group_types_mock.get.assert_has_calls([ - mock.call(self.fake_volume_group_type.id), - mock.call(self.fake_volume_group_type.id), - ]) + self.volume_group_types_mock.get.assert_has_calls( + [ + mock.call(self.fake_volume_group_type.id), + mock.call(self.fake_volume_group_type.id), + ] + ) self.fake_volume_group_type.unset_keys.assert_called_once_with( - ['fizz']) + ['fizz'] + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) def test_volume_group_type_unset_pre_v311(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.10') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.10' + ) arglist = [ self.fake_volume_group_type.id, - '--property', 'fizz', + '--property', + 'fizz', ] verifylist = [ ('group_type', self.fake_volume_group_type.id), @@ -381,16 +401,14 @@ class TestVolumeGroupTypeUnset(TestVolumeGroupType): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.11 or greater is required', - str(exc)) + '--os-volume-api-version 3.11 or greater is required', str(exc) + ) class TestVolumeGroupTypeList(TestVolumeGroupType): - fake_volume_group_types = volume_fakes.create_volume_group_types() columns = ( @@ -405,25 +423,28 @@ class TestVolumeGroupTypeList(TestVolumeGroupType): fake_volume_group_type.name, fake_volume_group_type.is_public, fake_volume_group_type.group_specs, - ) for fake_volume_group_type in fake_volume_group_types + ) + for fake_volume_group_type in fake_volume_group_types ] def setUp(self): super().setUp() - self.volume_group_types_mock.list.return_value = \ + self.volume_group_types_mock.list.return_value = ( self.fake_volume_group_types - self.volume_group_types_mock.default.return_value = \ + ) + self.volume_group_types_mock.default.return_value = ( self.fake_volume_group_types[0] + ) self.cmd = volume_group_type.ListVolumeGroupType(self.app, None) def test_volume_group_type_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) - arglist = [ - ] + arglist = [] verifylist = [ ('show_default', False), ] @@ -436,8 +457,9 @@ class TestVolumeGroupTypeList(TestVolumeGroupType): self.assertCountEqual(tuple(self.data), data) def test_volume_group_type_list_with_default_option(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.11') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.11' + ) arglist = [ '--default', @@ -454,19 +476,17 @@ class TestVolumeGroupTypeList(TestVolumeGroupType): self.assertCountEqual(tuple([self.data[0]]), data) def test_volume_group_type_list_pre_v311(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.10') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.10' + ) - arglist = [ - ] - verifylist = [ - ] + arglist = [] + verifylist = [] parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.11 or greater is required', - str(exc)) + '--os-volume-api-version 3.11 or greater is required', str(exc) + ) diff --git a/openstackclient/tests/unit/volume/v3/test_volume_message.py b/openstackclient/tests/unit/volume/v3/test_volume_message.py index 45b0747e..652deb64 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_message.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_message.py @@ -21,7 +21,6 @@ from openstackclient.volume.v3 import volume_message class TestVolumeMessage(volume_fakes.TestVolume): - def setUp(self): super().setUp() @@ -33,7 +32,6 @@ class TestVolumeMessage(volume_fakes.TestVolume): class TestVolumeMessageDelete(TestVolumeMessage): - fake_messages = volume_fakes.create_volume_messages(count=2) def setUp(self): @@ -48,8 +46,9 @@ class TestVolumeMessageDelete(TestVolumeMessage): self.cmd = volume_message.DeleteMessage(self.app, None) def test_message_delete(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) arglist = [ self.fake_messages[0].id, @@ -62,12 +61,14 @@ class TestVolumeMessageDelete(TestVolumeMessage): result = self.cmd.take_action(parsed_args) self.volume_messages_mock.delete.assert_called_with( - self.fake_messages[0].id) + self.fake_messages[0].id + ) self.assertIsNone(result) def test_message_delete_multiple_messages(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) arglist = [ self.fake_messages[0].id, @@ -87,8 +88,9 @@ class TestVolumeMessageDelete(TestVolumeMessage): self.assertIsNone(result) def test_message_delete_multiple_messages_with_exception(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) arglist = [ self.fake_messages[0].id, @@ -101,22 +103,26 @@ class TestVolumeMessageDelete(TestVolumeMessage): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.volume_messages_mock.delete.side_effect = [ - self.fake_messages[0], exceptions.CommandError] + self.fake_messages[0], + exceptions.CommandError, + ] exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertEqual('Failed to delete 1 of 2 messages.', str(exc)) self.volume_messages_mock.delete.assert_any_call( - self.fake_messages[0].id) + self.fake_messages[0].id + ) self.volume_messages_mock.delete.assert_any_call('invalid_message') self.assertEqual(2, self.volume_messages_mock.delete.call_count) def test_message_delete_pre_v33(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.2') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.2' + ) arglist = [ self.fake_messages[0].id, @@ -127,16 +133,14 @@ class TestVolumeMessageDelete(TestVolumeMessage): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.3 or greater is required', - str(exc)) + '--os-volume-api-version 3.3 or greater is required', str(exc) + ) class TestVolumeMessageList(TestVolumeMessage): - fake_project = identity_fakes.FakeProject.create_one_project() fake_messages = volume_fakes.create_volume_messages(count=3) @@ -153,17 +157,19 @@ class TestVolumeMessageList(TestVolumeMessage): ) data = [] for fake_message in fake_messages: - data.append(( - fake_message.id, - fake_message.event_id, - fake_message.resource_type, - fake_message.resource_uuid, - fake_message.message_level, - fake_message.user_message, - fake_message.request_id, - fake_message.created_at, - fake_message.guaranteed_until, - )) + data.append( + ( + fake_message.id, + fake_message.event_id, + fake_message.resource_type, + fake_message.resource_uuid, + fake_message.message_level, + fake_message.user_message, + fake_message.request_id, + fake_message.created_at, + fake_message.guaranteed_until, + ) + ) def setUp(self): super().setUp() @@ -174,8 +180,9 @@ class TestVolumeMessageList(TestVolumeMessage): self.cmd = volume_message.ListMessages(self.app, None) def test_message_list(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) arglist = [] verifylist = [ @@ -199,13 +206,17 @@ class TestVolumeMessageList(TestVolumeMessage): self.assertCountEqual(self.data, list(data)) def test_message_list_with_options(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) arglist = [ - '--project', self.fake_project.name, - '--marker', self.fake_messages[0].id, - '--limit', '3', + '--project', + self.fake_project.name, + '--marker', + self.fake_messages[0].id, + '--limit', + '3', ] verifylist = [ ('project', self.fake_project.name), @@ -228,8 +239,9 @@ class TestVolumeMessageList(TestVolumeMessage): self.assertCountEqual(self.data, list(data)) def test_message_list_pre_v33(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.2') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.2' + ) arglist = [] verifylist = [ @@ -241,16 +253,14 @@ class TestVolumeMessageList(TestVolumeMessage): parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.3 or greater is required', - str(exc)) + '--os-volume-api-version 3.3 or greater is required', str(exc) + ) class TestVolumeMessageShow(TestVolumeMessage): - fake_message = volume_fakes.create_one_volume_message() columns = ( @@ -284,15 +294,12 @@ class TestVolumeMessageShow(TestVolumeMessage): self.cmd = volume_message.ShowMessage(self.app, None) def test_message_show(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.3') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.3' + ) - arglist = [ - self.fake_message.id - ] - verifylist = [ - ('message_id', self.fake_message.id) - ] + arglist = [self.fake_message.id] + verifylist = [('message_id', self.fake_message.id)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) @@ -302,21 +309,17 @@ class TestVolumeMessageShow(TestVolumeMessage): self.assertEqual(self.data, data) def test_message_show_pre_v33(self): - self.app.client_manager.volume.api_version = \ - api_versions.APIVersion('3.2') + self.app.client_manager.volume.api_version = api_versions.APIVersion( + '3.2' + ) - arglist = [ - self.fake_message.id - ] - verifylist = [ - ('message_id', self.fake_message.id) - ] + arglist = [self.fake_message.id] + verifylist = [('message_id', self.fake_message.id)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) exc = self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) self.assertIn( - '--os-volume-api-version 3.3 or greater is required', - str(exc)) + '--os-volume-api-version 3.3 or greater is required', str(exc) + ) |