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

Handle the empty list better

This commit is contained in:
Joshua Boniface 2020-01-02 12:18:41 -05:00
parent 5d92a4aa62
commit f80b432d3b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client-cli/pvc.py
View File

@ -225,6 +225,8 @@ def cluster_list():
cfgfile = cluster_details.get('cfgfile') cfgfile = cluster_details.get('cfgfile')
if os.path.isfile(cfgfile): if os.path.isfile(cfgfile):
address, port, scheme = read_from_yaml(cfgfile) address, port, scheme = read_from_yaml(cfgfile)
else:
address, port, scheme = 'N/A', 'N/A', 'N/A'
else: else:
address = cluster_details.get('host', None) address = cluster_details.get('host', None)
port = cluster_details.get('port', None) port = cluster_details.get('port', None)
@ -1938,6 +1940,10 @@ def status_cluster(oformat):
""" """
Show basic information and health for the active PVC cluster. Show basic information and health for the active PVC cluster.
""" """
# Abort commands under this group if config is bad
if config.get('badcfg', None):
exit(1)
retcode, retdata = pvc_cluster.get_info(config) retcode, retdata = pvc_cluster.get_info(config)
if retcode: if retcode:
pvc_cluster.format_info(retdata, oformat) pvc_cluster.format_info(retdata, oformat)
@ -1957,6 +1963,9 @@ def init_cluster(yes):
""" """
Perform initialization of a new PVC cluster. Perform initialization of a new PVC cluster.
""" """
# Abort commands under this group if config is bad
if config.get('badcfg', None):
exit(1)
if not yes: if not yes:
click.echo('DANGER: This will remove any existing cluster on these coordinators and create a new cluster. Any existing resources on the old cluster will be left abandoned.') click.echo('DANGER: This will remove any existing cluster on these coordinators and create a new cluster. Any existing resources on the old cluster will be left abandoned.')