summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromnom62 <75066712+omnom62@users.noreply.github.com>2025-02-13 08:53:42 +1000
committerGitHub <noreply@github.com>2025-02-12 22:53:42 +0000
commit8f7cc603d7f6700302f3d34c7ecfd6faa13ef264 (patch)
treeb60475fed9c54cd681674c38905a5d834de8b68d
parent6e3fdd41056aa104a49b172de16d0d770afe556c (diff)
downloadvyos.vyos-8f7cc603d7f6700302f3d34c7ecfd6faa13ef264.tar.gz
vyos.vyos-8f7cc603d7f6700302f3d34c7ecfd6faa13ef264.zip
T7012 OSPFv3 integration tests fixes (#394)
-rw-r--r--changelogs/fragments/T7012_ospfv3_integration_tests.yaml3
-rw-r--r--tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml14
-rw-r--r--tests/integration/targets/vyos_ospfv3/vars/main.yaml11
3 files changed, 17 insertions, 11 deletions
diff --git a/changelogs/fragments/T7012_ospfv3_integration_tests.yaml b/changelogs/fragments/T7012_ospfv3_integration_tests.yaml
new file mode 100644
index 0000000..b8f1f8b
--- /dev/null
+++ b/changelogs/fragments/T7012_ospfv3_integration_tests.yaml
@@ -0,0 +1,3 @@
+---
+trivial:
+ - vyos_ospfv2 - fix intergration test suite.
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
index c484a7f..3800c52 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
@@ -2,15 +2,7 @@
- ansible.builtin.include_tasks: _remove_config.yaml
- name: Setup
+ vyos.vyos.vyos_config:
+ lines: "{{ populate_commands }}"
vars:
- lines: >-
- "set protocols ospfv3 area 2 export-list 'export1'
- \n set protocols ospfv3 area 2 import-list 'import1'
- \n set protocols ospfv3 area 2 range '2001:db10::/32'
- \n set protocols ospfv3 area 2 range '2001:db20::/32'
- \n set protocols ospfv3 area 2 range '2001:db30::/32'
- \n set protocols ospfv3 area 3 range '2001:db40::/32'
- \n set protocols ospfv3 parameters router-id '192.0.2.10'
- \n set protocols ospfv3 redistribute 'bgp'"
- ansible.netcommon.cli_config:
- config: "{{ lines }}"
+ ansible_connection: ansible.netcommon.network_cli
diff --git a/tests/integration/targets/vyos_ospfv3/vars/main.yaml b/tests/integration/targets/vyos_ospfv3/vars/main.yaml
index 21fce2d..6226579 100644
--- a/tests/integration/targets/vyos_ospfv3/vars/main.yaml
+++ b/tests/integration/targets/vyos_ospfv3/vars/main.yaml
@@ -66,6 +66,17 @@ populate:
router_id: 192.0.2.10
redistribute:
- route_type: bgp
+
+populate_commands:
+ - set protocols ospfv3 area 2 export-list 'export1'
+ - set protocols ospfv3 area 2 import-list 'import1'
+ - set protocols ospfv3 area 2 range '2001:db10::/32'
+ - set protocols ospfv3 area 2 range '2001:db20::/32'
+ - set protocols ospfv3 area 2 range '2001:db30::/32'
+ - set protocols ospfv3 area 3 range '2001:db40::/32'
+ - set protocols ospfv3 parameters router-id '192.0.2.10'
+ - set protocols ospfv3 redistribute 'bgp'
+
replaced:
commands:
- delete protocols ospfv3 area 2 range 2001:db20::/32