mirror.MikroTik/ansible-collections.community.routeros
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.routeros.git synced 2025-06-23 02:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ip dhcp-client: dhcp-options can be removed with value '' (#154)

Browse source 
* dhcp-options can be removed with value ''.

* Fix handling of disabled keys on creation.

* Fix typo.
This commit is contained in:
Felix Fontein 2023-03-19 13:14:55 +01:00 • committed by GitHub
parent 071f742100
commit 4329928474
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 166 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/modules/api_modify.py
View file

@ -542,6 +542,22 @@ def get_api_data(api_path, path_info):
return entries
def prepare_for_add(entry, path_info):
new_entry = {}
for k, v in entry.items():
if k.startswith('!'):
real_k = k[1:]
remove_value = path_info.fields[real_k].remove_value
if remove_value is not None:
k = real_k
v = remove_value
else:
if v is None:
v = path_info.fields[k].remove_value
new_entry[k] = v
return new_entry
def sync_list(module, api, path, path_info):
handle_absent_entries = module.params['handle_absent_entries']
handle_entries_content = module.params['handle_entries_content']
@ -661,7 +677,7 @@ def sync_list(module, api, path, path_info):
)
for entry in create_list:
try:
entry['.id'] = api_path.add(**entry)
entry['.id'] = api_path.add(**prepare_for_add(entry, path_info))
except (LibRouterosError, UnicodeEncodeError) as e:
module.fail_json(
msg='Error while creating entry: {error}'.format(
@ -850,7 +866,7 @@ def sync_with_primary_keys(module, api, path, path_info):
)
for entry in create_list:
try:
entry['.id'] = api_path.add(**entry)
entry['.id'] = api_path.add(**prepare_for_add(entry, path_info))
# Store ID for primary keys
pks = tuple(entry[primary_key] for primary_key in primary_keys)
id_by_key[pks] = entry['.id']