parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 115 Wiki Activity

Fix key display and add stubs

Browse Source
This commit is contained in:
Joshua Boniface
2023-07-01 21:50:34 -04:00
parent 776daac267
commit c7b7ad0cf7
2 changed files with 932 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

956
cli-client-new/pvc/cli/cli.py
View File

File diff suppressed because it is too large Load Diff

18
cli-client-new/pvc/cli/parsers.py
View File

@@ -41,14 +41,8 @@ def cli_connection_list_parser(connections_config, show_keys_flag):
details.get("cfgfile") details.get("cfgfile")
) )
else: else:
description, address, port, scheme, api_key = ( continue
None, if not show_keys_flag and api_key is not None:
None,
None,
None,
None,
)
if not show_keys_flag:
api_key = sub(r"[a-z0-9]", "x", api_key) api_key = sub(r"[a-z0-9]", "x", api_key)
connections_data.append( connections_data.append(
{ {
@@ -83,14 +77,16 @@ def cli_connection_detail_parser(connections_config):
""" """
connections_data = list() connections_data = list()
for connection, details in connections_config.items(): for connection, details in connections_config.items():
cluster_config = get_config(connections_config, cluster=connection) cluster_config = get_config(connections_config, connection=connection)
if cluster_config.get("badcfg", False):
continue
# Connect to each API and gather cluster status # Connect to each API and gather cluster status
retcode, retdata = pvc.lib.cluster.get_info(cluster_config) retcode, retdata = pvc.lib.cluster.get_info(cluster_config)
if retcode == 0: if retcode == 0:
# Create dummy data of N/A for all fields # Create dummy data of N/A for all fields
connections_data.append( connections_data.append(
{ {
"name": cluster_config["cluster"], "name": cluster_config["connection"],
"description": cluster_config["description"], "description": cluster_config["description"],
"health": "N/A", "health": "N/A",
"maintenance": "N/A", "maintenance": "N/A",
@@ -109,7 +105,7 @@ def cli_connection_detail_parser(connections_config):
# Normalize data into nice formattable version # Normalize data into nice formattable version
connections_data.append( connections_data.append(
{ {
"name": cluster_config["cluster"], "name": cluster_config["connection"],
"description": cluster_config["description"], "description": cluster_config["description"],
"health": retdata.get("cluster_health", {}).get("health", "N/A"), "health": retdata.get("cluster_health", {}).get("health", "N/A"),
"maintenance": retdata.get("maintenance", "N/A"), "maintenance": retdata.get("maintenance", "N/A"),