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

Remove redundant aliases from NIOS modules #1223

Merged
merged 8 commits into from
Nov 4, 2020
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
3 changes: 3 additions & 0 deletions changelogs/fragments/1223-nios-remove-redundant-aliases.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- nios_fixed_address, nios_host_record, nios_zone - removed redundant parameter aliases causing warning messages to incorrectly appear in task output (https://github.com/ansible-collections/community.general/issues/852).
10 changes: 4 additions & 6 deletions plugins/modules/net_tools/nios/nios_fixed_address.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
network:
description:
- Specifies the network range in which ipaddr exists.
aliases:
- network
network_view:
description:
- Configures the name of the network view to associate with this
Expand Down Expand Up @@ -244,10 +242,10 @@ def main():

ib_spec = dict(
name=dict(required=True),
ipaddr=dict(required=True, aliases=['ipaddr'], ib_req=True),
mac=dict(required=True, aliases=['mac'], ib_req=True),
network=dict(required=True, aliases=['network']),
network_view=dict(default='default', aliases=['network_view']),
ipaddr=dict(required=True, ib_req=True),
mac=dict(required=True, ib_req=True),
network=dict(required=True),
network_view=dict(default='default'),

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

Expand Down
16 changes: 5 additions & 11 deletions plugins/modules/net_tools/nios/nios_host_record.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,13 @@
- Configures the hardware MAC address for the host record. If user makes
DHCP to true, user need to mention MAC address.
required: false
aliases:
- mac
add:
description:
- If user wants to add the ipv4 address to an existing host record.
Note that with I(add) user will have to keep the I(state) as I(present),
as new IP address is allocated to existing host record. See examples.
type: bool
required: false
aliases:
- add
version_added: '0.2.0'
remove:
description:
Expand All @@ -92,8 +88,6 @@
as IP address is de-allocated from an existing host record. See examples.
type: bool
required: false
aliases:
- remove
version_added: '0.2.0'
ipv6addrs:
description:
Expand Down Expand Up @@ -294,15 +288,15 @@ def main():
ipv4addr_spec = dict(
ipv4addr=dict(required=True, aliases=['address'], ib_req=True),
configure_for_dhcp=dict(type='bool', required=False, aliases=['dhcp'], ib_req=True),
mac=dict(required=False, aliases=['mac'], ib_req=True),
add=dict(type='bool', aliases=['add'], required=False),
remove=dict(type='bool', aliases=['remove'], required=False)
mac=dict(required=False, ib_req=True),
add=dict(type='bool', required=False),
remove=dict(type='bool', required=False)
)

ipv6addr_spec = dict(
ipv6addr=dict(required=True, aliases=['address'], ib_req=True),
configure_for_dhcp=dict(type='bool', required=False, aliases=['configure_for_dhcp'], ib_req=True),
mac=dict(required=False, aliases=['mac'], ib_req=True)
configure_for_dhcp=dict(type='bool', required=False, ib_req=True),
mac=dict(required=False, ib_req=True)
)

ib_spec = dict(
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/net_tools/nios/nios_zone.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def main():

ib_spec = dict(
fqdn=dict(required=True, aliases=['name'], ib_req=True, update=False),
zone_format=dict(default='FORWARD', aliases=['zone_format'], ib_req=False),
zone_format=dict(default='FORWARD', ib_req=False),
view=dict(default='default', aliases=['dns_view'], ib_req=True),

grid_primary=dict(type='list', elements='dict', options=grid_spec),
Expand Down
3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,6 @@ plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-elemen
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-missing-type
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:undocumented-parameter
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-default-does-not-match-spec
Expand All @@ -767,7 +766,6 @@ plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-missing-
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:nonexistent-parameter-documented
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-list-no-elements
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:undocumented-parameter
Expand Down Expand Up @@ -836,7 +834,6 @@ plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-elements-mismat
plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-missing-type
plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_zone.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_zone.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_zone.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_zone.py validate-modules:undocumented-parameter
plugins/modules/net_tools/nsupdate.py validate-modules:parameter-list-no-elements
Expand Down
3 changes: 0 additions & 3 deletions tests/sanity/ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,6 @@ plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-elemen
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-missing-type
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_fixed_address.py validate-modules:undocumented-parameter
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-default-does-not-match-spec
Expand All @@ -767,7 +766,6 @@ plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-missing-
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:nonexistent-parameter-documented
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-list-no-elements
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_host_record.py validate-modules:undocumented-parameter
Expand Down Expand Up @@ -836,7 +834,6 @@ plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-elements-mismat
plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-missing-type
plugins/modules/net_tools/nios/nios_zone.py validate-modules:doc-required-mismatch
plugins/modules/net_tools/nios/nios_zone.py validate-modules:invalid-ansiblemodule-schema
plugins/modules/net_tools/nios/nios_zone.py validate-modules:parameter-alias-self
plugins/modules/net_tools/nios/nios_zone.py validate-modules:parameter-type-not-in-doc
plugins/modules/net_tools/nios/nios_zone.py validate-modules:undocumented-parameter
plugins/modules/net_tools/nsupdate.py validate-modules:parameter-list-no-elements
Expand Down