From 2e707a48cb50b451c4de8b2b664070d424cf0b60 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:46:36 +0100
Subject: [PATCH] dnsrecord: Use FQCN for ansible.builtin
Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is
ansible.builtin.set_fact instead of set_fact for example and aplies for
all actions that are part of ansible.builtin.
All the replaced ansible.builtins:
assert, command, copy, debug, fail, fetch, file, import_playbook,
import_tasks, include_role, include_tasks, include_vars, package,
set_fact, shell, slurp, stat, systemd
---
tests/dnsrecord/env_setup.yml | 4 ++--
tests/dnsrecord/env_vars.yml | 4 ++--
tests/dnsrecord/test_dnsrecord.yml | 6 +++---
tests/dnsrecord/test_dnsrecord_client_context.yml | 6 +++---
tests/dnsrecord/test_dnsrecord_full_records.yml | 4 ++--
tests/dnsrecord/test_dnsrecord_modify_record.yml | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tests/dnsrecord/env_setup.yml b/tests/dnsrecord/env_setup.yml
index 7c0c0810..73e9f305 100644
--- a/tests/dnsrecord/env_setup.yml
+++ b/tests/dnsrecord/env_setup.yml
@@ -1,10 +1,10 @@
---
- name: Setup variables and facts.
- include_tasks: env_vars.yml
+ ansible.builtin.include_tasks: env_vars.yml
# Cleanup before setup.
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
# Common setup tasks.
- name: Ensure DNS testing zones are present.
diff --git a/tests/dnsrecord/env_vars.yml b/tests/dnsrecord/env_vars.yml
index 0e979988..dfa7a8cd 100644
--- a/tests/dnsrecord/env_vars.yml
+++ b/tests/dnsrecord/env_vars.yml
@@ -1,7 +1,7 @@
---
# Set common vars and facts for test.
- name: Set IPv4 address prefix.
- set_fact:
+ ansible.builtin.set_fact:
ipv4_prefix: "{{ ansible_facts['default_ipv4'].address.split('.')[:-1] |
join('.') }}"
ipv4_reverse: "{{ ansible_facts['default_ipv4'].address.split('.')[:-1] |
@@ -9,7 +9,7 @@
join('.') }}"
- name: Set zone prefixes.
- set_fact:
+ ansible.builtin.set_fact:
testzone: 'testzone.test'
safezone: 'safezone.test'
zone_ipv6_reverse: "ip6.arpa."
diff --git a/tests/dnsrecord/test_dnsrecord.yml b/tests/dnsrecord/test_dnsrecord.yml
index d13807f6..b203d366 100644
--- a/tests/dnsrecord/test_dnsrecord.yml
+++ b/tests/dnsrecord/test_dnsrecord.yml
@@ -7,10 +7,10 @@
tasks:
- name: Setup testing environment.
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
- name: Generate self-signed certificates.
- shell:
+ ansible.builtin.shell:
cmd: |
openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -1547,7 +1547,7 @@
# cleanup
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
- name: Remove certificate files. # noqa: deprecated-command-syntax
ansible.builtin.shell: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
diff --git a/tests/dnsrecord/test_dnsrecord_client_context.yml b/tests/dnsrecord/test_dnsrecord_client_context.yml
index 44f59d56..651e17b5 100644
--- a/tests/dnsrecord/test_dnsrecord_client_context.yml
+++ b/tests/dnsrecord/test_dnsrecord_client_context.yml
@@ -6,7 +6,7 @@
tasks:
- name: Include FreeIPA facts.
- include_tasks: ../env_freeipa_facts.yml
+ ansible.builtin.include_tasks: ../env_freeipa_facts.yml
# Test will only be executed if host is not a server.
- name: Execute with server context in the client.
@@ -27,13 +27,13 @@
# in upstream CI.
- name: Test dnsrecord using client context, in client host.
- import_playbook: test_dnsrecord.yml
+ ansible.builtin.import_playbook: test_dnsrecord.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test dnsrecord using client context, in server host.
- import_playbook: test_dnsrecord.yml
+ ansible.builtin.import_playbook: test_dnsrecord.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/dnsrecord/test_dnsrecord_full_records.yml b/tests/dnsrecord/test_dnsrecord_full_records.yml
index cd703d13..af0bc8cb 100644
--- a/tests/dnsrecord/test_dnsrecord_full_records.yml
+++ b/tests/dnsrecord/test_dnsrecord_full_records.yml
@@ -7,7 +7,7 @@
tasks:
- name: Setup test environment
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
# tests
@@ -147,4 +147,4 @@
# Cleanup
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnsrecord/test_dnsrecord_modify_record.yml b/tests/dnsrecord/test_dnsrecord_modify_record.yml
index 6ffd583b..20d78741 100644
--- a/tests/dnsrecord/test_dnsrecord_modify_record.yml
+++ b/tests/dnsrecord/test_dnsrecord_modify_record.yml
@@ -6,7 +6,7 @@
tasks:
- name: Setup testing environment.
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
- name: Add test host.
ipahost:
@@ -177,4 +177,4 @@
state: absent
# cleanup
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
--
GitLab