mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 13:22:48 +00:00
Add vyos_lldp and vyos_lldp_interface modules (#26753)
* Add vyos_lldp and vyos_lldp_interface modules * Fix module docstring issue * Fix bogus aggregate reference * Add vyos_lldp integration tests * Add vyos_lldp_interface integration tests * Remove unused import for run_commands * Add VyOS net_lldp integration tests * Remove junos and netconf from net_lldp integration tests * Add net_lldp_interface integration tests * Correct CLI filtering tests for VyOS * Fix pep8 issues * Fix more pep8 issues
This commit is contained in:
committed by
GitHub
parent
4b3d6dfa8a
commit
af4dc6d0eb
@@ -85,6 +85,20 @@
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
- block:
|
||||
- include_role:
|
||||
name: net_lldp
|
||||
when: "limit_to in ['*', 'net_lldp']"
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
- block:
|
||||
- include_role:
|
||||
name: net_lldp_interface
|
||||
when: "limit_to in ['*', 'net_lldp_interface']"
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
###########
|
||||
- name: Has any previous test failed?
|
||||
fail:
|
||||
|
||||
0
test/integration/targets/net_lldp/aliases
Normal file
0
test/integration/targets/net_lldp/aliases
Normal file
3
test/integration/targets/net_lldp/defaults/main.yaml
Normal file
3
test/integration/targets/net_lldp/defaults/main.yaml
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
testcase: "*"
|
||||
test_items: []
|
||||
15
test/integration/targets/net_lldp/tasks/cli.yaml
Normal file
15
test/integration/targets/net_lldp/tasks/cli.yaml
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
- name: collect all cli test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/cli"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
3
test/integration/targets/net_lldp/tasks/main.yaml
Normal file
3
test/integration/targets/net_lldp/tasks/main.yaml
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
- { include: cli.yaml, tags: ['cli'] }
|
||||
- { include: netconf.yaml, tags: ['netconf'] }
|
||||
16
test/integration/targets/net_lldp/tasks/netconf.yaml
Normal file
16
test/integration/targets/net_lldp/tasks/netconf.yaml
Normal file
@@ -0,0 +1,16 @@
|
||||
---
|
||||
- name: collect all netconf test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/netconf"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
delegate_to: localhost
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
4
test/integration/targets/net_lldp/tests/cli/basic.yaml
Normal file
4
test/integration/targets/net_lldp/tests/cli/basic.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
---
|
||||
|
||||
- include: "{{ role_path }}/tests/vyos/basic.yaml"
|
||||
when: hostvars[inventory_hostname]['ansible_network_os'] == 'vyos'
|
||||
42
test/integration/targets/net_lldp/tests/vyos/basic.yaml
Normal file
42
test/integration/targets/net_lldp/tests/vyos/basic.yaml
Normal file
@@ -0,0 +1,42 @@
|
||||
---
|
||||
- name: Make sure LLDP is not running before tests
|
||||
vyos_config:
|
||||
lines: delete service lldp
|
||||
|
||||
- name: Enable LLDP service
|
||||
net_lldp:
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp" in result.commands'
|
||||
|
||||
- name: Enable LLDP service again (idempotent)
|
||||
net_lldp:
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Disable LLDP service
|
||||
net_lldp:
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp" in result.commands'
|
||||
|
||||
- name:
|
||||
net_lldp:
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
0
test/integration/targets/net_lldp_interface/aliases
Normal file
0
test/integration/targets/net_lldp_interface/aliases
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
testcase: "*"
|
||||
test_items: []
|
||||
15
test/integration/targets/net_lldp_interface/tasks/cli.yaml
Normal file
15
test/integration/targets/net_lldp_interface/tasks/cli.yaml
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
- name: collect all cli test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/cli"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
- { include: cli.yaml, tags: ['cli'] }
|
||||
- { include: netconf.yaml, tags: ['netconf'] }
|
||||
@@ -0,0 +1,16 @@
|
||||
---
|
||||
- name: collect all netconf test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/netconf"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
delegate_to: localhost
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
|
||||
- include: "{{ role_path }}/tests/vyos/basic.yaml"
|
||||
when: hostvars[inventory_hostname]['ansible_network_os'] == 'vyos'
|
||||
@@ -0,0 +1,165 @@
|
||||
---
|
||||
- name: Make sure LLDP is not running before tests
|
||||
vyos_config:
|
||||
lines: delete service lldp
|
||||
|
||||
- name: Create LLDP configuration
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1" in result.commands'
|
||||
|
||||
- name: Create LLDP configuration again (idempotent)
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Disable LLDP configuration
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: disabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1 disable" in result.commands'
|
||||
|
||||
- name: Disable LLDP configuration again (idempotent)
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: disabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Enable LLDP configuration
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: enabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1 disable" in result.commands'
|
||||
|
||||
- name: Enable LLDP configuration again (idempotent)
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: enabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Delete LLDP configuration
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1" in result.commands'
|
||||
|
||||
- name: Delete LLDP configuration again (idempotent)
|
||||
net_lldp_interface:
|
||||
name: eth1
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Create aggregate of LLDP interface configurations
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1" in result.commands'
|
||||
- '"set service lldp interface eth2" in result.commands'
|
||||
|
||||
- name: Create aggregate of LLDP interface configurations again (idempotent)
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Override LLDP interface configuration on aggregate
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2, state: disabled }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth2 disable" in result.commands'
|
||||
|
||||
- name: Override LLDP interface configuration on aggregate again (idempotent)
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2, state: disabled }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Delete aggregate of LLDP interface configurations
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1" in result.commands'
|
||||
- '"delete service lldp interface eth2" in result.commands'
|
||||
|
||||
- name: Delete aggregate of LLDP interface configurations (idempotent)
|
||||
net_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
3
test/integration/targets/vyos_lldp/defaults/main.yaml
Normal file
3
test/integration/targets/vyos_lldp/defaults/main.yaml
Normal file
@@ -0,0 +1,3 @@
|
||||
---
|
||||
testcase: "*"
|
||||
test_items: []
|
||||
15
test/integration/targets/vyos_lldp/tasks/cli.yaml
Normal file
15
test/integration/targets/vyos_lldp/tasks/cli.yaml
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
- name: collect all cli test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/cli"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
2
test/integration/targets/vyos_lldp/tasks/main.yaml
Normal file
2
test/integration/targets/vyos_lldp/tasks/main.yaml
Normal file
@@ -0,0 +1,2 @@
|
||||
---
|
||||
- { include: cli.yaml, tags: ['cli'] }
|
||||
42
test/integration/targets/vyos_lldp/tests/cli/basic.yaml
Normal file
42
test/integration/targets/vyos_lldp/tests/cli/basic.yaml
Normal file
@@ -0,0 +1,42 @@
|
||||
---
|
||||
- name: Make sure LLDP is not running before tests
|
||||
vyos_config:
|
||||
lines: delete service lldp
|
||||
|
||||
- name: Enable LLDP service
|
||||
vyos_lldp:
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp" in result.commands'
|
||||
|
||||
- name: Enable LLDP service again (idempotent)
|
||||
vyos_lldp:
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Disable LLDP service
|
||||
vyos_lldp:
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp" in result.commands'
|
||||
|
||||
- name:
|
||||
vyos_lldp:
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
testcase: "*"
|
||||
test_items: []
|
||||
15
test/integration/targets/vyos_lldp_interface/tasks/cli.yaml
Normal file
15
test/integration/targets/vyos_lldp_interface/tasks/cli.yaml
Normal file
@@ -0,0 +1,15 @@
|
||||
---
|
||||
- name: collect all cli test cases
|
||||
find:
|
||||
paths: "{{ role_path }}/tests/cli"
|
||||
patterns: "{{ testcase }}.yaml"
|
||||
register: test_cases
|
||||
|
||||
- name: set test_items
|
||||
set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
|
||||
|
||||
- name: run test case
|
||||
include: "{{ test_case_to_run }}"
|
||||
with_items: "{{ test_items }}"
|
||||
loop_control:
|
||||
loop_var: test_case_to_run
|
||||
@@ -0,0 +1,2 @@
|
||||
---
|
||||
- { include: cli.yaml, tags: ['cli'] }
|
||||
@@ -0,0 +1,165 @@
|
||||
---
|
||||
- name: Make sure LLDP is not running before tests
|
||||
vyos_config:
|
||||
lines: delete service lldp
|
||||
|
||||
- name: Create LLDP configuration
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1" in result.commands'
|
||||
|
||||
- name: Create LLDP configuration again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Disable LLDP configuration
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: disabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1 disable" in result.commands'
|
||||
|
||||
- name: Disable LLDP configuration again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: disabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Enable LLDP configuration
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: enabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1 disable" in result.commands'
|
||||
|
||||
- name: Enable LLDP configuration again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: enabled
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Delete LLDP configuration
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1" in result.commands'
|
||||
|
||||
- name: Delete LLDP configuration again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
name: eth1
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Create aggregate of LLDP interface configurations
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth1" in result.commands'
|
||||
- '"set service lldp interface eth2" in result.commands'
|
||||
|
||||
- name: Create aggregate of LLDP interface configurations again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Override LLDP interface configuration on aggregate
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2, state: disabled }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"set service lldp interface eth2 disable" in result.commands'
|
||||
|
||||
- name: Override LLDP interface configuration on aggregate again (idempotent)
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2, state: disabled }
|
||||
state: present
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
|
||||
- name: Delete aggregate of LLDP interface configurations
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == true'
|
||||
- '"delete service lldp interface eth1" in result.commands'
|
||||
- '"delete service lldp interface eth2" in result.commands'
|
||||
|
||||
- name: Delete aggregate of LLDP interface configurations (idempotent)
|
||||
vyos_lldp_interface:
|
||||
aggregate:
|
||||
- { name: eth1 }
|
||||
- { name: eth2 }
|
||||
state: absent
|
||||
register: result
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- 'result.changed == false'
|
||||
@@ -70,6 +70,20 @@
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
- block:
|
||||
- include_role:
|
||||
name: vyos_lldp
|
||||
when: "limit_to in ['*', 'vyos_lldp']"
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
- block:
|
||||
- include_role:
|
||||
name: vyos_lldp_interface
|
||||
when: "limit_to in ['*', 'vyos_lldp_interface']"
|
||||
rescue:
|
||||
- set_fact: test_failed=true
|
||||
|
||||
|
||||
###########
|
||||
- name: Has any previous test failed?
|
||||
|
||||
Reference in New Issue
Block a user