Blacken openstackclient.compute

Black used with the '-l 79 -S' flags.

A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.

Change-Id: I9af45c062d179ab3dc2a5e969e1c467932753a2b
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

Author: stephenfin

openstackclient/compute/client.py

@@ -51,11 +51,13 @@ def make_client(instance):
     else:
         version = instance._api_version[API_NAME]
         from novaclient import api_versions
+
         # convert to APIVersion object
         version = api_versions.get_api_version(version)
 
     if version.is_latest():
         import novaclient
+
         # NOTE(RuiChen): executing version discovery make sense, but that need
         #                an initialized REST client, it's not available now,
         #                fallback to use the max version of novaclient side.
@@ -73,8 +75,11 @@ def make_client(instance):
     # Set client http_log_debug to True if verbosity level is high enough
     http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
 
-    extensions = [ext for ext in nova_client.discover_extensions(version)
-                  if ext.name == "list_extensions"]
+    extensions = [
+        ext
+        for ext in nova_client.discover_extensions(version)
+        if ext.name == "list_extensions"
+    ]
 
     # Remember interface only if it is set
     kwargs = utils.build_kwargs_dict('endpoint_type', instance.interface)
@@ -96,7 +101,7 @@ def make_client(instance):
             COMPUTE_API_TYPE,
             region_name=instance.region_name,
             interface=instance.interface,
-        )
+        ),
     )
 
     return client
@@ -108,8 +113,10 @@ def build_option_parser(parser):
         '--os-compute-api-version',
         metavar='<compute-api-version>',
         default=utils.env('OS_COMPUTE_API_VERSION'),
-        help=_("Compute API version, default=%s "
-               "(Env: OS_COMPUTE_API_VERSION)") % DEFAULT_API_VERSION
+        help=_(
+            "Compute API version, default=%s " "(Env: OS_COMPUTE_API_VERSION)"
+        )
+        % DEFAULT_API_VERSION,
     )
     return parser
 

openstackclient/compute/v2/agent.py

@@ -37,36 +37,20 @@ class CreateAgent(command.ShowOne):
 
     def get_parser(self, prog_name):
         parser = super(CreateAgent, self).get_parser(prog_name)
-        parser.add_argument(
-            "os",
-            metavar="<os>",
-            help=_("Type of OS")
-        )
+        parser.add_argument("os", metavar="<os>", help=_("Type of OS"))
         parser.add_argument(
             "architecture",
             metavar="<architecture>",
-            help=_("Type of architecture")
-        )
-        parser.add_argument(
-            "version",
-            metavar="<version>",
-            help=_("Version")
-        )
-        parser.add_argument(
-            "url",
-            metavar="<url>",
-            help=_("URL")
-        )
-        parser.add_argument(
-            "md5hash",
-            metavar="<md5hash>",
-            help=_("MD5 hash")
+            help=_("Type of architecture"),
         )
+        parser.add_argument("version", metavar="<version>", help=_("Version"))
+        parser.add_argument("url", metavar="<url>", help=_("URL"))
+        parser.add_argument("md5hash", metavar="<md5hash>", help=_("MD5 hash"))
         parser.add_argument(
             "hypervisor",
             metavar="<hypervisor>",
             default="xen",
-            help=_("Type of hypervisor")
+            help=_("Type of hypervisor"),
         )
         return parser
 
@@ -78,7 +62,7 @@ def take_action(self, parsed_args):
             parsed_args.version,
             parsed_args.url,
             parsed_args.md5hash,
-            parsed_args.hypervisor
+            parsed_args.hypervisor,
         )
         agent = compute_client.agents.create(*args)._info.copy()
         return zip(*sorted(agent.items()))
@@ -95,10 +79,7 @@ class DeleteAgent(command.Command):
     def get_parser(self, prog_name):
         parser = super(DeleteAgent, self).get_parser(prog_name)
         parser.add_argument(
-            "id",
-            metavar="<id>",
-            nargs='+',
-            help=_("ID of agent(s) to delete")
+            "id", metavar="<id>", nargs='+', help=_("ID of agent(s) to delete")
         )
         return parser
 
@@ -110,13 +91,17 @@ def take_action(self, parsed_args):
                 compute_client.agents.delete(id)
             except Exception as e:
                 result += 1
-                LOG.error(_("Failed to delete agent with ID '%(id)s': %(e)s"),
-                          {'id': id, 'e': e})
+                LOG.error(
+                    _("Failed to delete agent with ID '%(id)s': %(e)s"),
+                    {'id': id, 'e': e},
+                )
 
         if result > 0:
             total = len(parsed_args.id)
-            msg = (_("%(result)s of %(total)s agents failed "
-                     "to delete.") % {'result': result, 'total': total})
+            msg = _("%(result)s of %(total)s agents failed " "to delete.") % {
+                'result': result,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 
@@ -133,7 +118,7 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "--hypervisor",
             metavar="<hypervisor>",
-            help=_("Type of hypervisor")
+            help=_("Type of hypervisor"),
         )
         return parser
 
@@ -146,13 +131,19 @@ def take_action(self, parsed_args):
             "Architecture",
             "Version",
             "Md5Hash",
-            "URL"
+            "URL",
         )
         data = compute_client.agents.list(parsed_args.hypervisor)
-        return (columns,
-                (utils.get_item_properties(
-                    s, columns,
-                ) for s in data))
+        return (
+            columns,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
+                )
+                for s in data
+            ),
+        )
 
 
 class SetAgent(command.Command):
@@ -165,26 +156,18 @@ class SetAgent(command.Command):
 
     def get_parser(self, prog_name):
         parser = super(SetAgent, self).get_parser(prog_name)
-        parser.add_argument(
-            "id",
-            metavar="<id>",
-            help=_("ID of the agent")
-        )
+        parser.add_argument("id", metavar="<id>", help=_("ID of the agent"))
         parser.add_argument(
             "--agent-version",
             dest="version",
             metavar="<version>",
-            help=_("Version of the agent")
+            help=_("Version of the agent"),
         )
         parser.add_argument(
-            "--url",
-            metavar="<url>",
-            help=_("URL of the agent")
+            "--url", metavar="<url>", help=_("URL of the agent")
         )
         parser.add_argument(
-            "--md5hash",
-            metavar="<md5hash>",
-            help=_("MD5 hash of the agent")
+            "--md5hash", metavar="<md5hash>", help=_("MD5 hash of the agent")
         )
         return parser