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

Add error text to error prints

This commit is contained in:
Joshua Boniface 2018-06-07 00:26:55 -04:00
parent e3c789ea54
commit c642a20d73
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pvc.py
View File

@ -186,7 +186,7 @@ def undefine_vm(dom_name, dom_uuid):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -202,7 +202,7 @@ def undefine_vm(dom_name, dom_uuid):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
click.echo('Forcibly stopping VM "{}".'.format(dom_uuid)) click.echo('Forcibly stopping VM "{}".'.format(dom_uuid))
@ -252,7 +252,7 @@ def start_vm(dom_name, dom_uuid):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -268,7 +268,7 @@ def start_vm(dom_name, dom_uuid):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
# Set the VM to start # Set the VM to start
@ -302,7 +302,7 @@ def shutdown_vm(dom_name, dom_uuid):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -318,7 +318,7 @@ def shutdown_vm(dom_name, dom_uuid):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
# Set the VM to shutdown # Set the VM to shutdown
@ -352,7 +352,7 @@ def stop_vm(dom_name, dom_uuid):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -368,7 +368,7 @@ def stop_vm(dom_name, dom_uuid):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
# Set the VM to start # Set the VM to start
@ -410,7 +410,7 @@ def migrate_vm(dom_name, dom_uuid, target_hypervisor, force_migrate):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -426,14 +426,14 @@ def migrate_vm(dom_name, dom_uuid, target_hypervisor, force_migrate):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
current_hypervisor = zk.get('/domains/{}/hypervisor'.format(dom_uuid))[0].decode('ascii') current_hypervisor = zk.get('/domains/{}/hypervisor'.format(dom_uuid))[0].decode('ascii')
last_hypervisor = zk.get('/domains/{}/lasthypervisor'.format(dom_uuid))[0].decode('ascii') last_hypervisor = zk.get('/domains/{}/lasthypervisor'.format(dom_uuid))[0].decode('ascii')
if last_hypervisor != '' and force_migrate != True: if last_hypervisor != '' and force_migrate != True:
click.echo('The VM "{}" has been previously migrated.'.format(dom_uuid)) click.echo('ERROR: The VM "{}" has been previously migrated.'.format(dom_uuid))
click.echo('> Last hypervisor: {}'.format(last_hypervisor)) click.echo('> Last hypervisor: {}'.format(last_hypervisor))
click.echo('> Current hypervisor: {}'.format(current_hypervisor)) click.echo('> Current hypervisor: {}'.format(current_hypervisor))
click.echo('Run `vm unmigrate` to restore the VM to its previous hypervisor, or use `--force` to override this check.') click.echo('Run `vm unmigrate` to restore the VM to its previous hypervisor, or use `--force` to override this check.')
@ -454,7 +454,7 @@ def migrate_vm(dom_name, dom_uuid, target_hypervisor, force_migrate):
target_hypervisor = hypervisor target_hypervisor = hypervisor
else: else:
if target_hypervisor == current_hypervisor: if target_hypervisor == current_hypervisor:
click.echo('The VM "{}" is already running on hypervisor "{}".'.format(dom_uuid, current_hypervisor)) click.echo('ERROR: The VM "{}" is already running on hypervisor "{}".'.format(dom_uuid, current_hypervisor))
return return
click.echo('Migrating VM "{}" to hypervisor "{}".'.format(dom_uuid, target_hypervisor)) click.echo('Migrating VM "{}" to hypervisor "{}".'.format(dom_uuid, target_hypervisor))
@ -491,7 +491,7 @@ def unmigrate_vm(dom_name, dom_uuid):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
# Open a Zookeeper connection # Open a Zookeeper connection
@ -507,13 +507,13 @@ def unmigrate_vm(dom_name, dom_uuid):
message_name = dom_name message_name = dom_name
else: else:
message_name = dom_uuid message_name = dom_uuid
click.echo('Could not find VM "{}" in the cluster!'.format(message_name)) click.echo('ERROR: Could not find VM "{}" in the cluster!'.format(message_name))
return return
target_hypervisor = zk.get('/domains/{}/lasthypervisor'.format(dom_uuid))[0].decode('ascii') target_hypervisor = zk.get('/domains/{}/lasthypervisor'.format(dom_uuid))[0].decode('ascii')
if target_hypervisor == '': if target_hypervisor == '':
click.echo('The VM "{}" has not been previously migrated.'.format(dom_uuid)) click.echo('ERROR: The VM "{}" has not been previously migrated.'.format(dom_uuid))
return return
click.echo('Unmigrating VM "{}" back to hypervisor "{}".'.format(dom_uuid, target_hypervisor)) click.echo('Unmigrating VM "{}" back to hypervisor "{}".'.format(dom_uuid, target_hypervisor))
@ -554,7 +554,7 @@ def search(dom_name, dom_uuid, long_output):
# Ensure at least one search method is set # Ensure at least one search method is set
if dom_name == None and dom_uuid == None: if dom_name == None and dom_uuid == None:
click.echo("You must specify either a `--name` or `--uuid` value.") click.echo("ERROR: You must specify either a `--name` or `--uuid` value.")
return return
zk = pvcf.startZKConnection(zk_host) zk = pvcf.startZKConnection(zk_host)
@ -566,7 +566,7 @@ def search(dom_name, dom_uuid, long_output):
information = pvcf.getInformationFromXML(zk, dom_uuid, long_output) information = pvcf.getInformationFromXML(zk, dom_uuid, long_output)
if information == None: if information == None:
click.echo('Could not find a domain matching that name or UUID.') click.echo('ERROR: Could not find a domain matching that name or UUID.')
return return
click.echo(information) click.echo(information)