diff --git a/tests/ensure_provider_tests.py b/tests/ensure_provider_tests.py index b87b3bf..b779be2 100755 --- a/tests/ensure_provider_tests.py +++ b/tests/ensure_provider_tests.py @@ -18,7 +18,7 @@ GET_NM_VERSION = """ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -27,7 +27,7 @@ GET_NM_VERSION = """ """ MINIMUM_NM_VERSION_CHECK = """ - - NetworkManager_version.stdout is version({minimum_nm_version}, '>=') + - networkmanager_version.stdout is version({minimum_nm_version}, '>=') """ EXTRA_RUN_CONDITION_PREFIX = " - " diff --git a/tests/playbooks/tests_network_state.yml b/tests/playbooks/tests_network_state.yml index 3d43f19..b34ceb6 100644 --- a/tests/playbooks/tests_network_state.yml +++ b/tests/playbooks/tests_network_state.yml @@ -176,7 +176,7 @@ - name: Check if `/etc/resolv.conf` is generated by NM command: grep "Generated by NetworkManager" /etc/resolv.conf - register: generateByNM + register: generate_by_nm ignore_errors: true # noqa ignore-errors changed_when: false @@ -195,7 +195,7 @@ - resolvconf.stdout is not search("example.com") and resolvconf.stdout is not search("example.org") and resolvconf.stdout is not search("2001:4860:4860::8888") or - generateByNM.stdout | length == 0 + generate_by_nm.stdout | length == 0 msg: the file `/etc/resolv.conf` contains the specified DNS configuration diff --git a/tests/tasks/get_NetworkManager_NVR.yml b/tests/tasks/get_NetworkManager_NVR.yml index e68fff5..d0fbf0d 100644 --- a/tests/tasks/get_NetworkManager_NVR.yml +++ b/tests/tasks/get_NetworkManager_NVR.yml @@ -4,15 +4,15 @@ - name: Get NetworkManager RPM version command: cmd: rpm -qa --qf '%{name}-%{version}-%{release}\n' NetworkManager - register: __rpm_q_NetworkManager + register: __rpm_q_networkmanager - name: Store NetworkManager version set_fact: - NetworkManager_NVR: "{{ __rpm_q_NetworkManager.stdout }}" + networkmanager_nvr: "{{ __rpm_q_networkmanager.stdout }}" - name: Show NetworkManager version debug: - var: NetworkManager_NVR + var: networkmanager_nvr tags: - always ... diff --git a/tests/tasks/test_802.1x_capath.yml b/tests/tasks/test_802.1x_capath.yml index 2b7ea9b..3a6c86f 100644 --- a/tests/tasks/test_802.1x_capath.yml +++ b/tests/tasks/test_802.1x_capath.yml @@ -46,7 +46,7 @@ - name: Get NetworkManager version command: cmd: rpm -qa NetworkManager - register: __network_NM_NVR + register: __network_nm_nvr changed_when: false - block: - name: Import network role @@ -83,20 +83,20 @@ with_items: - ansible_failed_result - ansible_failed_task - - __network_NM_NVR.stdout + - __network_nm_nvr.stdout - __NM_capath_ignored_NVRs changed_when: false - name: Assert role behavior vars: - expected_failure: __network_NM_NVR.stdout in __NM_capath_ignored_NVRs + expected_failure: __network_nm_nvr.stdout in __NM_capath_ignored_NVRs failure: __network_connections_result.failed assert: that: (failure and expected_failure) or (not failure and not expected_failure) msg: "Role {{ failure and 'failed' or 'did not fail' }} but was expected {{ expected_failure and '' or 'not' }} to fail. - NM NVR: {{ __network_NM_NVR.stdout }}" + NM NVR: {{ __network_nm_nvr.stdout }}" - name: Assert role failure assert: that: " diff --git a/tests/tests_eth_pci_address_match_nm.yml b/tests/tests_eth_pci_address_match_nm.yml index 730c016..9fd5507 100644 --- a/tests/tests_eth_pci_address_match_nm.yml +++ b/tests/tests_eth_pci_address_match_nm.yml @@ -19,7 +19,7 @@ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -34,4 +34,4 @@ when: - ansible_distribution_major_version != '6' - - NetworkManager_version.stdout is version('1.26.0', '>=') + - networkmanager_version.stdout is version('1.26.0', '>=') diff --git a/tests/tests_ethtool_coalesce_nm.yml b/tests/tests_ethtool_coalesce_nm.yml index 22057cb..e1e38e4 100644 --- a/tests/tests_ethtool_coalesce_nm.yml +++ b/tests/tests_ethtool_coalesce_nm.yml @@ -19,7 +19,7 @@ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -34,4 +34,4 @@ when: - ansible_distribution_major_version != '6' - - NetworkManager_version.stdout is version('1.25.1', '>=') + - networkmanager_version.stdout is version('1.25.1', '>=') diff --git a/tests/tests_ethtool_features_nm.yml b/tests/tests_ethtool_features_nm.yml index c07715b..dbf31e0 100644 --- a/tests/tests_ethtool_features_nm.yml +++ b/tests/tests_ethtool_features_nm.yml @@ -19,7 +19,7 @@ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -34,4 +34,4 @@ when: - ansible_distribution_major_version != '6' - - NetworkManager_version.stdout is version('1.20.0', '>=') + - networkmanager_version.stdout is version('1.20.0', '>=') diff --git a/tests/tests_ethtool_ring_nm.yml b/tests/tests_ethtool_ring_nm.yml index 931f7b3..e17c7e6 100644 --- a/tests/tests_ethtool_ring_nm.yml +++ b/tests/tests_ethtool_ring_nm.yml @@ -19,7 +19,7 @@ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -34,4 +34,4 @@ when: - ansible_distribution_major_version != '6' - - NetworkManager_version.stdout is version('1.25.2', '>=') + - networkmanager_version.stdout is version('1.25.2', '>=') diff --git a/tests/tests_provider_nm.yml b/tests/tests_provider_nm.yml index 2671dcc..90a685a 100644 --- a/tests/tests_provider_nm.yml +++ b/tests/tests_provider_nm.yml @@ -19,7 +19,7 @@ state: present - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager - register: NetworkManager_version + register: networkmanager_version when: true when: - ansible_distribution_major_version != '6' @@ -34,6 +34,6 @@ when: - ansible_distribution_major_version != '6' - - NetworkManager_version.stdout is version('1.20.0', '>=') + - networkmanager_version.stdout is version('1.20.0', '>=') - ansible_distribution != 'RedHat' or ansible_distribution_major_version | int < 9 diff --git a/tests/tests_regression_nm.yml b/tests/tests_regression_nm.yml index 4da4b0c..672173b 100644 --- a/tests/tests_regression_nm.yml +++ b/tests/tests_regression_nm.yml @@ -15,7 +15,7 @@ - name: Get NetworkManager version command: rpm -q --qf "%{version}" NetworkManager when: true - register: NetworkManager_version + register: networkmanager_version # workaround for: https://github.com/ansible/ansible/issues/27973 # There is no way in Ansible to abort a playbook hosts with specific OS @@ -26,6 +26,6 @@ when: - ansible_distribution_major_version != '6' # The test depends on behavior that is only visible with newer NM - - NetworkManager_version.stdout is version('1.22.0', '>=') + - networkmanager_version.stdout is version('1.22.0', '>=') - ansible_distribution != 'RedHat' or ansible_distribution_major_version | int < 9