Fix eos integration test failures (#37020)

Fixes #36919

Fix other eos modules integration test failure in dci
This commit is contained in:
Ganesh Nalawade 2018-03-06 10:04:40 +05:30 committed by GitHub
parent bcdaba57b5
commit ba3201cd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 18 deletions

View file

@ -330,7 +330,7 @@ def check_declarative_intent_params(module, want, result):
if result['changed']: if result['changed']:
sleep(w['delay']) sleep(w['delay'])
command = 'show interfaces %s' % w['name'] command = {'command': 'show interfaces %s' % w['name'], 'output': 'text'}
output = run_commands(module, [command]) output = run_commands(module, [command])
if want_state in ('up', 'down'): if want_state in ('up', 'down'):
@ -363,7 +363,8 @@ def check_declarative_intent_params(module, want, result):
have_host = [] have_host = []
have_port = [] have_port = []
if have_neighbors is None: if have_neighbors is None:
have_neighbors = run_commands(module, ['show lldp neighbors {}'.format(w['name'])]) command = {'command': 'show lldp neighbors {}'.format(w['name']), 'output': 'text'}
have_neighbors = run_commands(module, [command])
if have_neighbors[0]: if have_neighbors[0]:
lines = have_neighbors[0].strip().split('\n') lines = have_neighbors[0].strip().split('\n')

View file

@ -58,10 +58,10 @@ from ansible.module_utils.network.eos.eos import eos_argument_spec
def has_lldp(module): def has_lldp(module):
output = run_commands(module, ['show lldp']) config = get_config(module, flags=['| section lldp'])
is_lldp_enable = False is_lldp_enable = False
if len(output) > 0 and "LLDP is not enabled" not in output[0]: if "no lldp run" not in config:
is_lldp_enable = True is_lldp_enable = True
return is_lldp_enable return is_lldp_enable

View file

@ -1,6 +1,11 @@
--- ---
- debug: msg="START eapi/all_facts.yaml" - debug: msg="START eapi/all_facts.yaml"
- name: Make sure LLDP is running (setup)
eos_config:
lines: lldp run
authorize: yes
provider: "{{ eapi }}"
- name: test getting all facts - name: test getting all facts
eos_facts: eos_facts:
@ -9,8 +14,6 @@
- all - all
register: result register: result
- assert: - assert:
that: that:
# _facts modules should never report a change # _facts modules should never report a change
@ -28,4 +31,10 @@
- "result.ansible_facts.ansible_net_memfree_mb > 1" - "result.ansible_facts.ansible_net_memfree_mb > 1"
- "result.ansible_facts.ansible_net_memtotal_mb > 1" - "result.ansible_facts.ansible_net_memtotal_mb > 1"
- name: Make sure LLDP is running (teardown)
eos_config:
lines: no lldp run
authorize: yes
provider: "{{ eapi }}"
- debug: msg="END eapi/all_facts.yaml" - debug: msg="END eapi/all_facts.yaml"

View file

@ -6,6 +6,13 @@
test_interface_1: ethernet1 test_interface_1: ethernet1
test_interface_2: ethernet2 test_interface_2: ethernet2
- name: Make sure LLDP is running
eos_config:
lines: lldp run
authorize: yes
provider: "{{ eapi }}"
become: yes
- name: Check intent arguments - name: Check intent arguments
eos_interface: eos_interface:
name: "{{ test_interface_1 }}" name: "{{ test_interface_1 }}"
@ -159,3 +166,9 @@
- "'host dummy_host' in result.failed_conditions" - "'host dummy_host' in result.failed_conditions"
- "'port dummy_port' in result.failed_conditions" - "'port dummy_port' in result.failed_conditions"
when: "'an-vyos-02' in show_lldp_neighbors_result.stdout[0]" when: "'an-vyos-02' in show_lldp_neighbors_result.stdout[0]"
- name: Make sure LLDP is running (teardown)
eos_config:
lines: no lldp run
authorize: yes
provider: "{{ eapi }}"

View file

@ -18,7 +18,7 @@
- name: Configure interface ipv4 address - name: Configure interface ipv4 address
eos_l3_interface: eos_l3_interface:
name: "{{ test_interface_1 }}" name: "{{ test_interface_1 }}"
ipv4: 192.108.0.1/24 ipv4: 192.108.1.1/24
state: present state: present
authorize: yes authorize: yes
provider: "{{ cli }}" provider: "{{ cli }}"
@ -29,12 +29,12 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"interface {{ test_interface_1 }}" in result.commands' - '"interface {{ test_interface_1 }}" in result.commands'
- '"ip address 192.108.0.1/24" in result.commands' - '"ip address 192.108.1.1/24" in result.commands'
- name: Configure interface ipv4 address (idempotent) - name: Configure interface ipv4 address (idempotent)
eos_l3_interface: eos_l3_interface:
name: "{{ test_interface_1 }}" name: "{{ test_interface_1 }}"
ipv4: 192.108.0.1/24 ipv4: 192.108.1.1/24
state: present state: present
authorize: yes authorize: yes
provider: "{{ cli }}" provider: "{{ cli }}"
@ -144,8 +144,8 @@
- name: Configure ipv4 and ipv6 address using aggregate - name: Configure ipv4 and ipv6 address using aggregate
eos_l3_interface: eos_l3_interface:
aggregate: aggregate:
- { name: "{{ test_interface_1 }}", ipv4: 192.108.0.1/24, ipv6: "fd5d:12c9:2201:2::2/64" } - { name: "{{ test_interface_1 }}", ipv4: 192.108.1.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
- { name: "{{ test_interface_2 }}", ipv4: 192.109.0.2/16, ipv6: "fd5e:12c9:2201:3::3/32" } - { name: "{{ test_interface_2 }}", ipv4: 192.109.1.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
authorize: yes authorize: yes
provider: "{{ cli }}" provider: "{{ cli }}"
become: yes become: yes
@ -155,17 +155,17 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"interface {{ test_interface_1 }}" in result.commands' - '"interface {{ test_interface_1 }}" in result.commands'
- '"ip address 192.108.0.1/24" in result.commands' - '"ip address 192.108.1.1/24" in result.commands'
- '"ipv6 address fd5d:12c9:2201:2::2/64" in result.commands' - '"ipv6 address fd5d:12c9:2201:2::2/64" in result.commands'
- '"interface {{ test_interface_2 }}" in result.commands' - '"interface {{ test_interface_2 }}" in result.commands'
- '"ip address 192.109.0.2/16" in result.commands' - '"ip address 192.109.1.2/16" in result.commands'
- '"ipv6 address fd5e:12c9:2201:3::3/32" in result.commands' - '"ipv6 address fd5e:12c9:2201:3::3/32" in result.commands'
- name: Configure ipv4 and ipv6 address using aggregate (idempotent) - name: Configure ipv4 and ipv6 address using aggregate (idempotent)
eos_l3_interface: eos_l3_interface:
aggregate: aggregate:
- { name: "{{ test_interface_1 }}", ipv4: 192.108.0.1/24, ipv6: "fd5d:12c9:2201:2::2/64" } - { name: "{{ test_interface_1 }}", ipv4: 192.108.1.1/24, ipv6: "fd5d:12c9:2201:2::2/64" }
- { name: "{{ test_interface_2 }}", ipv4: 192.109.0.2/16, ipv6: "fd5e:12c9:2201:3::3/32" } - { name: "{{ test_interface_2 }}", ipv4: 192.109.1.2/16, ipv6: "fd5e:12c9:2201:3::3/32" }
authorize: yes authorize: yes
provider: "{{ cli }}" provider: "{{ cli }}"
become: yes become: yes

View file

@ -17,7 +17,7 @@
- name: Configure interface ipv4 address - name: Configure interface ipv4 address
eos_l3_interface: eos_l3_interface:
name: "{{ test_interface_1 }}" name: "{{ test_interface_1 }}"
ipv4: 192.168.0.1/24 ipv4: 192.168.1.1/24
state: present state: present
authorize: yes authorize: yes
provider: "{{ eapi }}" provider: "{{ eapi }}"
@ -27,12 +27,12 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"interface {{ test_interface_1 }}" in result.commands' - '"interface {{ test_interface_1 }}" in result.commands'
- '"ip address 192.168.0.1/24" in result.commands' - '"ip address 192.168.1.1/24" in result.commands'
- name: Configure interface ipv4 address (idempotent) - name: Configure interface ipv4 address (idempotent)
eos_l3_interface: eos_l3_interface:
name: "{{ test_interface_1 }}" name: "{{ test_interface_1 }}"
ipv4: 192.168.0.1/24 ipv4: 192.168.1.1/24
state: present state: present
authorize: yes authorize: yes
provider: "{{ eapi }}" provider: "{{ eapi }}"