cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle errors gracefully in vmware_guest_snapshot (#25727)

Browse source 
CreateSnapshot may fail with several exceptions. This
fix generically handles these exceptions.

Fixes #21121

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-07-03 23:09:29 +05:30 committed by jctanner
parent 29f5fe3ddd
commit ec6e3b0e32
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/modules/cloud/vmware/vmware_guest_snapshot.py
View file

@ -160,9 +160,8 @@ import time
# import module snippets # import module snippets
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.six import iteritems
from ansible.module_utils.vmware import connect_to_api from ansible.module_utils.vmware import connect_to_api
from ansible.module_utils._text import to_native
try: try:
import json import json
@ -247,10 +246,18 @@ class PyVmomiHelper(object):
if vm.capability.memorySnapshotsSupported: if vm.capability.memorySnapshotsSupported:
memory_dump = self.module.params['memory_dump'] memory_dump = self.module.params['memory_dump']
return vm.CreateSnapshot(self.module.params["snapshot_name"], task = None
self.module.params["description"], try:
memory_dump, task = vm.CreateSnapshot(self.module.params["snapshot_name"],
quiesce) self.module.params["description"],
memory_dump,
quiesce)
except vim.fault.RestrictedVersion as exc:
self.module.fail_json(msg="Failed to take snapshot due to VMware Licence: %s" % to_native(exc.msg))
except Exception as exc:
self.module.fail_json(msg="Failed to create snapshot of VM %s due to %s" % (self.module.params['name'], to_native(exc.msg)))
return task
def remove_or_revert_snapshot(self, vm): def remove_or_revert_snapshot(self, vm):
if vm.snapshot is None: if vm.snapshot is None: