Skip to content

Commit

Permalink
T7013 route maps integration tests (#381)
Browse files Browse the repository at this point in the history
* T7013 route-map integration tests - 1.4 support and structure
* added workaround for 1.4 integration tests for route-maps
* merged commands generalised
* collapse route_maps intgeration tests vars
  • Loading branch information
omnom62 authored Feb 2, 2025
1 parent 563ee24 commit 2eea25f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 24 deletions.
3 changes: 3 additions & 0 deletions changelogs/fragments/T7013_route-maps-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- route_maps - Refactor the integration tests structure and support for 1.4+ versions
21 changes: 2 additions & 19 deletions tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
---
- ansible.builtin.include_tasks: _remove_config.yaml

- name: Setup
- name: Setup {{ vyos_version }}
vyos.vyos.vyos_config:
lines:
- set policy route-map test2 rule 1 action 'permit'
- set policy route-map test2 rule 1 description 'test'
- set policy route-map test2 rule 2 action 'permit'
- set policy route-map test2 rule 2 on-match goto '4'
- set policy route-map test3 rule 1 action 'permit'
- set policy route-map test3 rule 1 match metric '1'
- set policy route-map test3 rule 1 match peer '192.0.2.32'
- set policy route-map test3 rule 1 set community 'internet'
- set policy route-map test3 rule 1 set ip-next-hop '192.0.2.33'
- set policy route-map test3 rule 1 set local-preference '4'
- set policy route-map test3 rule 1 set metric '5'
- set policy route-map test3 rule 1 set metric-type 'type-1'
- set policy route-map test3 rule 1 set origin 'egp'
- set policy route-map test3 rule 1 set originator-id '192.0.2.34'
- set policy route-map test3 rule 1 set tag '5'
- set policy route-map test3 rule 1 set weight '4'
ignore_errors: true
lines: "{{ populate_config }}"
vars:
ansible_connection: ansible.netcommon.network_cli
2 changes: 2 additions & 0 deletions tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
- debug:
msg: START vyos_route_maps merged integration tests on connection={{ ansible_connection }}

- include_tasks: _populate.yaml

- include_tasks: _remove_config.yaml

- block:
Expand Down
25 changes: 20 additions & 5 deletions tests/integration/targets/vyos_route_maps/vars/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ merged:
- set policy route-map test3 rule 1 set weight 4
- set policy route-map test3 rule 1 match metric 1
- set policy route-map test3 rule 1 match peer 192.0.2.32

after:
- route_map: test3
entries:
Expand Down Expand Up @@ -45,10 +44,9 @@ replaced:
- set policy route-map test3 rule 1 set local-preference 6
- set policy route-map test3 rule 1 set metric 4
- set policy route-map test3 rule 1 set tag 4
- delete policy route-map test3 rule 1 set community internet
- delete policy route-map test3 rule 1 set community none
- set policy route-map test3 rule 1 match metric 3
- set policy route-map test3 rule 1 match peer 192.0.2.35

after:
- route_map: test2
entries:
Expand Down Expand Up @@ -82,10 +80,9 @@ overridden:
- set policy route-map test3 rule 1 set local-preference 6
- set policy route-map test3 rule 1 set metric 4
- set policy route-map test3 rule 1 set tag 4
- delete policy route-map test3 rule 1 set community internet
- delete policy route-map test3 rule 1 set community none
- set policy route-map test3 rule 1 match metric 3
- set policy route-map test3 rule 1 match peer 192.0.2.35

after:
- route_map: test3
entries:
Expand All @@ -108,3 +105,21 @@ deleted:
- delete policy route-map test2
- delete policy route-map test3
after: []

populate_config:
- set policy route-map test2 rule 1 action 'permit'
- set policy route-map test2 rule 1 description 'test'
- set policy route-map test2 rule 2 action 'permit'
- set policy route-map test2 rule 2 on-match goto '4'
- set policy route-map test3 rule 1 action 'permit'
- set policy route-map test3 rule 1 match metric '1'
- set policy route-map test3 rule 1 match peer '192.0.2.32'
- set policy route-map test3 rule 1 set community none
- set policy route-map test3 rule 1 set ip-next-hop '192.0.2.33'
- set policy route-map test3 rule 1 set local-preference '4'
- set policy route-map test3 rule 1 set metric '5'
- set policy route-map test3 rule 1 set metric-type 'type-1'
- set policy route-map test3 rule 1 set origin 'egp'
- set policy route-map test3 rule 1 set originator-id '192.0.2.34'
- set policy route-map test3 rule 1 set tag '5'
- set policy route-map test3 rule 1 set weight '4'

0 comments on commit 2eea25f

Please sign in to comment.