From 096b3f8eb990a69c3e50f16be031983f96e0c8a5 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 22 Feb 2019 09:55:57 +0530 Subject: [PATCH] [Backport 2.7] VMware: Handle customValue in inventory * VMware: Refactor guest inventory plugin Signed-off-by: Abhijeet Kasurde (cherry picked from commit e41b98ffb522ffac04d2f54ad80c23d1714d1225) --- ...381-vmware_vm_inventory-fix_yaml_flag.yaml | 2 + .../plugins/inventory/vmware_vm_inventory.py | 344 ++++++++++-------- .../inventory_vmware_vm_inventory/ansible.cfg | 3 + .../inventory_vmware_vm_inventory/runme.sh | 36 +- 4 files changed, 229 insertions(+), 156 deletions(-) create mode 100644 changelogs/fragments/52381-vmware_vm_inventory-fix_yaml_flag.yaml diff --git a/changelogs/fragments/52381-vmware_vm_inventory-fix_yaml_flag.yaml b/changelogs/fragments/52381-vmware_vm_inventory-fix_yaml_flag.yaml new file mode 100644 index 00000000000..1d5b23e0100 --- /dev/null +++ b/changelogs/fragments/52381-vmware_vm_inventory-fix_yaml_flag.yaml @@ -0,0 +1,2 @@ +bugfixes: +- Fixed issue related to --yaml flag in vmware_vm_inventory. Also fixed caching issue in vmware_vm_inventory (https://github.com/ansible/ansible/issues/52381). diff --git a/lib/ansible/plugins/inventory/vmware_vm_inventory.py b/lib/ansible/plugins/inventory/vmware_vm_inventory.py index ebe2061178e..ed5984a16c1 100644 --- a/lib/ansible/plugins/inventory/vmware_vm_inventory.py +++ b/lib/ansible/plugins/inventory/vmware_vm_inventory.py @@ -11,7 +11,7 @@ DOCUMENTATION = ''' name: vmware_vm_inventory plugin_type: inventory short_description: VMware Guest inventory source - version_added: "2.6" + version_added: "2.7" author: - Abhijeet Kasurde (@Akasurde) description: @@ -112,35 +112,25 @@ except ImportError: from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable -class InventoryModule(BaseInventoryPlugin, Cacheable): - - NAME = 'vmware_vm_inventory' +class BaseVMwareInventory: + def __init__(self, hostname, username, password, port, validate_certs, with_tags): + self.hostname = hostname + self.username = username + self.password = password + self.port = port + self.with_tags = with_tags + self.validate_certs = validate_certs + self.content = None + self.rest_content = None - def _set_credentials(self): + def do_login(self): """ - Set credentials + Check requirements and do login """ - self.hostname = self.get_option('hostname') - self.username = self.get_option('username') - self.password = self.get_option('password') - self.port = self.get_option('port') - self.with_tags = self.get_option('with_tags') - - self.validate_certs = self.get_option('validate_certs') - - if not HAS_VSPHERE and self.with_tags: - raise AnsibleError("Unable to find 'vSphere Automation SDK' Python library which is required." - " Please refer this URL for installation steps" - " - https://code.vmware.com/web/sdk/65/vsphere-automation-python") - - if not HAS_VCLOUD and self.with_tags: - raise AnsibleError("Unable to find 'vCloud Suite SDK' Python library which is required." - " Please refer this URL for installation steps" - " - https://code.vmware.com/web/sdk/60/vcloudsuite-python") - - if not all([self.hostname, self.username, self.password]): - raise AnsibleError("Missing one of the following : hostname, username, password. Please read " - "the documentation for more information.") + self.check_requirements() + self.content = self._login() + if self.with_tags: + self.rest_content = self._login_vapi() def _login_vapi(self): """ @@ -217,27 +207,8 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): atexit.register(connect.Disconnect, service_instance) return service_instance.RetrieveContent() - def verify_file(self, path): - """ - Verify plugin configuration file and mark this plugin active - Args: - path: Path of configuration YAML file - - Returns: True if everything is correct, else False - - """ - valid = False - if super(InventoryModule, self).verify_file(path): - if path.endswith(('vmware.yaml', 'vmware.yml')): - valid = True - - return valid - - def parse(self, inventory, loader, path, cache=True): - """ - Parses the inventory file - """ - + def check_requirements(self): + """ Check all requirements for this inventory are satisified""" if not HAS_REQUESTS: raise AnsibleParserError('Please install "requests" Python module as this is required' ' for VMware Guest dynamic inventory plugin.') @@ -259,12 +230,125 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): " be >= %s, found: %s." % (".".join([str(w) for w in required_version]), requests.__version__)) + if not HAS_VSPHERE and self.with_tags: + raise AnsibleError("Unable to find 'vSphere Automation SDK' Python library which is required." + " Please refer this URL for installation steps" + " - https://code.vmware.com/web/sdk/65/vsphere-automation-python") + + if not HAS_VCLOUD and self.with_tags: + raise AnsibleError("Unable to find 'vCloud Suite SDK' Python library which is required." + " Please refer this URL for installation steps" + " - https://code.vmware.com/web/sdk/60/vcloudsuite-python") + + if not all([self.hostname, self.username, self.password]): + raise AnsibleError("Missing one of the following : hostname, username, password. Please read " + "the documentation for more information.") + + def _get_managed_objects_properties(self, vim_type, properties=None): + """ + Look up a Managed Object Reference in vCenter / ESXi Environment + :param vim_type: Type of vim object e.g, for datacenter - vim.Datacenter + :param properties: List of properties related to vim object e.g. Name + :return: local content object + """ + # Get Root Folder + root_folder = self.content.rootFolder + + if properties is None: + properties = ['name'] + + # Create Container View with default root folder + mor = self.content.viewManager.CreateContainerView(root_folder, [vim_type], True) + + # Create Traversal spec + traversal_spec = vmodl.query.PropertyCollector.TraversalSpec( + name="traversal_spec", + path='view', + skip=False, + type=vim.view.ContainerView + ) + + # Create Property Spec + property_spec = vmodl.query.PropertyCollector.PropertySpec( + type=vim_type, # Type of object to retrieved + all=False, + pathSet=properties + ) + + # Create Object Spec + object_spec = vmodl.query.PropertyCollector.ObjectSpec( + obj=mor, + skip=True, + selectSet=[traversal_spec] + ) + + # Create Filter Spec + filter_spec = vmodl.query.PropertyCollector.FilterSpec( + objectSet=[object_spec], + propSet=[property_spec], + reportMissingObjectsInResults=False + ) + + return self.content.propertyCollector.RetrieveContents([filter_spec]) + + @staticmethod + def _get_object_prop(vm, attributes): + """Safely get a property or return None""" + result = vm + for attribute in attributes: + try: + result = getattr(result, attribute) + except (AttributeError, IndexError): + return None + return result + + +class InventoryModule(BaseInventoryPlugin, Cacheable): + + NAME = 'vmware_vm_inventory' + + def verify_file(self, path): + """ + Verify plugin configuration file and mark this plugin active + Args: + path: Path of configuration YAML file + + Returns: True if everything is correct, else False + + """ + valid = False + if super(InventoryModule, self).verify_file(path): + if path.endswith(('vmware.yaml', 'vmware.yml')): + valid = True + + return valid + + def parse(self, inventory, loader, path, cache=True): + """ + Parses the inventory file + """ super(InventoryModule, self).parse(inventory, loader, path, cache=cache) cache_key = self.get_cache_key(path) config_data = self._read_config_data(path) + # set _options from config data + self._consume_options(config_data) + + self.pyv = BaseVMwareInventory( + hostname=self.get_option('hostname'), + username=self.get_option('username'), + password=self.get_option('password'), + port=self.get_option('port'), + with_tags=self.get_option('with_tags'), + validate_certs=self.get_option('validate_certs') + ) + + self.pyv.do_login() + + self.pyv.check_requirements() + source_data = None if cache: cache = self.get_option('cache') @@ -276,14 +360,6 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): except KeyError: update_cache = True - # set _options from config data - self._consume_options(config_data) - - self._set_credentials() - self.content = self._login() - if self.with_tags: - self.rest_content = self._login_vapi() - using_current_cache = cache and not update_cache cacheable_results = self._populate_from_source(source_data, using_current_cache) @@ -291,30 +367,17 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): self.cache.set(cache_key, cacheable_results) def _populate_from_cache(self, source_data): - """ - Populate inventory from cache - """ + """ Populate cache using source data """ hostvars = source_data.pop('_meta', {}).get('hostvars', {}) for group in source_data: if group == 'all': continue else: self.inventory.add_group(group) + hosts = source_data[group].get('hosts', []) + for host in hosts: + self._populate_host_vars([host], hostvars.get(host, {}), group) self.inventory.add_child('all', group) - if not source_data: - for host in hostvars: - self.inventory.add_host(host) - - @staticmethod - def _get_vm_prop(vm, attributes): - """Safely get a property or return None""" - result = vm - for attribute in attributes: - try: - result = getattr(result, attribute) - except (AttributeError, IndexError): - return None - return result def _populate_from_source(self, source_data, using_current_cache): """ @@ -325,13 +388,14 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): self._populate_from_cache(source_data) return source_data - cacheable_results = {} + cacheable_results = {'_meta': {'hostvars': {}}} hostvars = {} - objects = self._get_managed_objects_properties(vim_type=vim.VirtualMachine, properties=['name']) + objects = self.pyv._get_managed_objects_properties(vim_type=vim.VirtualMachine, + properties=['name']) - if self.with_tags: - tag_svc = Tag(self.rest_content) - tag_association = TagAssociation(self.rest_content) + if self.pyv.with_tags: + tag_svc = Tag(self.pyv.rest_content) + tag_association = TagAssociation(self.pyv.rest_content) tags_info = dict() tags = tag_svc.list() @@ -342,43 +406,27 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): cacheable_results[tag_obj.name] = {'hosts': []} self.inventory.add_group(tag_obj.name) - for temp_vm_object in objects: - for temp_vm_object_property in temp_vm_object.propSet: + for vm_obj in objects: + for vm_obj_property in vm_obj.propSet: # VMware does not provide a way to uniquely identify VM by its name # i.e. there can be two virtual machines with same name # Appending "_" and VMware UUID to make it unique - current_host = temp_vm_object_property.val + "_" + temp_vm_object.obj.config.uuid + current_host = vm_obj_property.val + "_" + vm_obj.obj.config.uuid if current_host not in hostvars: hostvars[current_host] = {} self.inventory.add_host(current_host) - host_ip = temp_vm_object.obj.guest.ipAddress + + host_ip = vm_obj.obj.guest.ipAddress if host_ip: self.inventory.set_variable(current_host, 'ansible_host', host_ip) - # Load VM properties in host_vars - vm_properties = [ - 'name', - 'config.cpuHotAddEnabled', - 'config.cpuHotRemoveEnabled', - 'config.instanceUuid', - 'config.hardware.numCPU', - 'config.template', - 'config.name', - 'guest.hostName', - 'guest.ipAddress', - 'guest.guestId', - 'guest.guestState', - 'runtime.maxMemoryUsage', - 'customValue', - ] - for vm_prop in vm_properties: - vm_value = self._get_vm_prop(temp_vm_object.obj, vm_prop.split(".")) - self.inventory.set_variable(current_host, vm_prop, vm_value) + self._populate_host_properties(vm_obj, current_host) + # Only gather facts related to tag if vCloud and vSphere is installed. - if HAS_VCLOUD and HAS_VSPHERE and self.with_tags: + if HAS_VCLOUD and HAS_VSPHERE and self.pyv.with_tags: # Add virtual machine to appropriate tag group - vm_mo_id = temp_vm_object.obj._GetMoId() + vm_mo_id = vm_obj.obj._GetMoId() vm_dynamic_id = DynamicID(type='VirtualMachine', id=vm_mo_id) attached_tags = tag_association.list_attached_tags(vm_dynamic_id) @@ -387,66 +435,52 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): cacheable_results[tags_info[tag_id]]['hosts'].append(current_host) # Based on power state of virtual machine - vm_power = temp_vm_object.obj.summary.runtime.powerState + vm_power = str(vm_obj.obj.summary.runtime.powerState) if vm_power not in cacheable_results: - cacheable_results[vm_power] = [] + cacheable_results[vm_power] = {'hosts': []} self.inventory.add_group(vm_power) - cacheable_results[vm_power].append(current_host) + cacheable_results[vm_power]['hosts'].append(current_host) self.inventory.add_child(vm_power, current_host) # Based on guest id - vm_guest_id = temp_vm_object.obj.config.guestId + vm_guest_id = vm_obj.obj.config.guestId if vm_guest_id and vm_guest_id not in cacheable_results: - cacheable_results[vm_guest_id] = [] + cacheable_results[vm_guest_id] = {'hosts': []} self.inventory.add_group(vm_guest_id) - cacheable_results[vm_guest_id].append(current_host) + cacheable_results[vm_guest_id]['hosts'].append(current_host) self.inventory.add_child(vm_guest_id, current_host) - return cacheable_results + for host in hostvars: + h = self.inventory.get_host(host) + cacheable_results['_meta']['hostvars'][h.name] = h.vars - def _get_managed_objects_properties(self, vim_type, properties=None): - """ - Look up a Managed Object Reference in vCenter / ESXi Environment - :param vim_type: Type of vim object e.g, for datacenter - vim.Datacenter - :param properties: List of properties related to vim object e.g. Name - :return: local content object - """ - # Get Root Folder - root_folder = self.content.rootFolder - - if properties is None: - properties = ['name'] - - # Create Container View with default root folder - mor = self.content.viewManager.CreateContainerView(root_folder, [vim_type], True) - - # Create Traversal spec - traversal_spec = vmodl.query.PropertyCollector.TraversalSpec( - name="traversal_spec", - path='view', - skip=False, - type=vim.view.ContainerView - ) - - # Create Property Spec - property_spec = vmodl.query.PropertyCollector.PropertySpec( - type=vim_type, # Type of object to retrieved - all=False, - pathSet=properties - ) - - # Create Object Spec - object_spec = vmodl.query.PropertyCollector.ObjectSpec( - obj=mor, - skip=True, - selectSet=[traversal_spec] - ) - - # Create Filter Spec - filter_spec = vmodl.query.PropertyCollector.FilterSpec( - objectSet=[object_spec], - propSet=[property_spec], - reportMissingObjectsInResults=False - ) + return cacheable_results - return self.content.propertyCollector.RetrieveContents([filter_spec]) + def _populate_host_properties(self, vm_obj, current_host): + # Load VM properties in host_vars + vm_properties = [ + 'name', + 'config.cpuHotAddEnabled', + 'config.cpuHotRemoveEnabled', + 'config.instanceUuid', + 'config.hardware.numCPU', + 'config.template', + 'config.name', + 'guest.hostName', + 'guest.ipAddress', + 'guest.guestId', + 'guest.guestState', + 'runtime.maxMemoryUsage', + 'customValue', + ] + field_mgr = self.pyv.content.customFieldsManager.field + + for vm_prop in vm_properties: + if vm_prop == 'customValue': + for cust_value in vm_obj.obj.customValue: + self.inventory.set_variable(current_host, + [y.name for y in field_mgr if y.key == cust_value.key][0], + cust_value.value) + else: + vm_value = self.pyv._get_object_prop(vm_obj.obj, vm_prop.split(".")) + self.inventory.set_variable(current_host, vm_prop, vm_value) diff --git a/test/integration/targets/inventory_vmware_vm_inventory/ansible.cfg b/test/integration/targets/inventory_vmware_vm_inventory/ansible.cfg index d8292cf660c..158f5849fa0 100644 --- a/test/integration/targets/inventory_vmware_vm_inventory/ansible.cfg +++ b/test/integration/targets/inventory_vmware_vm_inventory/ansible.cfg @@ -3,3 +3,6 @@ inventory = test-config.vmware.yaml [inventory] enable_plugins = vmware_vm_inventory +cache = True +cache_plugin = jsonfile +cache_connection = inventory_cache diff --git a/test/integration/targets/inventory_vmware_vm_inventory/runme.sh b/test/integration/targets/inventory_vmware_vm_inventory/runme.sh index 0cdabb6b181..3dccb1b3263 100755 --- a/test/integration/targets/inventory_vmware_vm_inventory/runme.sh +++ b/test/integration/targets/inventory_vmware_vm_inventory/runme.sh @@ -4,6 +4,9 @@ set -euo pipefail +# Required to differentiate between Python 2 and 3 environ +PYTHON=${ANSIBLE_TEST_PYTHON_INTERPRETER:-python} + export ANSIBLE_CONFIG=ansible.cfg export vcenter_host="${vcenter_host:-0.0.0.0}" export VMWARE_SERVER="${vcenter_host}" @@ -18,7 +21,20 @@ validate_certs: False with_tags: False VMWARE_YAML -trap 'rm -f "${VMWARE_CONFIG}"' INT TERM EXIT +cleanup() { + echo "Cleanup" + if [ -f "${VMWARE_CONFIG}" ]; then + rm -f "${VMWARE_CONFIG}" + fi + if [ -d "$(pwd)/inventory_cache" ]; then + echo "Removing $(pwd)/inventory_cache" + rm -rf "$(pwd)/inventory_cache" + fi + echo "Done" + exit 0 +} + +trap cleanup INT TERM EXIT echo "DEBUG: Using ${vcenter_host} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" @@ -33,5 +49,23 @@ curl "http://${vcenter_host}:5000/govc_find" # Get inventory ansible-inventory -i ${VMWARE_CONFIG} --list + +# Get inventory using YAML +ansible-inventory -i ${VMWARE_CONFIG} --list --yaml + +# Install TOML for --toml +${PYTHON} -m pip install toml + +# Get inventory using TOML +ansible-inventory -i ${VMWARE_CONFIG} --list --toml + +echo "Check if cache is working for inventory plugin" +ls "$(pwd)/inventory_cache/vmware_vm_*" > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Cache directory not found. Please debug" + exit 1 +fi +echo "Cache is working" + # Test playbook with given inventory ansible-playbook -i ${VMWARE_CONFIG} test_vmware_vm_inventory.yml --connection=local "$@"