From 211a2da2b9272bad5cc0635660f5d2b348429af9 Mon Sep 17 00:00:00 2001 From: krisvasudevan <43845852+krisvasudevan@users.noreply.github.com> Date: Sat, 15 Jun 2019 00:21:44 +0530 Subject: [PATCH] Backport to fix bug in nios member module (#57218) * Bug fixes for the nios member object (#56045) * Bug fixes in api.py * Examples updated in nios_member.py * Update lib/ansible/module_utils/net_tools/nios/api.py Co-Authored-By: Sumit Jaiswal (cherry picked from commit d998791b4a3587f7ab3370f0a1f0df8ec43a9c81) * Create 56045-nios-member-module.yaml * Bug fixes to nios_member module --- changelogs/fragments/56045-nios-member-module.yaml | 2 ++ lib/ansible/module_utils/net_tools/nios/api.py | 2 +- lib/ansible/modules/net_tools/nios/nios_member.py | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/56045-nios-member-module.yaml diff --git a/changelogs/fragments/56045-nios-member-module.yaml b/changelogs/fragments/56045-nios-member-module.yaml new file mode 100644 index 00000000000..15fbec55ed9 --- /dev/null +++ b/changelogs/fragments/56045-nios-member-module.yaml @@ -0,0 +1,2 @@ +bugfixes: + - Bug fixes to nios_member module diff --git a/lib/ansible/module_utils/net_tools/nios/api.py b/lib/ansible/module_utils/net_tools/nios/api.py index 834d2030a10..9bcd510b81d 100644 --- a/lib/ansible/module_utils/net_tools/nios/api.py +++ b/lib/ansible/module_utils/net_tools/nios/api.py @@ -159,7 +159,7 @@ def member_normalize(member_spec): 'ha_port_setting', 'lan_port_setting', 'lan2_physical_setting', 'lan_ha_port_setting', 'mgmt_network_setting', 'v6_mgmt_network_setting'] for key in member_spec.keys(): - if key in member_elements: + if key in member_elements and member_spec[key] is not None: member_spec[key] = member_spec[key][0] if isinstance(member_spec[key], dict): member_spec[key] = member_normalize(member_spec[key]) diff --git a/lib/ansible/modules/net_tools/nios/nios_member.py b/lib/ansible/modules/net_tools/nios/nios_member.py index 0776e8698e1..d7f0fd22fd9 100644 --- a/lib/ansible/modules/net_tools/nios/nios_member.py +++ b/lib/ansible/modules/net_tools/nios/nios_member.py @@ -330,11 +330,11 @@ EXAMPLES = ''' router_id: 150 node_info: - lan_ha_port_setting: - ha_ip_address: 192.168.1.70 - mgmt_lan: 192.168.1.80 + - ha_ip_address: 192.168.1.70 + mgmt_lan: 192.168.1.80 - lan_ha_port_setting: - ha_ip_address: 192.168.1.71 - mgmt_lan: 192.168.1.81 + - ha_ip_address: 192.168.1.71 + mgmt_lan: 192.168.1.81 comment: "Created by Ansible" state: present provider: