From 7c19ae75eeee882055af54dc5169b50ee61cc055 Mon Sep 17 00:00:00 2001 From: omnom62 <75066712+omnom62@users.noreply.github.com> Date: Tue, 15 Apr 2025 03:14:04 +1000 Subject: snmp_server 1.4+ support in integration tests (#412) --- changelogs/fragments/T7329_snmp_server_support.yml | 4 ++++ tests/integration/targets/prepare_vyos_tests/tasks/main.yaml | 8 +++----- tests/integration/targets/vyos_snmp_server/meta/main.yaml | 2 ++ tests/integration/targets/vyos_snmp_server/tests/cli/merged.yaml | 1 + .../integration/targets/vyos_snmp_server/tests/cli/rendered.yaml | 1 + tests/integration/targets/vyos_snmp_server/vars/main.yaml | 2 ++ 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/T7329_snmp_server_support.yml diff --git a/changelogs/fragments/T7329_snmp_server_support.yml b/changelogs/fragments/T7329_snmp_server_support.yml new file mode 100644 index 00000000..6d661240 --- /dev/null +++ b/changelogs/fragments/T7329_snmp_server_support.yml @@ -0,0 +1,4 @@ +--- +trivial: + - prepare_vyos_tests - fix dependency script for intergration tests to run on e1000e vNiC + - vyos_snmp_server - add SNMPv3 engine ID to vars and merged.yaml and rendered.yaml to meet 1.4.x and 1.5.x requirements diff --git a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml index 5800a582..3a0e2cc4 100644 --- a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml +++ b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml @@ -1,6 +1,6 @@ --- - name: Ensure required interfaces are present in running-config - vars: + vyos.vyos.vyos_config: lines: |- set interfaces ethernet eth0 address dhcp set interfaces ethernet eth0 speed auto @@ -8,7 +8,5 @@ set interfaces ethernet eth1 address 192.0.2.1/24 set interfaces ethernet eth2 delete interfaces loopback lo - ignore_errors: "{{ result.failed }}" - register: result - ansible.netcommon.cli_config: - config: "{{ lines }}" + vars: + ansible_connection: ansible.netcommon.network_cli diff --git a/tests/integration/targets/vyos_snmp_server/meta/main.yaml b/tests/integration/targets/vyos_snmp_server/meta/main.yaml index ed97d539..7413320e 100644 --- a/tests/integration/targets/vyos_snmp_server/meta/main.yaml +++ b/tests/integration/targets/vyos_snmp_server/meta/main.yaml @@ -1 +1,3 @@ --- +dependencies: + - prepare_vyos_tests diff --git a/tests/integration/targets/vyos_snmp_server/tests/cli/merged.yaml b/tests/integration/targets/vyos_snmp_server/tests/cli/merged.yaml index 991cb42d..9ce0679b 100644 --- a/tests/integration/targets/vyos_snmp_server/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_snmp_server/tests/cli/merged.yaml @@ -20,6 +20,7 @@ - address: 192.0.2.1 port: 33 snmp_v3: + engine_id: "000000000000000000000002" views: - view: default oid: 1 diff --git a/tests/integration/targets/vyos_snmp_server/tests/cli/rendered.yaml b/tests/integration/targets/vyos_snmp_server/tests/cli/rendered.yaml index 17334e4e..644a5571 100644 --- a/tests/integration/targets/vyos_snmp_server/tests/cli/rendered.yaml +++ b/tests/integration/targets/vyos_snmp_server/tests/cli/rendered.yaml @@ -20,6 +20,7 @@ - address: 192.0.2.1 port: 33 snmp_v3: + engine_id: "000000000000000000000002" views: - view: default oid: 1 diff --git a/tests/integration/targets/vyos_snmp_server/vars/main.yaml b/tests/integration/targets/vyos_snmp_server/vars/main.yaml index 4560271f..594d9739 100644 --- a/tests/integration/targets/vyos_snmp_server/vars/main.yaml +++ b/tests/integration/targets/vyos_snmp_server/vars/main.yaml @@ -15,6 +15,7 @@ merged: - set service snmp v3 user adminuser privacy encrypted-password ******** - set service snmp v3 user adminuser group testgroup - set service snmp v3 view default oid 1 + - set service snmp v3 engineid 000000000000000000000002 - set service snmp contact admin2@ex.com after: communities: @@ -30,6 +31,7 @@ merged: port: 33 - address: 20.1.1.1 snmp_v3: + engine_id: "000000000000000000000002" groups: - group: testgroup mode: ro -- cgit v1.2.3