Skip to content

Commit

Permalink
Merge pull request #279 from HewlettPackard/Linting-fixes
Browse files Browse the repository at this point in the history
Redhat-certification-changes
  • Loading branch information
akshith-gunasheelan authored Oct 30, 2023
2 parents beea76e + 3923cbc commit efc5c25
Show file tree
Hide file tree
Showing 16 changed files with 383 additions and 123 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ skip_list:
- name
- ignore-errors
- literal-compare
- fqcn
13 changes: 6 additions & 7 deletions .github/workflows/.ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jobs:
sanity:
strategy:
matrix:
python_version: ["3.7", "3.8"]
ansible_version: ["stable-2.9", "stable-2.10", "stable-2.11"]
python_version: ["3.9", "3.10"]
ansible_version: ["stable-2.14", "stable-2.15"]
runs-on: ubuntu-20.04
steps:

Expand Down Expand Up @@ -56,12 +56,11 @@ jobs:
fail-fast: true
matrix:
python_version:
- 3.7
- 3.8
- 3.9
- '3.10'
ansible:
- stable-2.9
- stable-2.10
- stable-2.11
- stable-2.14
- stable-2.15

steps:
- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
requires_ansible: '>=2.9.10'
requires_ansible: '>=2.14.0'
4 changes: 2 additions & 2 deletions roles/oneview_enclosure_facts/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
register: version

- name: Print currentVersion if an apiVersion is not specified in config file
set_fact:
ansible.builtin.set_fact:
currentVersion: "{{ version.ansible_facts.version.currentVersion|int }}"
when: config_file.api_version == ""

- name: Print currentVersion if an apiVersion is specified in config file
set_fact:
ansible.builtin.set_fact:
currentVersion: config_file.api_version | string
when: config_file.api_version != ""

Expand Down
2 changes: 1 addition & 1 deletion roles/oneview_enclosure_group/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
sessionID: "{{ session.ansible_facts.session }}"
name: "{{ contents.enclosure_group.lig_name }}"
delegate_to: localhost
- set_fact:
- ansible.builtin.set_fact:
lig_uri: "{{ logical_interconnect_groups[0]['uri'] }}"

- name: Create an Enclosure Group
Expand Down
4 changes: 2 additions & 2 deletions roles/oneview_storage_volume_template_facts/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
name: "{{ contents.storage_volume.volume_template_name }}"
delegate_to: localhost

- debug:
- ansible.builtin.debug:
var: storage_volume_templates

- name: Gather facts about all Fibre Channel Networks
Expand Down Expand Up @@ -103,7 +103,7 @@
delegate_to: localhost
when: currentVersion <= '500'

- debug:
- ansible.builtin.debug:
var: storage_volume_templates
- ansible.builtin.debug:
var: connectable_volume_templates
Expand Down
7 changes: 0 additions & 7 deletions tests/sanity/ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,6 @@ plugins/modules/oneview_task.py validate-modules:missing-gplv3-license
plugins/modules/oneview_task_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user_facts.py validate-modules:missing-gplv3-license
tests/unit/utils/hpe_test_utils.py pylint!skip
tests/unit/test_oneview_server_profile.py pylint!skip
tests/unit/test_oneview.py pep8!skip
tests/unit/test_oneview_fc_network.py pep8!skip
tests/unit/test_oneview_logical_interconnect.py pep8!skip
tests/unit/test_oneview_logical_interconnect_group.py pep8!skip
tests/unit/test_oneview_server_profile.py pep8!skip
plugins/modules/oneview_repositories_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_repositories.py validate-modules:missing-gplv3-license
plugins/modules/oneview_get_session_id.py validate-modules:missing-gplv3-license
Expand Down
7 changes: 0 additions & 7 deletions tests/sanity/ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,6 @@ plugins/modules/oneview_task.py validate-modules:missing-gplv3-license
plugins/modules/oneview_task_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user_facts.py validate-modules:missing-gplv3-license
tests/unit/utils/hpe_test_utils.py pylint!skip
tests/unit/test_oneview_server_profile.py pylint!skip
tests/unit/test_oneview.py pep8!skip
tests/unit/test_oneview_fc_network.py pep8!skip
tests/unit/test_oneview_logical_interconnect.py pep8!skip
tests/unit/test_oneview_logical_interconnect_group.py pep8!skip
tests/unit/test_oneview_server_profile.py pep8!skip
plugins/modules/oneview_repositories_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_repositories.py validate-modules:missing-gplv3-license
plugins/modules/oneview_get_session_id.py validate-modules:missing-gplv3-license
Expand Down
102 changes: 102 additions & 0 deletions tests/sanity/ignore-2.12.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
plugins/modules/oneview_appliance_configuration_timeconfig_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v3_users.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v3_users_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_proxy_configuration.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_proxy_configuration_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_network_interfaces.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_network_interface_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_ssh_access_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_ssh_access.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_time_and_locale_configuration_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_time_and_locale_configuration.py validate-modules:missing-gplv3-license
plugins/modules/oneview_certificates_server.py validate-modules:missing-gplv3-license
plugins/modules/oneview_certificates_server_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v1_trap_destinations.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v1_trap_destinations_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v3_trap_destinations.py validate-modules:missing-gplv3-license
plugins/modules/oneview_appliance_device_snmp_v3_trap_destinations_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_hypervisor_manager.py validate-modules:missing-gplv3-license
plugins/modules/oneview_hypervisor_manager_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_hypervisor_cluster_profile.py validate-modules:missing-gplv3-license
plugins/modules/oneview_hypervisor_cluster_profile_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_system.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_system_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_fc_network.py validate-modules:missing-gplv3-license
plugins/modules/oneview_fc_network_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_firmware_bundle.py validate-modules:missing-gplv3-license
plugins/modules/oneview_firmware_driver.py validate-modules:missing-gplv3-license
plugins/modules/oneview_firmware_driver_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_enclosure.py validate-modules:missing-gplv3-license
plugins/modules/oneview_enclosure_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_uplink_set.py validate-modules:missing-gplv3-license
plugins/modules/oneview_uplink_set_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_ethernet_network.py validate-modules:missing-gplv3-license
plugins/modules/oneview_ethernet_network_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_network_set.py validate-modules:missing-gplv3-license
plugins/modules/oneview_network_set_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_fcoe_network.py validate-modules:missing-gplv3-license
plugins/modules/oneview_fcoe_network_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_version_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_san_manager.py validate-modules:missing-gplv3-license
plugins/modules/oneview_san_manager_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_pool.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_pool_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_hardware.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_hardware_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_hardware_type.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_hardware_type_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_interconnect.py validate-modules:missing-gplv3-license
plugins/modules/oneview_interconnect_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_interconnect_type_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_interconnect_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_interconnect.py validate-modules:missing-gplv3-license
plugins/modules/oneview_volume_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_volume.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_volume_template_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_volume_attachment_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_volume_template.py validate-modules:missing-gplv3-license
plugins/modules/oneview_storage_volume_attachment.py validate-modules:missing-gplv3-license
plugins/modules/oneview_scope.py validate-modules:missing-gplv3-license
plugins/modules/oneview_scope_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_connection_template.py validate-modules:missing-gplv3-license
plugins/modules/oneview_connection_template_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_enclosure.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_enclosure_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_interconnect_group.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logical_interconnect_group_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_enclosure_group.py validate-modules:missing-gplv3-license
plugins/modules/oneview_enclosure_group_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_profile.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_profile_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_profile_template_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_server_profile_template.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools_ipv4_range.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools_ipv4_range_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools_ipv4_subnet.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools_ipv4_subnet_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools.py validate-modules:missing-gplv3-license
plugins/modules/oneview_id_pools_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_label.py validate-modules:missing-gplv3-license
plugins/modules/oneview_label_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_task.py validate-modules:missing-gplv3-license
plugins/modules/oneview_task_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user.py validate-modules:missing-gplv3-license
plugins/modules/oneview_user_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_repositories_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_repositories.py validate-modules:missing-gplv3-license
plugins/modules/oneview_get_session_id.py validate-modules:missing-gplv3-license
plugins/modules/oneview_rack_manager.py validate-modules:missing-gplv3-license
plugins/modules/oneview_rack_manager_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_drive_enclosure.py validate-modules:missing-gplv3-license
plugins/modules/oneview_drive_enclosure_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_jbod.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_jbod_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_jbod_attachment_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_interconnect.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_interconnect_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_interconnect_type_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_interconnect.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_interconnect_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_interconnect_group.py validate-modules:missing-gplv3-license
plugins/modules/oneview_sas_logical_interconnect_group_facts.py validate-modules:missing-gplv3-license
plugins/modules/oneview_logout_session.py validate-modules:missing-gplv3-license
Loading

0 comments on commit efc5c25

Please sign in to comment.