trivial: Enable flake8-logging-format (G) rules

Change-Id: Iabc94a0fd40903dc2a81bf62aea8460f20a7e0e4
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

examples/common.py

@@ -264,7 +264,7 @@ def main(opts, run):
         if dump_stack_trace:
             _logger.error(traceback.format_exc(e))
         else:
-            _logger.error('Exception raised: ' + str(e))
+            _logger.error('Exception raised: %s', e)
         return 1
 
 

openstackclient/common/quota.py

@@ -272,7 +272,10 @@ def _list_quota_compute(self, parsed_args, project_ids):
                 sdk_exceptions.NotFoundException,
             ) as exc:
                 # Project not found, move on to next one
-                LOG.warning(f"Project {project_id} not found: {exc}")
+                LOG.warning(
+                    'Project %(project_id)s not found: %(exc)s',
+                    {'project_id': project_id, 'exc': exc},
+                )
                 continue
 
             project_result = _xform_get_quota(
@@ -334,7 +337,10 @@ def _list_quota_volume(self, parsed_args, project_ids):
                 sdk_exceptions.NotFoundException,
             ) as exc:
                 # Project not found, move on to next one
-                LOG.warning(f"Project {project_id} not found: {exc}")
+                LOG.warning(
+                    'Project %(project_id)s not found: %(exc)s',
+                    {'project_id': project_id, 'exc': exc},
+                )
                 continue
 
             project_result = _xform_get_quota(
@@ -389,7 +395,10 @@ def _list_quota_network(self, parsed_args, project_ids):
                 sdk_exceptions.ForbiddenException,
             ) as exc:
                 # Project not found, move on to next one
-                LOG.warning(f"Project {project_id} not found: {exc}")
+                LOG.warning(
+                    'Project %(project_id)s not found: %(exc)s',
+                    {'project_id': project_id, 'exc': exc},
+                )
                 continue
 
             project_result = _xform_get_quota(

openstackclient/compute/v2/server.py

@@ -5018,7 +5018,7 @@ def take_action(self, parsed_args):
         )
 
         cmd = ' '.join(['ssh', ip_address] + args)
-        LOG.debug(f"ssh command: {cmd}")
+        LOG.debug('ssh command: %s', cmd)
         # we intentionally pass through user-provided arguments and run this in
         # the user's shell
         os.system(cmd)  # noqa: S605

openstackclient/image/v2/image.py

@@ -622,7 +622,7 @@ def _take_action_volume(self, parsed_args):
                 )
                 # TODO(stephenfin): These should be an error in a future
                 # version
-                LOG.warning(msg % opt_name)
+                LOG.warning(msg, opt_name)
 
         source_volume = volume_client.find_volume(
             parsed_args.volume, ignore_missing=False

openstackclient/tests/unit/volume/v2/test_consistency_group.py

@@ -129,7 +129,10 @@ def test_add_multiple_volumes_to_consistency_group_with_exception(
             utils, 'find_resource', side_effect=find_mock_result
         ) as find_mock:
             result = self.cmd.take_action(parsed_args)
-            mock_error.assert_called_with("1 of 2 volumes failed to add.")
+            mock_error.assert_called_with(
+                '%(result)s of %(total)s volumes failed to add.',
+                {'result': 1, 'total': 2},
+            )
             self.assertIsNone(result)
             find_mock.assert_any_call(
                 self.consistencygroups_mock, self._consistency_group.id
@@ -602,7 +605,10 @@ def test_remove_multiple_volumes_from_consistency_group_with_exception(
             utils, 'find_resource', side_effect=find_mock_result
         ) as find_mock:
             result = self.cmd.take_action(parsed_args)
-            mock_error.assert_called_with("1 of 2 volumes failed to remove.")
+            mock_error.assert_called_with(
+                '%(result)s of %(total)s volumes failed to remove.',
+                {'result': 1, 'total': 2},
+            )
             self.assertIsNone(result)
             find_mock.assert_any_call(
                 self.consistencygroups_mock, self._consistency_group.id

openstackclient/tests/unit/volume/v2/test_volume.py

@@ -1618,7 +1618,8 @@ def test_volume_set_with_only_retype_policy(self, mock_warning):
         result = self.cmd.take_action(parsed_args)
         self.volumes_mock.retype.assert_not_called()
         mock_warning.assert_called_with(
-            "'--retype-policy' option will not work without '--type' option"
+            "'%s' option will not work without '--type' option",
+            '--retype-policy',
         )
         self.assertIsNone(result)
 

openstackclient/tests/unit/volume/v3/test_volume.py

@@ -1998,7 +1998,8 @@ def test_volume_set_with_only_retype_policy(self, mock_warning):
         result = self.cmd.take_action(parsed_args)
         self.volumes_mock.retype.assert_not_called()
         mock_warning.assert_called_with(
-            "'--retype-policy' option will not work without '--type' option"
+            "'%s' option will not work without '--type' option",
+            '--retype-policy',
         )
         self.assertIsNone(result)
 

openstackclient/volume/v2/consistency_group.py

@@ -38,8 +38,8 @@ def _find_volumes(parsed_args_volumes, volume_client):
         except Exception as e:
             result += 1
             LOG.error(
-                _("Failed to find volume with name or ID '%(volume)s':%(e)s")
-                % {'volume': volume, 'e': e}
+                _("Failed to find volume with name or ID '%(volume)s':%(e)s"),
+                {'volume': volume, 'e': e},
             )
 
     return result, uuid
@@ -73,8 +73,8 @@ def take_action(self, parsed_args):
         if result > 0:
             total = len(parsed_args.volumes)
             LOG.error(
-                _("%(result)s of %(total)s volumes failed to add.")
-                % {'result': result, 'total': total}
+                _("%(result)s of %(total)s volumes failed to add."),
+                {'result': result, 'total': total},
             )
 
         if add_uuid:
@@ -226,8 +226,8 @@ def take_action(self, parsed_args):
                     _(
                         "Failed to delete consistency group with "
                         "name or ID '%(consistency_group)s':%(e)s"
-                    )
-                    % {'consistency_group': i, 'e': e}
+                    ),
+                    {'consistency_group': i, 'e': e},
                 )
 
         if result > 0:
@@ -317,8 +317,8 @@ def take_action(self, parsed_args):
         if result > 0:
             total = len(parsed_args.volumes)
             LOG.error(
-                _("%(result)s of %(total)s volumes failed to remove.")
-                % {'result': result, 'total': total}
+                _("%(result)s of %(total)s volumes failed to remove."),
+                {'result': result, 'total': total},
             )
 
         if remove_uuid:

openstackclient/volume/v2/consistency_group_snapshot.py

@@ -101,8 +101,8 @@ def take_action(self, parsed_args):
                     _(
                         "Failed to delete consistency group snapshot "
                         "with name or ID '%(snapshot)s': %(e)s"
-                    )
-                    % {'snapshot': snapshot, 'e': e}
+                    ),
+                    {'snapshot': snapshot, 'e': e},
                 )
 
         if result > 0:

openstackclient/volume/v2/qos_specs.py

@@ -146,8 +146,8 @@ def take_action(self, parsed_args):
                     _(
                         "Failed to delete QoS specification with "
                         "name or ID '%(qos)s': %(e)s"
-                    )
-                    % {'qos': i, 'e': e}
+                    ),
+                    {'qos': i, 'e': e},
                 )
 
         if result > 0: