ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-23 19:01:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Refactor vmware_guest_facts (#31448)

Browse source 
This fix adds refactoring to vmware_guest_facts module.

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-11-15 06:56:50 +00:00 • committed by ansibot
parent 6c400d3bc8
commit 43f89004a0
2 changed files with 9 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/module_utils/vmware.py
View file

@ -767,3 +767,6 @@ class PyVmomi(object):
self.current_vm_obj = vm self.current_vm_obj = vm
return vm return vm
def gather_facts(self, vm):
return gather_vm_facts(self.content, vm)

40
lib/ansible/modules/cloud/vmware/vmware_guest_facts.py
View file

@ -90,38 +90,17 @@ instance:
try: try:
import pyVmomi import pyVmomi
from pyVmomi import vim from pyVmomi import vim
HAS_PYVMOMI = True
except ImportError: except ImportError:
HAS_PYVMOMI = False pass
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.vmware import connect_to_api, find_vm_by_id, gather_vm_facts, vmware_argument_spec from ansible.module_utils.vmware import PyVmomi, vmware_argument_spec
class PyVmomiHelper(object): class PyVmomiHelper(PyVmomi):
def __init__(self, module): def __init__(self, module):
if not HAS_PYVMOMI: super(PyVmomiHelper, self).__init__(module)
module.fail_json(msg='pyvmomi module required')
self.module = module
self.params = module.params
self.content = connect_to_api(self.module)
def getvm(self, name=None, uuid=None, folder=None):
vm = None
match_first = False
if uuid:
vm = find_vm_by_id(self.content, vm_id=uuid, vm_id_type="uuid")
elif folder and name:
if self.params['name_match'] == 'first':
match_first = True
vm = find_vm_by_id(self.content, vm_id=name, vm_id_type="inventory_path", folder=folder, match_first=match_first)
return vm
def gather_facts(self, vm):
return gather_vm_facts(self.content, vm)
def main(): def main():
@ -142,9 +121,7 @@ def main():
pyv = PyVmomiHelper(module) pyv = PyVmomiHelper(module)
# Check if the VM exists before continuing # Check if the VM exists before continuing
vm = pyv.getvm(name=module.params['name'], vm = pyv.get_vm()
folder=module.params['folder'],
uuid=module.params['uuid'])
# VM already exists # VM already exists
if vm: if vm:
@ -153,12 +130,7 @@ def main():
except Exception as exc: except Exception as exc:
module.fail_json(msg="Fact gather failed with exception %s" % to_text(exc)) module.fail_json(msg="Fact gather failed with exception %s" % to_text(exc))
else: else:
msg = "Unable to gather facts for non-existing VM " module.fail_json(msg="Unable to gather facts for non-existing VM %s" % module.params.get('uuid') or module.params.get('name'))
if module.params['name']:
msg += "%(name)s" % module.params
elif module.params['uuid']:
msg += "%(uuid)s" % module.params
module.fail_json(msg=msg)
if __name__ == '__main__': if __name__ == '__main__':