diff options
4 files changed, 27 insertions, 24 deletions
diff --git a/changelogs/fragments/T7013_route-maps-integration-tests.yml b/changelogs/fragments/T7013_route-maps-integration-tests.yml new file mode 100644 index 0000000..8736a9c --- /dev/null +++ b/changelogs/fragments/T7013_route-maps-integration-tests.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - route_maps - Refactor the integration tests structure and support for 1.4+ versions diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml index 98e0161..44b5153 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml @@ -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 diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml index af16ddb..1b67e7a 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml @@ -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: diff --git a/tests/integration/targets/vyos_route_maps/vars/main.yaml b/tests/integration/targets/vyos_route_maps/vars/main.yaml index 838cc5e..c4b9d3a 100644 --- a/tests/integration/targets/vyos_route_maps/vars/main.yaml +++ b/tests/integration/targets/vyos_route_maps/vars/main.yaml @@ -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: @@ -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: @@ -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: @@ -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' |