Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- Added dhcp options supports for ipv4 and ipv6 network container. #245

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion plugins/module_utils/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,22 @@ def run(self, ib_obj_type, ib_spec):
if (ib_obj_type == NIOS_IPV4_NETWORK or ib_obj_type == NIOS_IPV6_NETWORK):
proposed_object = convert_members_to_struct(proposed_object)

if (ib_obj_type == NIOS_IPV4_NETWORK_CONTAINER or ib_obj_type == NIOS_IPV6_NETWORK_CONTAINER):

# Iterate over each option and remove the 'num' key
if current_object.get('options') or proposed_object.get('options'):
if current_object.get('options'):
for option in current_object['options']:
option.pop('num', None)

# remove use_options false from current_object
current_object['options'] = [option for option in current_object['options'] if option.get('use_option', True)]

# Assuming 'current_object' is the dictionary containing the 'options' list
current_object['options'] = sorted(current_object['options'], key=lambda x: x['name'])
if proposed_object.get('options'):
proposed_object['options'] = sorted(proposed_object['options'], key=lambda x: x['name'])

if (ib_obj_type == NIOS_RANGE):
if proposed_object.get('new_start_addr'):
proposed_object['start_addr'] = proposed_object.get('new_start_addr')
Expand Down Expand Up @@ -656,7 +672,7 @@ def compare_objects(self, current_object, proposed_object):

# If the lists are of a different length the objects and order of element mismatch
# Ignore DHCP options while comparing due to extra num param is get response
if key != 'options' and proposed_item != current_item:
if proposed_item != current_item:
return False

elif isinstance(proposed_item, dict):
Expand Down
3 changes: 2 additions & 1 deletion plugins/modules/nios_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
of values (see suboptions). When configuring suboptions at
least one of C(name) or C(num) must be specified.
type: list
default: []
elements: dict
suboptions:
name:
Expand Down Expand Up @@ -359,7 +360,7 @@ def main():
network=dict(required=True, aliases=['name', 'cidr'], ib_req=True),
network_view=dict(default='default', ib_req=True),

options=dict(type='list', elements='dict', options=option_spec, transform=options),
options=dict(type='list', elements='dict', options=option_spec, transform=options, default=[]),

template=dict(type='str'),
extattrs=dict(type='dict'),
Expand Down
Loading