fix formatting

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

bin/cli.py

@@ -61,7 +61,7 @@ def configure_cli():
     controller_username = None
     controller_password = None
 
-    config_path = os.path.join(os.path.expanduser("~"), ".hpecp.conf",)
+    config_path = os.path.join(os.path.expanduser("~"), ".hpecp.conf")
 
     if os.path.exists(config_path):
         config_reader = ContainerPlatformClient.create_from_config_file()
@@ -204,7 +204,7 @@ def _get_metadata(self):
 
         return (modules, columns)
 
-    def bash(self,):
+    def bash(self):
         """Create autocompletion script for bash."""
         __bash_template = dedent(
             """\
@@ -401,7 +401,7 @@ def __dir__(self):
         """Return modules names."""
         return list(vars(self))
 
-    def __init__(self,):
+    def __init__(self):
         """Create a CLI instance."""
         self.autocomplete = AutoComplete(self)
         self.configure_cli = configure_cli

hpecp/cli/base.py

@@ -87,7 +87,8 @@ def _unknown_exception_handler(ex):
         """Handle unknown exceptions."""
         if _log.level == 10:  # "DEBUG"
             print(
-                "Unknown error.", file=sys.stderr,
+                "Unknown error.",
+                file=sys.stderr,
             )
         else:
             print(
@@ -125,7 +126,8 @@ def _unknown_exception_handler(ex):
 def get_client(start_session=True):
     """Retrieve a reference to an authenticated client object."""
     client = ContainerPlatformClient.create_from_config_file(
-        config_file=get_config_file(), profile=get_profile(),
+        config_file=get_config_file(),
+        profile=get_profile(),
     )
     if start_session:
         client.create_session()
@@ -168,12 +170,21 @@ def get(self, id, output="yaml", params=None):
         if output == "json":
             print(json.dumps(json_data))
         elif output == "json-pp":
-            print(json.dumps(json_data, indent=4, sort_keys=True,))
+            print(
+                json.dumps(
+                    json_data,
+                    indent=4,
+                    sort_keys=True,
+                )
+            )
         else:
 
             print(
                 yaml.dump(
-                    yaml.load(json.dumps(json_data), Loader=yaml.FullLoader,)
+                    yaml.load(
+                        json.dumps(json_data),
+                        Loader=yaml.FullLoader,
+                    )
                 )
             )
 
@@ -337,16 +348,26 @@ def print_list(self, list_instance, output, columns, query):
                 obj = jmespath.search(str(query), data)
                 print(TextOutput.dump(obj))
             else:
-                print(json.dumps(jmespath.search(str(query), data),))
+                print(
+                    json.dumps(
+                        jmespath.search(str(query), data),
+                    )
+                )
 
     def wait_for_state(
-        self, id, states=[], timeout_secs=60,
+        self,
+        id,
+        states=[],
+        timeout_secs=60,
     ):
         """See wait_for_status()."""
         self.wait_for_status(id, states, timeout_secs)
 
     def wait_for_status(
-        self, id, status=[], timeout_secs=60,
+        self,
+        id,
+        status=[],
+        timeout_secs=60,
     ):
         """Wait for resource to have one or more statuses.
 
@@ -370,22 +391,27 @@ def wait_for_status(
 
         try:
             success = self.client_module_property.wait_for_status(
-                id=id, status=resource_status, timeout_secs=timeout_secs,
+                id=id,
+                status=resource_status,
+                timeout_secs=timeout_secs,
             )
         except Exception:
             success = False
 
         if not success:
             print(
                 "Failed to reach state(s) {} in {}s".format(
-                    str(status), str(timeout_secs),
+                    str(status),
+                    str(timeout_secs),
                 ),
                 file=sys.stderr,
             )
             sys.exit(1)
 
     def wait_for_delete(
-        self, id, timeout_secs=1200,
+        self,
+        id,
+        timeout_secs=1200,
     ):
         """Wait for Gateway to be deleted.
 
@@ -394,5 +420,6 @@ def wait_for_delete(
         :returns True if gateway was deleted within timeout_secs.
         """
         self.wait_for_state(
-            id=id, timeout_secs=timeout_secs,
+            id=id,
+            timeout_secs=timeout_secs,
         )

hpecp/cli/gateway.py

@@ -100,6 +100,8 @@ def create_with_ssh_key(
         )
         print(gateway_id)
 
-    def states(self,):
+    def states(
+        self,
+    ):
         """Return a list of valid states."""
         print([s.name for s in GatewayStatus])

hpecp/cli/httpclient.py

@@ -37,7 +37,8 @@ def __dir__(self):
 
     @base.intercept_exception
     def get(
-        self, url,
+        self,
+        url,
     ):
         """Make HTTP GET request.
 
@@ -46,13 +47,16 @@ def get(
         $ hpecp httpclient get /api/v1/workers
         """
         response = base.get_client()._request(
-            url, http_method="get", description="CLI HTTP GET",
+            url,
+            http_method="get",
+            description="CLI HTTP GET",
         )
         print(response.text, file=sys.stdout)
 
     @base.intercept_exception
     def delete(
-        self, url,
+        self,
+        url,
     ):
         """Make HTTP DELETE request.
 
@@ -61,12 +65,16 @@ def delete(
         $ hpecp httpclient delete /api/v1/workers/1
         """
         base.get_client()._request(
-            url, http_method="delete", description="CLI HTTP DELETE",
+            url,
+            http_method="delete",
+            description="CLI HTTP DELETE",
         )
 
     @base.intercept_exception
     def post(
-        self, url, json_file="",
+        self,
+        url,
+        json_file="",
     ):
         """Make HTTP POST request.
 
@@ -91,28 +99,42 @@ def post(
 
             hpecp httpclient post /api/v2/config/auth --json-file my.json
         """
-        with open(json_file, "r",) as f:
+        with open(
+            json_file,
+            "r",
+        ) as f:
             data = json.load(f)
 
         response = base.get_client()._request(
-            url, http_method="post", data=data, description="CLI HTTP POST",
+            url,
+            http_method="post",
+            data=data,
+            description="CLI HTTP POST",
         )
         print(response.text, file=sys.stdout)
 
     @base.intercept_exception
     def put(
-        self, url, json_file="",
+        self,
+        url,
+        json_file="",
     ):
         """Make HTTP PUT request.
 
         Examples
         --------
         $ hpecp httpclient put /api/v2/config/auth --json-file my.json
         """  # noqa: W293
-        with open(json_file, "r",) as f:
+        with open(
+            json_file,
+            "r",
+        ) as f:
             data = json.load(f)
 
         response = base.get_client()._request(
-            url, http_method="put", data=data, description="CLI HTTP PUT",
+            url,
+            http_method="put",
+            data=data,
+            description="CLI HTTP PUT",
         )
         print(response.text, file=sys.stdout)

hpecp/cli/k8scluster.py

@@ -124,11 +124,15 @@ def admin_kube_config(self, id):
         print(
             base.get_client()
             .k8s_cluster.get(id)
-            .admin_kube_config.replace("\\n", "\n",)
+            .admin_kube_config.replace(
+                "\\n",
+                "\n",
+            )
         )
 
     def dashboard_url(
-        self, id,
+        self,
+        id,
     ):
         """Retrieve a K8s Cluster Dashboard URL.
 
@@ -140,7 +144,8 @@ def dashboard_url(
         print(url)
 
     def dashboard_token(
-        self, id,
+        self,
+        id,
     ):
         """Retrieve a K8s Cluster Dashboard Token.
 
@@ -157,7 +162,12 @@ def k8smanifest(self):
         """Retrieve the k8smanifest."""
         response = base.get_client().k8s_cluster.k8smanifest()
         print(
-            yaml.dump(yaml.load(json.dumps(response), Loader=yaml.FullLoader,))
+            yaml.dump(
+                yaml.load(
+                    json.dumps(response),
+                    Loader=yaml.FullLoader,
+                )
+            )
         )
 
     @base.intercept_exception
@@ -224,7 +234,9 @@ def add_addons(self, id, addons, wait_for_ready_sec=0):
                 id=id, status=["ready"], timeout_secs=wait_for_ready_sec
             )
 
-    def statuses(self,):
+    def statuses(
+        self,
+    ):
         """Return a list of valid statuses."""
         print([s.name for s in K8sClusterStatus])
 

hpecp/cli/k8sworker.py

@@ -121,7 +121,9 @@ def create_with_ssh_key(
             sys.exit(1)
 
         worker_id = base.get_client().k8s_worker.create_with_ssh_key(
-            ip=ip, ssh_key_data=ssh_key, tags=tags,
+            ip=ip,
+            ssh_key_data=ssh_key,
+            tags=tags,
         )
 
         if wait_for_operation_secs > 0:
@@ -170,7 +172,10 @@ def create_with_ssh_key(
 
     @base.intercept_exception
     def set_storage(
-        self, id, ephemeral_disks, persistent_disks=None,
+        self,
+        id,
+        ephemeral_disks,
+        persistent_disks=None,
     ):
         """Set storage for a k8s worker.
 
@@ -196,9 +201,13 @@ def set_storage(
         e_disks = ephemeral_disks.split(",")
 
         base.get_client().k8s_worker.set_storage(
-            worker_id=id, persistent_disks=p_disks, ephemeral_disks=e_disks,
+            worker_id=id,
+            persistent_disks=p_disks,
+            ephemeral_disks=e_disks,
         )
 
-    def statuses(self,):
+    def statuses(
+        self,
+    ):
         """Return a list of valid statuses."""
         print([s.name for s in WorkerK8sStatus])

hpecp/cli/license.py

@@ -40,12 +40,16 @@ def __dir__(self):
         return ["delete", "delete_all", "list", "platform_id", "register"]
 
     @base.intercept_exception
-    def platform_id(self,):
+    def platform_id(
+        self,
+    ):
         """Get the platform ID."""
         print(base.get_client().license.platform_id())
 
     def list(
-        self, output="yaml", license_key_only=False,
+        self,
+        output="yaml",
+        license_key_only=False,
     ):
         """Retrieve the list of licenses.
 
@@ -62,7 +66,8 @@ def list(
                 print(
                     yaml.dump(
                         yaml.load(
-                            json.dumps(response), Loader=yaml.FullLoader,
+                            json.dumps(response),
+                            Loader=yaml.FullLoader,
                         )
                     )
                 )
@@ -71,7 +76,8 @@ def list(
 
     @base.intercept_exception
     def register(
-        self, server_filename,
+        self,
+        server_filename,
     ):
         """Register a license.
 
@@ -128,7 +134,8 @@ def register(
 
     @base.intercept_exception
     def delete(
-        self, license_key,
+        self,
+        license_key,
     ):
         """Delete a license by LicenseKey.
 
@@ -138,7 +145,9 @@ def delete(
         base.get_client().license.delete(license_key=license_key)
 
     @base.intercept_exception
-    def delete_all(self,):
+    def delete_all(
+        self,
+    ):
         """Delete all licenses."""
         response = base.get_client().license.list()
         all_license_keys = [