ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-09 18:04:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

VMware: Fix KeyError in vmware_host_config_manager (#52736)

Browse source 
* Bug fix for vmware_host_config_manager

* Update changelogs/fragments/44561-vmware_host_config_manager-fix_key_error.yml

Co-Authored-By: mariolenz <m@riolenz.de>
This commit is contained in:
Mario Lenz 2019-02-25 08:57:49 +01:00 • committed by Abhijeet Kasurde
commit bcd6702b8a
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/44561-vmware_host_config_manager-fix_key_error.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fixed KeyError issue in vmware_host_config_manager when a supported option isn't already set (https://github.com/ansible/ansible/issues/44561).

52
lib/ansible/modules/cloud/vmware/vmware_host_config_manager.py
View file

@ -129,46 +129,42 @@ class VmwareConfigManager(PyVmomi):
for host in self.hosts: for host in self.hosts:
option_manager = host.configManager.advancedOption option_manager = host.configManager.advancedOption
host_facts = {} host_facts = {}
for option in option_manager.QueryOptions():
host_facts[option.key] = dict(value=option.value)
for s_option in option_manager.supportedOption: for s_option in option_manager.supportedOption:
host_facts[s_option.key].update( host_facts[s_option.key] = dict(option_type=s_option.optionType, value=None)
option_type=s_option.optionType,
) for option in option_manager.QueryOptions():
if option.key in host_facts:
host_facts[option.key].update(
value=option.value,
)
change_option_list = [] change_option_list = []
for option_key, option_value in self.options.items(): for option_key, option_value in self.options.items():
if option_key in host_facts: if option_key in host_facts:
# Make sure option_type is defined some values do not have # We handle all supported types here so we can give meaningful errors.
# it defined and appear to be read only. option_type = host_facts[option_key]['option_type']
if 'option_type' in host_facts[option_key]: if self.is_boolean(option_value) and isinstance(option_type, vim.option.BoolOption):
# We handle all supported types here so we can give meaningful errors. option_value = self.is_truthy(option_value)
option_type = host_facts[option_key]['option_type'] elif (isinstance(option_value, integer_types) or self.is_integer(option_value))\
if self.is_boolean(option_value) and isinstance(option_type, vim.option.BoolOption): and isinstance(option_type, vim.option.IntOption):
option_value = self.is_truthy(option_value) option_value = VmomiSupport.vmodlTypes['int'](option_value)
elif (isinstance(option_value, integer_types) or self.is_integer(option_value))\ elif (isinstance(option_value, integer_types) or self.is_integer(option_value, 'long'))\
and isinstance(option_type, vim.option.IntOption): and isinstance(option_type, vim.option.LongOption):
option_value = VmomiSupport.vmodlTypes['int'](option_value) option_value = VmomiSupport.vmodlTypes['long'](option_value)
elif (isinstance(option_value, integer_types) or self.is_integer(option_value, 'long'))\ elif isinstance(option_value, float) and isinstance(option_type, vim.option.FloatOption):
and isinstance(option_type, vim.option.LongOption): pass
option_value = VmomiSupport.vmodlTypes['long'](option_value) elif isinstance(option_value, string_types) and isinstance(option_type, (vim.option.StringOption, vim.option.ChoiceOption)):
elif isinstance(option_value, float) and isinstance(option_type, vim.option.FloatOption): pass
pass
elif isinstance(option_value, string_types) and isinstance(option_type, (vim.option.StringOption, vim.option.ChoiceOption)):
pass
else:
self.module.fail_json(msg="Provided value is of type %s."
" Option %s expects: %s" % (type(option_value), option_key, type(option_type)))
else: else:
self.module.fail_json(msg="Cannot change read only option %s to %s." % (option_key, option_value)) self.module.fail_json(msg="Provided value is of type %s."
" Option %s expects: %s" % (type(option_value), option_key, type(option_type)))
if option_value != host_facts[option_key]['value']: if option_value != host_facts[option_key]['value']:
change_option_list.append(vim.option.OptionValue(key=option_key, value=option_value)) change_option_list.append(vim.option.OptionValue(key=option_key, value=option_value))
changed = True changed = True
changed_list.append(option_key) changed_list.append(option_key)
else: # Don't silently drop unknown options. This prevents typos from falling through the cracks. else: # Don't silently drop unknown options. This prevents typos from falling through the cracks.
self.module.fail_json(msg="Unknown option %s" % option_key) self.module.fail_json(msg="Unsupported option %s" % option_key)
if changed: if changed:
if self.module.check_mode: if self.module.check_mode:
changed_suffix = ' would be changed.' changed_suffix = ' would be changed.'