From 01273758372bfd62c470d9edb3c177fdae87ad9f Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 11 Aug 2021 13:48:13 -0400 Subject: Drop ansible_become for testing (#199) Drop ansible_become for testing We don't actually need escalated permissions to run these things. Signed-off-by: Paul Belanger pabelanger@redhat.com Reviewed-by: GomathiselviS Reviewed-by: Nathaniel Case Reviewed-by: None --- changelogs/fragments/tests_become.yaml | 3 +++ .../targets/vyos_bgp_address_family/tests/cli/deleted.yaml | 3 +-- .../targets/vyos_bgp_address_family/tests/cli/gathered.yaml | 3 +-- .../targets/vyos_bgp_address_family/tests/cli/merged.yaml | 3 +-- .../targets/vyos_bgp_address_family/tests/cli/overridden.yaml | 3 +-- .../targets/vyos_bgp_address_family/tests/cli/parsed.yaml | 1 - .../targets/vyos_bgp_address_family/tests/cli/replaced.yaml | 3 +-- tests/integration/targets/vyos_bgp_address_family/tests/cli/rtt.yaml | 5 +---- tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml | 3 +-- tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml | 3 +-- tests/integration/targets/vyos_bgp_global/tests/cli/merged.yaml | 3 +-- tests/integration/targets/vyos_bgp_global/tests/cli/parsed.yaml | 1 - tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml | 3 +-- tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml | 3 +-- tests/integration/targets/vyos_config/tests/cli/backup.yaml | 3 --- .../integration/targets/vyos_config/tests/cli_config/cli_backup.yaml | 4 ---- .../integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml | 3 +-- .../integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml | 3 +-- tests/integration/targets/vyos_ospf_interfaces/tests/cli/merged.yaml | 3 +-- .../targets/vyos_ospf_interfaces/tests/cli/overridden.yaml | 3 +-- tests/integration/targets/vyos_ospf_interfaces/tests/cli/parsed.yaml | 1 - .../integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml | 3 +-- tests/integration/targets/vyos_ospf_interfaces/tests/cli/rtt.yaml | 5 +---- tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml | 3 +-- tests/integration/targets/vyos_route_maps/tests/cli/merged.yaml | 3 +-- tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml | 3 +-- tests/integration/targets/vyos_route_maps/tests/cli/parsed.yaml | 1 - tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml | 3 +-- tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml | 4 +--- 29 files changed, 25 insertions(+), 60 deletions(-) create mode 100644 changelogs/fragments/tests_become.yaml diff --git a/changelogs/fragments/tests_become.yaml b/changelogs/fragments/tests_become.yaml new file mode 100644 index 0000000..cc5f2bb --- /dev/null +++ b/changelogs/fragments/tests_become.yaml @@ -0,0 +1,3 @@ +--- +trivial: + - Remove ansible_become usage from integration testing. diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml index 7fb8e10..3519172 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml @@ -23,8 +23,7 @@ - afi: "ipv6" state: deleted - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml index 7176a48..07c9ac3 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml @@ -14,8 +14,7 @@ vyos.vyos.vyos_bgp_address_family: state: gathered - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/merged.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/merged.yaml index f10b196..cf0f821 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/merged.yaml @@ -41,8 +41,7 @@ route_map: "map01" state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml index 77ba5b4..68dd47b 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml @@ -32,8 +32,7 @@ acl: 10 state: overridden - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/parsed.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/parsed.yaml index d20684f..3176797 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/parsed.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/parsed.yaml @@ -4,7 +4,6 @@ }} - name: Provide the running configuration for parsing (config to be parsed) - become: true register: result vyos.vyos.vyos_bgp_address_family: running_config: "{{ lookup('file', '_parsed_config.cfg') }}" diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml index 001c997..b4fe3db 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml @@ -32,8 +32,7 @@ acl: 10 state: replaced - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/rtt.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/rtt.yaml index bb5aea1..e0c4131 100644 --- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/rtt.yaml +++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/rtt.yaml @@ -41,8 +41,7 @@ route_map: "map01" state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_address_family - assert: @@ -53,7 +52,6 @@ - baseconfig.after == ansible_facts['network_resources']['bgp_address_family'] - name: Apply the provided configuration (config to be reverted) - become: true register: result vyos.vyos.vyos_bgp_address_family: config: @@ -73,7 +71,6 @@ neighbor_address: "203.0.113.5" - name: Revert back to base config using facts round trip - become: true register: revert vyos.vyos.vyos_bgp_address_family: config: "{{ ansible_facts['network_resources']['bgp_address_family'] }}" diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml index e1a7754..9c7400e 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml @@ -16,8 +16,7 @@ as_number: "65536" state: deleted - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_global - assert: diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml index 7ec1da8..2022533 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml @@ -14,8 +14,7 @@ vyos.vyos.vyos_bgp_global: state: gathered - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_global - assert: diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/merged.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/merged.yaml index a398b7e..ce332a0 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/merged.yaml @@ -42,8 +42,7 @@ router_id: "192.1.2.9" state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_global - assert: diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/parsed.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/parsed.yaml index 419df6a..7c1665f 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/parsed.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/parsed.yaml @@ -4,7 +4,6 @@ }} - name: Provide the running configuration for parsing (config to be parsed) - become: true register: result vyos.vyos.vyos_bgp_global: running_config: "{{ lookup('file', '_parsed_config.cfg') }}" diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml index 9588e80..46346c2 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml @@ -16,8 +16,7 @@ as_number: "65536" state: purged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_global - assert: diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml index 2a8b407..f1b79b2 100644 --- a/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml @@ -46,8 +46,7 @@ orf: "receive" state: replaced - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: bgp_global - assert: diff --git a/tests/integration/targets/vyos_config/tests/cli/backup.yaml b/tests/integration/targets/vyos_config/tests/cli/backup.yaml index ae59a0d..95fdd98 100644 --- a/tests/integration/targets/vyos_config/tests/cli/backup.yaml +++ b/tests/integration/targets/vyos_config/tests/cli/backup.yaml @@ -43,7 +43,6 @@ - '{{ role_path }}/backup/backup.cfg' - name: take configuration backup in custom filename and directory path - become: true register: result vyos.vyos.vyos_config: backup: true @@ -66,7 +65,6 @@ - backup_file.files is defined - name: take configuration backup in custom filename - become: true register: result vyos.vyos.vyos_config: backup: true @@ -88,7 +86,6 @@ - backup_file.files is defined - name: take configuration backup in custom path and default filename - become: true register: result vyos.vyos.vyos_config: backup: true diff --git a/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml b/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml index 3880a04..516b835 100644 --- a/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml +++ b/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml @@ -23,7 +23,6 @@ with_items: '{{backup_files.files|default([])}}' - name: take config backup - become: true register: result ansible.netcommon.cli_config: backup: true @@ -44,7 +43,6 @@ - backup_files.files is defined - name: take configuration backup in custom filename and directory path - become: true register: result ansible.netcommon.cli_config: backup: true @@ -67,7 +65,6 @@ - backup_file.files is defined - name: take configuration backup in custom filename - become: true register: result ansible.netcommon.cli_config: backup: true @@ -89,7 +86,6 @@ - backup_file.files is defined - name: take configuration backup in custom path and default filename - become: true register: result ansible.netcommon.cli_config: backup: true diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml index 573e611..58cd9ff 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml @@ -16,8 +16,7 @@ - name: "bond2" state: deleted - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml index ec320c3..85a7cf2 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml @@ -14,8 +14,7 @@ vyos.vyos.vyos_ospf_interfaces: state: gathered - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/merged.yaml index fd88780..1dcbac6 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/merged.yaml @@ -26,8 +26,7 @@ passive: true state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml index 67bbca1..0db10d2 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml @@ -23,8 +23,7 @@ dead_interval: 39 state: overridden - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/parsed.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/parsed.yaml index a065a00..4e327e1 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/parsed.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/parsed.yaml @@ -4,7 +4,6 @@ }} - name: Provide the running configuration for parsing (config to be parsed) - become: true register: result vyos.vyos.vyos_ospf_interfaces: running_config: "{{ lookup('file', '_parsed.cfg') }}" diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml index ff32012..a98b616 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml @@ -34,8 +34,7 @@ passive: true state: replaced - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/rtt.yaml index 039d9f6..5f6374d 100644 --- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/rtt.yaml +++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/rtt.yaml @@ -26,8 +26,7 @@ passive: true state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: ospf_interfaces - assert: @@ -38,7 +37,6 @@ - baseconfig.after|symmetric_difference(ansible_facts['network_resources']['ospf_interfaces']) == [] - name: Apply the provided configuration (config to be reverted) - become: true register: result vyos.vyos.vyos_ospf_interfaces: config: @@ -52,7 +50,6 @@ dead_interval: 39 - name: Revert back to base config using facts round trip - become: true register: revert vyos.vyos.vyos_ospf_interfaces: config: "{{ ansible_facts['network_resources']['ospf_interfaces'] }}" diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml index b73fe23..356e975 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml @@ -14,8 +14,7 @@ vyos.vyos.vyos_route_maps: state: gathered - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: route_maps - assert: diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/merged.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/merged.yaml index 4b5ad4c..d679800 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/merged.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/merged.yaml @@ -33,8 +33,7 @@ weight: 4 state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: route_maps - assert: diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml index f014cf1..76971d6 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml @@ -30,8 +30,7 @@ weight: 4 state: overridden - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: route_maps - assert: diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/parsed.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/parsed.yaml index 47cb4cc..ee76852 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/parsed.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/parsed.yaml @@ -4,7 +4,6 @@ }} - name: Provide the running configuration for parsing (config to be parsed) - become: true register: result vyos.vyos.vyos_route_maps: running_config: "{{ lookup('file', '_parsed.cfg') }}" diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml index 893f563..fa0380b 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml @@ -29,8 +29,7 @@ weight: 4 state: replaced - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: route_maps - assert: 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 5c54c23..6b1616b 100644 --- a/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml +++ b/tests/integration/targets/vyos_route_maps/tests/cli/rtt.yaml @@ -33,8 +33,7 @@ weight: 4 state: merged - - become: true - vyos.vyos.vyos_facts: + - vyos.vyos.vyos_facts: gather_network_resources: route_maps - assert: @@ -65,7 +64,6 @@ weight: 4 - name: Revert back to base config using facts round trip - become: true register: revert vyos.vyos.vyos_route_maps: config: "{{ ansible_facts['network_resources']['route_maps'] }}" -- cgit v1.2.3