To resolve nios_network issue where vendor-encapsulated-options can not have a use_option flag (#44259)

* To resolve nios_network issue where vendor-encapsulated-options can not have a use_option flag  (#43925)

* to resolve 43657

* fix shippable error

(cherry picked from commit 4e5dbb92dc)

* adding changelog
pull/44522/head
Sumit Jaiswal 6 years ago committed by Matt Clay
parent 207974fc7c
commit 752b471d03

@ -0,0 +1,4 @@
---
bugfixes:
- To resolve nios_network issue where vendor-encapsulated-options can not have a use_option flag.
(https://github.com/ansible/ansible/pull/43925)

@ -178,6 +178,19 @@ def check_ip_addr_type(ip):
return NIOS_IPV6_NETWORK return NIOS_IPV6_NETWORK
def check_vendor_specific_dhcp_option(module, ib_spec):
'''This function will check if the argument dhcp option belongs to vendor-specific and if yes then will remove
use_options flag which is not supported with vendor-specific dhcp options.
'''
for key, value in iteritems(ib_spec):
if isinstance(module.params[key], list):
temp_dict = module.params[key][0]
if 'num' in temp_dict:
if temp_dict['num'] in (43, 124, 125):
del module.params[key][0]['use_option']
return ib_spec
def main(): def main():
''' Main entry point for module execution ''' Main entry point for module execution
''' '''
@ -218,6 +231,9 @@ def main():
network_type = check_ip_addr_type(obj_filter['network']) network_type = check_ip_addr_type(obj_filter['network'])
wapi = WapiModule(module) wapi = WapiModule(module)
# to check for vendor specific dhcp option
ib_spec = check_vendor_specific_dhcp_option(module, ib_spec)
result = wapi.run(network_type, ib_spec) result = wapi.run(network_type, ib_spec)
module.exit_json(**result) module.exit_json(**result)

Loading…
Cancel
Save