From 5ed81820c04101f8c3fc1e901c304d6a56428902 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 10 May 2018 17:38:03 +0530 Subject: [PATCH] VMware: Custom Field in vmware_inventory (#39796) Signed-off-by: Abhijeet Kasurde --- contrib/inventory/vmware_inventory.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py index 28977a3aed..f5785cb9d5 100755 --- a/contrib/inventory/vmware_inventory.py +++ b/contrib/inventory/vmware_inventory.py @@ -494,16 +494,13 @@ class VMWareInventory(object): for k, v in inventory['_meta']['hostvars'].items(): if 'customvalue' in v: for tv in v['customvalue']: - if not isinstance(tv['value'], string_types): - continue - newkey = None field_name = self.custom_fields[tv['key']] if tv['key'] in self.custom_fields else tv['key'] values = [] keylist = map(lambda x: x.strip(), tv['value'].split(',')) for kl in keylist: try: - newkey = self.config.get('vmware', 'custom_field_group_prefix') + str(field_name) + '_' + kl + newkey = "%s%s_%s" % (self.config.get('vmware', 'custom_field_group_prefix'), str(field_name), kl) newkey = newkey.strip() except Exception as e: self.debugl(e) @@ -521,7 +518,6 @@ class VMWareInventory(object): def create_template_mapping(self, inventory, pattern, dtype='string'): ''' Return a hash of uuid to templated string from pattern ''' - mapping = {} for k, v in inventory['_meta']['hostvars'].items(): t = self.env.from_string(pattern) @@ -557,7 +553,15 @@ class VMWareInventory(object): if '.' not in prop: # props without periods are direct attributes of the parent - rdata[key] = getattr(vm, prop) + vm_property = getattr(vm, prop) + if isinstance(vm_property, vim.CustomFieldsManager.Value.Array): + temp_vm_property = [] + for vm_prop in vm_property: + temp_vm_property.append({'key': vm_prop.key, + 'value': vm_prop.value}) + rdata[key] = temp_vm_property + else: + rdata[key] = vm_property else: # props with periods are subkeys of parent attributes parts = prop.split('.')