cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
* to resolve 43657

* fix shippable error
This commit is contained in:
Sumit Jaiswal 2018-08-16 09:29:48 +00:00 committed by GitHub
parent ac895828c1
commit 4e5dbb92dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/net_tools/nios/nios_network.py
View file

@ -178,6 +178,19 @@ def check_ip_addr_type(ip):
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():
''' Main entry point for module execution
'''
@ -218,6 +231,9 @@ def main():
network_type = check_ip_addr_type(obj_filter['network'])
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)
module.exit_json(**result)