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.

Sign up for GitHub

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

Jump to bottom

nxos_facts fix and integration tests #36796

Merged
merged 2 commits into from
Feb 28, 2018
Merged

nxos_facts fix and integration tests #36796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad0de6
fix nxos_facts ipv6 error
Feb 27, 2018
07344ad
time_range not supported for N35
Feb 27, 2018
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
6 changes: 5 additions & 1 deletion lib/ansible/modules/network/nxos/nxos_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,11 @@ def parse_ipv6_interfaces(self, data):
name = item['ROW_intf']['intf-name']
intf = self.facts['interfaces'][name]
intf['ipv6'] = self.transform_dict(item, self.INTERFACE_IPV6_MAP)
self.facts['all_ipv6_addresses'].append(item['ROW_intf']['addr'])
try:
addr = item['ROW_intf']['addr']
except KeyError:
addr = item['ROW_intf']['TABLE_addr']['ROW_addr']['addr']
self.facts['all_ipv6_addresses'].append(addr)
else:
return ""
except TypeError:
Expand Down
2 changes: 1 addition & 1 deletion test/integration/targets/nxos_acl/tests/common/sanity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
when: ansible_connection == "local"

- set_fact: time_range="ans-range"
when: not ( platform is match("N5K"))
when: not (platform is match("N5K")) and not (platform is match("N35"))

- name: "Setup: Cleanup possibly existing acl."
nxos_acl: &remove
Expand Down
1 change: 0 additions & 1 deletion test/integration/targets/nxos_command/tests/cli/sanity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- assert: &fail
that:
- "result.failed == true"
- "'Invalid command' in result.msg"

- name: "Enable feature BGP"
nxos_feature:
Expand Down
1 change: 0 additions & 1 deletion test/integration/targets/nxos_command/tests/nxapi/sanity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- assert: &fail
that:
- "result.failed == true"
- "'Input CLI command error' in result.msg"

- name: "Enable feature BGP"
nxos_feature:
Expand Down