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

Fix bad messages in volume remove

This commit is contained in:
Joshua Boniface 2021-06-22 04:31:02 -04:00
parent 75f2560217
commit 1ae34c1960
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client-cli/cli_lib/vm.py
View File

@ -912,7 +912,7 @@ def vm_volumes_remove(config, vm, volume, restart):
xml = domain_information.get('xml', None) xml = domain_information.get('xml', None)
if xml is None: if xml is None:
return False, "VM does not have a valid XML doccument." return False, "VM does not have a valid XML document."
try: try:
parsed_xml = fromstring(xml) parsed_xml = fromstring(xml)

8
client-cli/pvc.py
View File

@ -1506,7 +1506,7 @@ def vm_volume_add(domain, volume, disk_id, bus, disk_type, restart, confirm_flag
'domain' 'domain'
) )
@click.argument( @click.argument(
'vni' 'volume'
) )
@click.option( @click.option(
'-r', '--restart', 'restart', is_flag=True, default=False, '-r', '--restart', 'restart', is_flag=True, default=False,
@ -1518,9 +1518,9 @@ def vm_volume_add(domain, volume, disk_id, bus, disk_type, restart, confirm_flag
help='Confirm the restart' help='Confirm the restart'
) )
@cluster_req @cluster_req
def vm_volume_remove(domain, vni, restart, confirm_flag): def vm_volume_remove(domain, volume, restart, confirm_flag):
""" """
Remove the volume VNI to the virtual machine DOMAIN. Remove VOLUME from the virtual machine DOMAIN; VOLUME must be a file path or RBD path in 'pool/volume' format.
""" """
if restart and not confirm_flag and not config['unsafe']: if restart and not confirm_flag and not config['unsafe']:
try: try:
@ -1528,7 +1528,7 @@ def vm_volume_remove(domain, vni, restart, confirm_flag):
except Exception: except Exception:
restart = False restart = False
retcode, retmsg = pvc_vm.vm_volumes_remove(config, domain, vni, restart) retcode, retmsg = pvc_vm.vm_volumes_remove(config, domain, volume, restart)
if retcode and not restart: if retcode and not restart:
retmsg = retmsg + " Changes will be applied on next VM start/restart." retmsg = retmsg + " Changes will be applied on next VM start/restart."
cleanup(retcode, retmsg) cleanup(retcode, retmsg)