VMware: fail module when unable to find the user specified folder (#53474)

pull/53502/head
thefaftek 6 years ago committed by Abhijeet Kasurde
parent 6421e89e23
commit b9ec7bb253

@ -185,7 +185,6 @@ def main():
# FindByInventoryPath() does not require an absolute path # FindByInventoryPath() does not require an absolute path
# so we should leave the input folder path unmodified # so we should leave the input folder path unmodified
module.params['dest_folder'] = module.params['dest_folder'].rstrip('/') module.params['dest_folder'] = module.params['dest_folder'].rstrip('/')
pyv = PyVmomiHelper(module) pyv = PyVmomiHelper(module)
search_index = pyv.content.searchIndex search_index = pyv.content.searchIndex
@ -199,6 +198,8 @@ def main():
vm_full = vm_path + '/' + module.params['name'] vm_full = vm_path + '/' + module.params['name']
folder = search_index.FindByInventoryPath( folder = search_index.FindByInventoryPath(
module.params['dest_folder']) module.params['dest_folder'])
if folder is None:
module.fail_json(msg="Folder name and/or path does not exist")
vm_to_move = search_index.FindByInventoryPath(vm_full) vm_to_move = search_index.FindByInventoryPath(vm_full)
if vm_path != module.params['dest_folder'].lstrip('/'): if vm_path != module.params['dest_folder'].lstrip('/'):
move_task = folder.MoveInto([vm_to_move]) move_task = folder.MoveInto([vm_to_move])

Loading…
Cancel
Save