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

nxos_interface: Fix admin_state check for n6k (#55673) #56230

Merged
merged 1 commit into from May 21, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/nxos_interface_28.yaml
@@ -0,0 +1,2 @@
bugfixes:
- nxos_interface Fix admin_state check for n6k (https://github.com/ansible/ansible/pull/55673).
15 changes: 15 additions & 0 deletions lib/ansible/modules/network/nxos/nxos_interface.py
Expand Up @@ -573,6 +573,11 @@ def map_config_to_obj(want, module):
elif intf_type in ('loopback', 'management', 'nve'):
obj['name'] = normalize_interface(interface_table.get('interface'))
obj['admin_state'] = interface_table.get('admin_state')
if obj['admin_state'] is None and intf_type == 'loopback':
# Some platforms don't have the 'admin_state' key.
# For loopback interfaces it's safe to use the
# 'state' key instead.
obj['admin_state'] = interface_table.get('state')
obj['description'] = interface_table.get('desc')

elif intf_type == 'portchannel':
Expand All @@ -581,6 +586,16 @@ def map_config_to_obj(want, module):
obj['description'] = interface_table.get('desc')
obj['mtu'] = interface_table.get('eth_mtu')

if obj['admin_state'] is None:
# Some nxos platforms do not have the 'admin_state' key.
# Use the 'state_rsn_desc' key instead to determine the
# admin state of the interface.
state_description = interface_table.get('state_rsn_desc')
if state_description == 'Administratively down':
obj['admin_state'] = 'down'
elif state_description is not None:
obj['admin_state'] = 'up'

objs.append(obj)

return objs
Expand Down
Expand Up @@ -26,11 +26,16 @@
that:
- "result.failed == false"

- name: "Clear interface {{ testint2 }} counters before next task"
nxos_command:
commands: "clear counters interface {{ testint2 }}"
ignore_errors: yes

- name: Check intent arguments (failed condition)
nxos_interface:
name: "{{ testint2 }}"
admin_state: down
tx_rate: gt(0)
tx_rate: gt(10000)
rx_rate: lt(0)
provider: "{{ connection }}"
ignore_errors: yes
Expand All @@ -39,7 +44,7 @@
- assert:
that:
- "result.failed == true"
- "'tx_rate gt(0)' in result.failed_conditions"
- "'tx_rate gt(10000)' in result.failed_conditions"
- "'rx_rate lt(0)' in result.failed_conditions"

- name: aggregate definition of interface
Expand Down