Using jmespath to allow query/filtering

Author: bharath144

.vscode/settings.json

@@ -24,5 +24,6 @@
     "python.formatting.provider": "black",
     "python.pythonPath": "/bin/python3",
     "python.envFile": "${workspaceFolder}/gitpod.env",
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "files.insertFinalNewline": true
 }

bin/cli.py

@@ -10,22 +10,17 @@
 from collections import OrderedDict
 
 import fire
+import jmespath
 import yaml
 
-from hpecp.gateway import (
-    Gateway,
-    GatewayStatus,
-)
-from hpecp.k8s_cluster import (
-    K8sClusterHostConfig,
-    K8sClusterStatus,
-)
 from hpecp import (
-    ContainerPlatformClient,
-    ContainerPlatformClientException,
     APIException,
     APIItemConflictException,
+    ContainerPlatformClient,
+    ContainerPlatformClientException,
 )
+from hpecp.gateway import Gateway, GatewayStatus
+from hpecp.k8s_cluster import K8sClusterHostConfig, K8sClusterStatus
 from hpecp.k8s_worker import WorkerK8sStatus
 
 if sys.version_info[0] >= 3:
@@ -118,7 +113,7 @@ def get(
             print(response.json)
 
     def list(
-        self, output="table", columns=Gateway.default_display_fields,
+        self, output="table", columns=Gateway.default_display_fields, query={}
     ):
         """Retrieve the list of Gateways
 
@@ -135,7 +130,10 @@ def list(
                 )
             )
         else:
-            print(get_client().gateway.list().json)
+            data = get_client().gateway.list().json
+            if query:
+                print(jmespath.search(query, data))
+            print(data)
 
     def delete(
         self, gateway_id, wait_for_delete_secs=0,
@@ -189,7 +187,7 @@ def wait_for_state(
             success = get_client().gateway.wait_for_state(
                 gateway_id=gateway_id, state=gateway_states,
             )
-        except:
+        except Exception:
             success = False
 
         if not success:
@@ -257,7 +255,7 @@ def list(
                 get_client()
                 .k8s_worker.list()
                 .tabulate(
-                    columns=columns, style="plain", display_headers=False,
+                    columns=columns, style="plain", display_headers=False
                 )
             )
         else:

hpecp/k8s_worker.py

@@ -1,13 +1,13 @@
 from __future__ import absolute_import
-from .logger import Logger
-
-from .exceptions import APIItemNotFoundException
 
+import re
+from enum import Enum
 from operator import attrgetter
-from tabulate import tabulate
+
 import polling
-from enum import Enum
-import re
+from tabulate import tabulate
+
+from .exceptions import APIItemNotFoundException
 
 try:
     basestring
@@ -129,7 +129,7 @@ def create_with_ssh_key(self, ip, ssh_key_data, tags=[]):
             ip: str
                 The IP address of the proxy host.  Used for internal communication.
             ssh_key_data: str
-                The ssh key data as a string. 
+                The ssh key data as a string.
             tags: list
                 Tags to use, e.g. "{ 'tag1': 'foo', 'tag2', 'bar' }".
 
@@ -206,7 +206,7 @@ def wait_for_status(self, worker_id, status=[], timeout_secs=1200):
 
         Returns:
             bool: True if status was found before timeout, otherwise False
-            
+
         Raises:
             APIItemNotFoundException: if the item is not found and status is not empty
             APIException: if a generic API exception occurred

requirements.txt

@@ -6,3 +6,4 @@ configparser; python_version == "2.7"
 polling
 pyyaml
 fire
+jmespath