From 961a6467f4bf4d477fa84ffd5ca7665d557d505f Mon Sep 17 00:00:00 2001 From: doriac11 Date: Wed, 9 Jul 2025 13:17:24 +0100 Subject: [PATCH] When repliction_mode is Async allow RPO to be set --- .github/workflows/ansible-test.yml | 39 ++++++++++---------- .gitignore | 44 +++++++++++++++++++++++ playbooks/modules/cifsserver.yml | 2 +- playbooks/modules/filesystem.yml | 13 ------- playbooks/modules/host.yml | 2 +- playbooks/modules/nfsserver.yml | 2 +- playbooks/modules/replication_session.yml | 4 +-- playbooks/modules/smbshare.yml | 8 ++--- playbooks/modules/snapshot.yml | 2 +- playbooks/modules/snapshotschedule.yml | 8 ++--- playbooks/modules/storagepool.yml | 4 +-- playbooks/modules/user_quota.yml | 2 +- plugins/modules/cifsserver.py | 5 ++- plugins/modules/consistencygroup.py | 5 ++- plugins/modules/filesystem.py | 8 +++-- plugins/modules/filesystem_snapshot.py | 5 ++- plugins/modules/host.py | 5 ++- plugins/modules/info.py | 5 ++- plugins/modules/interface.py | 5 ++- plugins/modules/nasserver.py | 5 ++- plugins/modules/nfs.py | 5 ++- plugins/modules/nfsserver.py | 5 ++- plugins/modules/replication_session.py | 5 ++- plugins/modules/smbshare.py | 5 ++- plugins/modules/snapshot.py | 5 ++- plugins/modules/snapshotschedule.py | 5 ++- plugins/modules/storagepool.py | 5 ++- plugins/modules/tree_quota.py | 5 ++- plugins/modules/user_quota.py | 5 ++- plugins/modules/volume.py | 5 ++- tests/sanity/ignore-2.14.txt | 32 ----------------- tests/sanity/ignore-2.15.txt | 32 ----------------- tests/sanity/ignore-2.16.txt | 26 -------------- tests/sanity/ignore-2.17.txt | 18 ---------- tests/unit/requirements.txt | 2 +- 35 files changed, 119 insertions(+), 214 deletions(-) create mode 100644 .gitignore delete mode 100644 tests/sanity/ignore-2.14.txt delete mode 100644 tests/sanity/ignore-2.15.txt delete mode 100644 tests/sanity/ignore-2.16.txt delete mode 100644 tests/sanity/ignore-2.17.txt diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index ff8d181..358c33d 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - ansible-version: [stable-2.14, stable-2.15, stable-2.16, devel] + ansible-version: [stable-2.18] steps: - name: Check out code uses: actions/checkout@v3 @@ -31,7 +31,7 @@ jobs: run: ansible-galaxy collection build --output-path "${GITHUB_WORKSPACE}/.cache/collection-tarballs" - name: Store migrated collection artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4.4.0 with: name: collection path: .cache/collection-tarballs @@ -50,15 +50,16 @@ jobs: matrix: python: ['3.9', '3.10', '3.11'] ansible: - - stable-2.14 - stable-2.15 - stable-2.16 + - stable-2.17 + - stable-2.18 - devel exclude: - - ansible: stable-2.16 - python: '3.9' + - ansible: stable-2.18 + python: '3.10' - ansible: devel - python: '3.9' + python: '3.10' steps: - name: Perform unit testing with ansible-test @@ -76,21 +77,23 @@ jobs: sanity: name: Sanity (Ⓐ${{ matrix.ansible }} with ${{ matrix.python }} python) + runs-on: ubuntu-latest needs: [build] strategy: + fail-fast: false matrix: - python: ['3.9', '3.10', '3.11'] + python: ['3.10', '3.11'] ansible: - - stable-2.14 - stable-2.15 - stable-2.16 + - stable-2.17 + - stable-2.18 - devel exclude: - - ansible: stable-2.16 - python: '3.9' + - ansible: stable-2.18 + python: '3.10' - ansible: devel - python: '3.9' - runs-on: ubuntu-latest + python: '3.10' steps: - name: Perform sanity testing uses: ansible-community/ansible-test-gh-action@release/v1 @@ -108,14 +111,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11"] - ansible-version: [stable-2.14, stable-2.15, stable-2.16, devel] - exclude: - # Ansible-core 2.16 is supported only from Python 3.10 onwards - - python-version: "3.9" - ansible-version: stable-2.16 - - python-version: '3.9' - ansible-version: devel + python-version: ["3.11"] + ansible-version: [stable-2.18, devel] steps: # Important: This sets up your GITHUB_WORKSPACE environment variable @@ -136,7 +133,7 @@ jobs: run: pip install ansible-lint --disable-pip-version-check - name: Download migrated collection artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4.1.8 with: name: collection path: .cache/collection-tarballs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e4f6705 --- /dev/null +++ b/.gitignore @@ -0,0 +1,44 @@ +output + +# Byte-compiled Python files +*.pyc +*.pyo +__pycache__/ + +# Virtual environment directories +venv/ +.env/ + +# Distribution packages +dist/ +build/ +*.egg-info/ + +# Ansible-related temporary files +*.retry +.cache/ + +# Test coverage reports +htmlcov/ +.coverage +.tox/ + +# Editor-specific files +.idea/ +.vscode/ +*.swp +*~ + +# System-specific files +.DS_Store +Thumbs.db + +# Log files +*.log + +# Ignore secrets or configuration files +secrets.yml +config.yml + +# ansible-galaxy build output files +*.tar.gz diff --git a/playbooks/modules/cifsserver.yml b/playbooks/modules/cifsserver.yml index ee2f980..362c3ea 100644 --- a/playbooks/modules/cifsserver.yml +++ b/playbooks/modules/cifsserver.yml @@ -126,7 +126,7 @@ state: "absent" check_mode: true - - name: Delete CIFS server + - name: Delete CIFS server with domain dellemc.unity.cifsserver: unispherehost: "{{ unispherehost }}" username: "{{ username }}" diff --git a/playbooks/modules/filesystem.yml b/playbooks/modules/filesystem.yml index 3675710..d45effb 100644 --- a/playbooks/modules/filesystem.yml +++ b/playbooks/modules/filesystem.yml @@ -140,19 +140,6 @@ is_smb_notify_on_access_enabled: true state: "present" - - name: Modify FileSystem smb_properties - Idempotency - dellemc.unity.filesystem: - unispherehost: "{{ unispherehost }}" - username: "{{ username }}" - password: "{{ password }}" - validate_certs: "{{ validate_certs }}" - filesystem_id: "{{ filesystem_id }}" - smb_properties: - is_smb_op_locks_enabled: true - smb_notify_on_change_dir_depth: 5 - is_smb_notify_on_access_enabled: true - state: "present" - - name: Modify FileSystem snap schedule dellemc.unity.filesystem: unispherehost: "{{ unispherehost }}" diff --git a/playbooks/modules/host.yml b/playbooks/modules/host.yml index 04b28c8..32db169 100644 --- a/playbooks/modules/host.yml +++ b/playbooks/modules/host.yml @@ -26,7 +26,7 @@ description: "ansible-test-host-1" state: "present" - - name: Set host_id + - name: Set host_id empty host ansible.builtin.set_fact: host_id_1: "{{ result.host_details.id }}" diff --git a/playbooks/modules/nfsserver.yml b/playbooks/modules/nfsserver.yml index 83d0d7b..58e1044 100644 --- a/playbooks/modules/nfsserver.yml +++ b/playbooks/modules/nfsserver.yml @@ -51,7 +51,7 @@ nas_server_name: "dummy_nas" state: "present" - - name: Delete NFS server + - name: Delete NFS server with windows kdctype dellemc.unity.nfsserver: unispherehost: "{{ unispherehost }}" username: "{{ username }}" diff --git a/playbooks/modules/replication_session.yml b/playbooks/modules/replication_session.yml index 484e29a..3228b42 100644 --- a/playbooks/modules/replication_session.yml +++ b/playbooks/modules/replication_session.yml @@ -11,7 +11,7 @@ session_name: "test-session" tasks: - - name: Get replication session details + - name: Get replication session details using name dellemc.unity.replication_session: unispherehost: "{{ unispherehost }}" username: "{{ username }}" @@ -19,7 +19,7 @@ validate_certs: "{{ validate_certs }}" session_name: "{{ session_name }}" - - name: Get replication session details + - name: Get replication session details using ID dellemc.unity.replication_session: unispherehost: "{{ unispherehost }}" username: "{{ username }}" diff --git a/playbooks/modules/smbshare.yml b/playbooks/modules/smbshare.yml index 91de71d..5de9f66 100644 --- a/playbooks/modules/smbshare.yml +++ b/playbooks/modules/smbshare.yml @@ -143,7 +143,7 @@ is_encryption_enabled: true state: "present" - - name: Set Snapshot SMB Share ID + - name: Set Snapshot SMB Share ID for Snapshot ansible.builtin.set_fact: snap_share_id: "{{ smb_result.smb_share_details.id }}" @@ -165,7 +165,7 @@ is_encryption_enabled: true state: "present" - - name: Get SMB Share Details using Name + - name: Get SMB Share Details using Name for Snapshot dellemc.unity.smbshare: unispherehost: "{{ unispherehost }}" username: "{{ username }}" @@ -175,7 +175,7 @@ snapshot_name: "{{ snapshot_name }}" state: "present" - - name: Update the details of the SMB share + - name: Update the details of the SMB share for Snapshot dellemc.unity.smbshare: unispherehost: "{{ unispherehost }}" username: "{{ username }}" @@ -192,7 +192,7 @@ is_encryption_enabled: false state: "present" - - name: Update the details of the SMB share Idempotency + - name: Update the details of the SMB share for Snapshot Idempotency dellemc.unity.smbshare: unispherehost: "{{ unispherehost }}" username: "{{ username }}" diff --git a/playbooks/modules/snapshot.yml b/playbooks/modules/snapshot.yml index 164106f..d744bb5 100644 --- a/playbooks/modules/snapshot.yml +++ b/playbooks/modules/snapshot.yml @@ -66,7 +66,7 @@ host_state: "mapped" state: "present" - - name: Set snapshot id + - name: Set snapshot id for LUN ansible.builtin.set_fact: vol_snapshot_id: "{{ result.snapshot_details.id }}" diff --git a/playbooks/modules/snapshotschedule.yml b/playbooks/modules/snapshotschedule.yml index f2859a0..4b1e45b 100644 --- a/playbooks/modules/snapshotschedule.yml +++ b/playbooks/modules/snapshotschedule.yml @@ -157,7 +157,7 @@ id: "{{ id }}" state: "{{ state_absent }}" - - name: Delete snapshot schedule using name + - name: Delete snapshot schedule using name for day dellemc.unity.snapshotschedule: unispherehost: "{{ unispherehost }}" validate_certs: "{{ validate_certs }}" @@ -166,7 +166,7 @@ name: "Ansible_Every_Day_Testing" state: "{{ state_absent }}" - - name: Delete snapshot schedule using name + - name: Delete snapshot schedule using name for N days dellemc.unity.snapshotschedule: unispherehost: "{{ unispherehost }}" validate_certs: "{{ validate_certs }}" @@ -175,7 +175,7 @@ name: "Ansible_Every_N_Day_Testing" state: "{{ state_absent }}" - - name: Delete snapshot schedule using name + - name: Delete snapshot schedule using name for week dellemc.unity.snapshotschedule: unispherehost: "{{ unispherehost }}" validate_certs: "{{ validate_certs }}" @@ -184,7 +184,7 @@ name: "Ansible_Every_Week_Testing" state: "{{ state_absent }}" - - name: Delete snapshot schedule using name + - name: Delete snapshot schedule using name for month dellemc.unity.snapshotschedule: unispherehost: "{{ unispherehost }}" validate_certs: "{{ validate_certs }}" diff --git a/playbooks/modules/storagepool.yml b/playbooks/modules/storagepool.yml index a53328e..4eb565a 100644 --- a/playbooks/modules/storagepool.yml +++ b/playbooks/modules/storagepool.yml @@ -26,7 +26,7 @@ pool_type: "DYNAMIC" tasks: - - name: Get the details of Storage pool by name + - name: Get the details of the full storage pool by name dellemc.unity.storagepool: unispherehost: "{{ unispherehost }}" username: "{{ username }}" @@ -124,7 +124,7 @@ fast_cache: "{{ fast_cache_enabled }}" state: "present" - - name: Rename Storage pool by name + - name: Rename Storage pool by name back to original dellemc.unity.storagepool: unispherehost: "{{ unispherehost }}" username: "{{ username }}" diff --git a/playbooks/modules/user_quota.yml b/playbooks/modules/user_quota.yml index 350cf4f..cfaa895 100644 --- a/playbooks/modules/user_quota.yml +++ b/playbooks/modules/user_quota.yml @@ -149,7 +149,7 @@ hard_limit: "2" state: "{{ state_present }}" - - name: Set user_quota_id + - name: Set user_quota_id for tree ansible.builtin.set_fact: user_quota_id: "{{ result_user_quota.get_user_quota_details.id }}" diff --git a/plugins/modules/cifsserver.py b/plugins/modules/cifsserver.py index 0225eb3..a82339a 100644 --- a/plugins/modules/cifsserver.py +++ b/plugins/modules/cifsserver.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2022, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2022-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing CIFS server on Unity""" diff --git a/plugins/modules/consistencygroup.py b/plugins/modules/consistencygroup.py index c5c4b55..8c6d5af 100644 --- a/plugins/modules/consistencygroup.py +++ b/plugins/modules/consistencygroup.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing consistency group on Unity""" diff --git a/plugins/modules/filesystem.py b/plugins/modules/filesystem.py index d8057ac..bc9423f 100644 --- a/plugins/modules/filesystem.py +++ b/plugins/modules/filesystem.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing FileSystem on Unity""" @@ -1467,11 +1466,14 @@ def modify_replication_session(self, obj_fs, repl_session, replication_params): try: LOG.info("Modifying replication session of filesystem %s", obj_fs.name) modify_payload = {} + rpo = 0 if replication_params['replication_mode']: if replication_params['replication_mode'] == 'manual': rpo = -1 elif replication_params['replication_mode'] == 'synchronous': rpo = 0 + elif replication_params['replication_mode'] == 'asynchronous': + rpo = replication_params.get('rpo', 0) elif replication_params['rpo']: rpo = replication_params['rpo'] name = repl_session.name diff --git a/plugins/modules/filesystem_snapshot.py b/plugins/modules/filesystem_snapshot.py index 93258c8..b29f432 100644 --- a/plugins/modules/filesystem_snapshot.py +++ b/plugins/modules/filesystem_snapshot.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """ Ansible module for managing Filesystem Snapshots on Unity""" diff --git a/plugins/modules/host.py b/plugins/modules/host.py index fcc13dd..bd377b2 100644 --- a/plugins/modules/host.py +++ b/plugins/modules/host.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing host on Unity""" diff --git a/plugins/modules/info.py b/plugins/modules/info.py index b924d67..8eba991 100644 --- a/plugins/modules/info.py +++ b/plugins/modules/info.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for Gathering information about Unity""" diff --git a/plugins/modules/interface.py b/plugins/modules/interface.py index 70be802..9b92cd9 100644 --- a/plugins/modules/interface.py +++ b/plugins/modules/interface.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2022, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2022-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing Interfaces on Unity""" diff --git a/plugins/modules/nasserver.py b/plugins/modules/nasserver.py index 446611f..5b32933 100644 --- a/plugins/modules/nasserver.py +++ b/plugins/modules/nasserver.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import (absolute_import, division, print_function) diff --git a/plugins/modules/nfs.py b/plugins/modules/nfs.py index d0426f9..3cff9b5 100644 --- a/plugins/modules/nfs.py +++ b/plugins/modules/nfs.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing nfs export on Unity""" diff --git a/plugins/modules/nfsserver.py b/plugins/modules/nfsserver.py index 90aba93..963e74b 100644 --- a/plugins/modules/nfsserver.py +++ b/plugins/modules/nfsserver.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2022, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2022-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)) """Ansible module for managing NFS server on Unity""" diff --git a/plugins/modules/replication_session.py b/plugins/modules/replication_session.py index 20907d5..c367c9d 100644 --- a/plugins/modules/replication_session.py +++ b/plugins/modules/replication_session.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2023, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2023-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing replication session on Unity""" diff --git a/plugins/modules/smbshare.py b/plugins/modules/smbshare.py index d8b78a7..2034c2f 100644 --- a/plugins/modules/smbshare.py +++ b/plugins/modules/smbshare.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import (absolute_import, division, print_function) diff --git a/plugins/modules/snapshot.py b/plugins/modules/snapshot.py index efdd6e2..e3b65af 100644 --- a/plugins/modules/snapshot.py +++ b/plugins/modules/snapshot.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """ Ansible module for managing Snapshots on Unity""" diff --git a/plugins/modules/snapshotschedule.py b/plugins/modules/snapshotschedule.py index 0690239..866fdf1 100644 --- a/plugins/modules/snapshotschedule.py +++ b/plugins/modules/snapshotschedule.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing snapshot schedules on Unity""" diff --git a/plugins/modules/storagepool.py b/plugins/modules/storagepool.py index b7b8bfd..6c64f1e 100644 --- a/plugins/modules/storagepool.py +++ b/plugins/modules/storagepool.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing storage pool on Unity""" diff --git a/plugins/modules/tree_quota.py b/plugins/modules/tree_quota.py index dd0a763..129980d 100644 --- a/plugins/modules/tree_quota.py +++ b/plugins/modules/tree_quota.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2021, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2021-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)) """Ansible module for managing quota tree on Unity""" diff --git a/plugins/modules/user_quota.py b/plugins/modules/user_quota.py index 0a09ff4..e489100 100644 --- a/plugins/modules/user_quota.py +++ b/plugins/modules/user_quota.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2021, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2021-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing User Quota on Unity""" diff --git a/plugins/modules/volume.py b/plugins/modules/volume.py index 4b23267..9833f38 100644 --- a/plugins/modules/volume.py +++ b/plugins/modules/volume.py @@ -1,7 +1,6 @@ #!/usr/bin/python -# Copyright: (c) 2020, Dell Technologies - -# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt) +# Copyright: (c) 2020-2025, Dell Technologies +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) """Ansible module for managing volumes on Unity""" diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt deleted file mode 100644 index a7aa131..0000000 --- a/tests/sanity/ignore-2.14.txt +++ /dev/null @@ -1,32 +0,0 @@ -plugins/modules/consistencygroup.py validate-modules:missing-gplv3-license -plugins/modules/filesystem.py validate-modules:missing-gplv3-license -plugins/modules/filesystem_snapshot.py validate-modules:missing-gplv3-license -plugins/modules/info.py validate-modules:missing-gplv3-license -plugins/modules/host.py validate-modules:missing-gplv3-license -plugins/modules/nasserver.py validate-modules:missing-gplv3-license -plugins/modules/nfs.py validate-modules:missing-gplv3-license -plugins/modules/smbshare.py validate-modules:missing-gplv3-license -plugins/modules/snapshot.py validate-modules:missing-gplv3-license -plugins/modules/snapshotschedule.py validate-modules:missing-gplv3-license -plugins/modules/storagepool.py validate-modules:missing-gplv3-license -plugins/modules/tree_quota.py validate-modules:missing-gplv3-license -plugins/modules/user_quota.py validate-modules:missing-gplv3-license -plugins/modules/volume.py validate-modules:missing-gplv3-license -plugins/modules/cifsserver.py validate-modules:missing-gplv3-license -plugins/modules/nfsserver.py validate-modules:missing-gplv3-license -plugins/modules/host.py import-2.7 -plugins/modules/interface.py import-2.7 -plugins/modules/nfs.py import-2.7 -plugins/modules/nfs.py import-3.5 -plugins/modules/nfs.py compile-2.7 -plugins/modules/nfs.py compile-3.5 -plugins/modules/filesystem.py compile-2.7 -plugins/modules/filesystem.py compile-3.5 -plugins/modules/filesystem.py import-2.7 -plugins/modules/filesystem.py import-3.5 -plugins/modules/interface.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py import-2.7 -plugins/modules/replication_session.py import-3.5 -plugins/modules/replication_session.py compile-2.7 -plugins/modules/replication_session.py compile-3.5 diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index a7aa131..0000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1,32 +0,0 @@ -plugins/modules/consistencygroup.py validate-modules:missing-gplv3-license -plugins/modules/filesystem.py validate-modules:missing-gplv3-license -plugins/modules/filesystem_snapshot.py validate-modules:missing-gplv3-license -plugins/modules/info.py validate-modules:missing-gplv3-license -plugins/modules/host.py validate-modules:missing-gplv3-license -plugins/modules/nasserver.py validate-modules:missing-gplv3-license -plugins/modules/nfs.py validate-modules:missing-gplv3-license -plugins/modules/smbshare.py validate-modules:missing-gplv3-license -plugins/modules/snapshot.py validate-modules:missing-gplv3-license -plugins/modules/snapshotschedule.py validate-modules:missing-gplv3-license -plugins/modules/storagepool.py validate-modules:missing-gplv3-license -plugins/modules/tree_quota.py validate-modules:missing-gplv3-license -plugins/modules/user_quota.py validate-modules:missing-gplv3-license -plugins/modules/volume.py validate-modules:missing-gplv3-license -plugins/modules/cifsserver.py validate-modules:missing-gplv3-license -plugins/modules/nfsserver.py validate-modules:missing-gplv3-license -plugins/modules/host.py import-2.7 -plugins/modules/interface.py import-2.7 -plugins/modules/nfs.py import-2.7 -plugins/modules/nfs.py import-3.5 -plugins/modules/nfs.py compile-2.7 -plugins/modules/nfs.py compile-3.5 -plugins/modules/filesystem.py compile-2.7 -plugins/modules/filesystem.py compile-3.5 -plugins/modules/filesystem.py import-2.7 -plugins/modules/filesystem.py import-3.5 -plugins/modules/interface.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py import-2.7 -plugins/modules/replication_session.py import-3.5 -plugins/modules/replication_session.py compile-2.7 -plugins/modules/replication_session.py compile-3.5 diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt deleted file mode 100644 index fcf3bcf..0000000 --- a/tests/sanity/ignore-2.16.txt +++ /dev/null @@ -1,26 +0,0 @@ -plugins/modules/consistencygroup.py validate-modules:missing-gplv3-license -plugins/modules/filesystem.py validate-modules:missing-gplv3-license -plugins/modules/filesystem_snapshot.py validate-modules:missing-gplv3-license -plugins/modules/info.py validate-modules:missing-gplv3-license -plugins/modules/host.py validate-modules:missing-gplv3-license -plugins/modules/nasserver.py validate-modules:missing-gplv3-license -plugins/modules/nfs.py validate-modules:missing-gplv3-license -plugins/modules/smbshare.py validate-modules:missing-gplv3-license -plugins/modules/snapshot.py validate-modules:missing-gplv3-license -plugins/modules/snapshotschedule.py validate-modules:missing-gplv3-license -plugins/modules/storagepool.py validate-modules:missing-gplv3-license -plugins/modules/tree_quota.py validate-modules:missing-gplv3-license -plugins/modules/user_quota.py validate-modules:missing-gplv3-license -plugins/modules/volume.py validate-modules:missing-gplv3-license -plugins/modules/cifsserver.py validate-modules:missing-gplv3-license -plugins/modules/nfsserver.py validate-modules:missing-gplv3-license -plugins/modules/host.py import-2.7 -plugins/modules/interface.py import-2.7 -plugins/modules/nfs.py import-2.7 -plugins/modules/nfs.py compile-2.7 -plugins/modules/filesystem.py compile-2.7 -plugins/modules/filesystem.py import-2.7 -plugins/modules/interface.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py import-2.7 -plugins/modules/replication_session.py compile-2.7 diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt deleted file mode 100644 index c034ae3..0000000 --- a/tests/sanity/ignore-2.17.txt +++ /dev/null @@ -1,18 +0,0 @@ -plugins/modules/consistencygroup.py validate-modules:missing-gplv3-license -plugins/modules/filesystem.py validate-modules:missing-gplv3-license -plugins/modules/filesystem_snapshot.py validate-modules:missing-gplv3-license -plugins/modules/info.py validate-modules:missing-gplv3-license -plugins/modules/host.py validate-modules:missing-gplv3-license -plugins/modules/nasserver.py validate-modules:missing-gplv3-license -plugins/modules/nfs.py validate-modules:missing-gplv3-license -plugins/modules/smbshare.py validate-modules:missing-gplv3-license -plugins/modules/snapshot.py validate-modules:missing-gplv3-license -plugins/modules/snapshotschedule.py validate-modules:missing-gplv3-license -plugins/modules/storagepool.py validate-modules:missing-gplv3-license -plugins/modules/tree_quota.py validate-modules:missing-gplv3-license -plugins/modules/user_quota.py validate-modules:missing-gplv3-license -plugins/modules/volume.py validate-modules:missing-gplv3-license -plugins/modules/cifsserver.py validate-modules:missing-gplv3-license -plugins/modules/nfsserver.py validate-modules:missing-gplv3-license -plugins/modules/interface.py validate-modules:missing-gplv3-license -plugins/modules/replication_session.py validate-modules:missing-gplv3-license diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index 3541acd..8dab883 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -3,5 +3,5 @@ pytest-xdist pytest-mock pytest-cov pytest-forked -coverage==4.5.4 +coverage mock