Skip to content

Avoid to add duplicated trustee for File System #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 19, 2025
Merged

Avoid to add duplicated trustee for File System #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5556f8
Avoid to add duplicated trustee for File System
taohe1012 Jun 17, 2025
4664978
Add UT for File System
taohe1012 Jun 18, 2025
5956ff2
Fix yml lint issues
taohe1012 Jun 18, 2025
6207ec6
Use f-string
taohe1012 Jun 18, 2025
bc4ed6e
Fix delete depulicated trustee
taohe1012 Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions playbooks/modules/filesystem.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
recursive: "{{ recursive }}"
state: "{{ state_present }}"

- name: Create a filesystem snapshot
- name: Create a filesystem snapshot - {{ snapshot_name }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -96,7 +96,7 @@
desired_retention: "{{ desired_retention }}"
state: "{{ state_present }}"

- name: Create a filesystem snapshot
- name: Create a filesystem snapshot - {{ snapshot_name_1 }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down Expand Up @@ -238,7 +238,7 @@
quota_state: "present"
state: "{{ state_present }}"

- name: Remove Quota from FS
- name: Remove Quota from FS for {{ new_path_ansible_1 }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -250,7 +250,7 @@
quota_state: "absent"
state: "{{ state_present }}"

- name: Remove Quota from FS idempotency check
- name: Remove Quota from FS idempotency check for {{ new_path_ansible_1 }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -262,7 +262,7 @@
quota_state: "absent"
state: "{{ state_present }}"

- name: Remove Quota from FS
- name: Remove Quota from FS for {{ path_ansible }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -274,7 +274,7 @@
quota_state: "absent"
state: "{{ state_present }}"

- name: Delete filesystem snapshot
- name: Delete filesystem snapshot - {{ snapshot_name }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -283,7 +283,7 @@
snapshot_name: "{{ snapshot_name }}"
state: "{{ state_absent }}"

- name: Delete filesystem snapshot
- name: Delete filesystem snapshot - {{ snapshot_name_1 }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -292,7 +292,7 @@
snapshot_name: "{{ snapshot_name_1 }}"
state: "{{ state_absent }}"

- name: Delete a filesystem in System Access Zone
- name: Delete a filesystem in System Access Zone - {{ path_system }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -302,7 +302,7 @@
recursive_force_delete: "{{ recursive_force_delete }}"
state: "{{ state_absent }}"

- name: Delete a filesystem in System Access Zone idempotency check
- name: Delete a filesystem in System Access Zone idempotency check - {{ path_system }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -312,7 +312,7 @@
recursive_force_delete: "{{ recursive_force_delete }}"
state: "{{ state_absent }}"

- name: Delete a filesystem in System Access Zone
- name: Delete a filesystem in System Access Zone - {{ new_path_system }}
dellemc.powerscale.filesystem:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down
10 changes: 5 additions & 5 deletions playbooks/modules/group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
user_state: "present-in-group"
state: "present"

- name: Setting group id
- name: Setting group id - {{ result.group_details.gid.id }}
ansible.legacy.set_fact:
group_id: "{{ result.group_details.gid.id.split(':')[1] }}"

- name: Fetch user_id using user_name
- name: Fetch user_id using user_name {{ user_name_1 }}
register: result
dellemc.powerscale.user:
onefs_host: "{{ onefs_host }}"
Expand All @@ -89,11 +89,11 @@
user_name: "{{ user_name_1 }}"
state: "present"

- name: Setting group id
- name: Setting user id for {{ user_name_1 }}
ansible.legacy.set_fact:
user_id_1: "{{ result.user_details.uid.id.split(':')[1] }}"

- name: Fetch user_id using user_name
- name: Fetch user_id using user_name {{ user_name_2 }}
register: result
dellemc.powerscale.user:
onefs_host: "{{ onefs_host }}"
Expand All @@ -106,7 +106,7 @@
user_name: "{{ user_name_2 }}"
state: "present"

- name: Setting group id
- name: Setting user id for {{ user_name_2 }}
ansible.legacy.set_fact:
user_id_2: "{{ result.user_details.uid.id.split(':')[1] }}"

Expand Down
6 changes: 3 additions & 3 deletions playbooks/modules/info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
gather_subset:
- nfs_default_settings

- name: Get NFS default settings details of the PowerScale cluster
- name: Get NFS global settings details of the PowerScale cluster
dellemc.powerscale.info:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down Expand Up @@ -251,8 +251,8 @@
gather_subset:
- server_certificate

- name: Get attributes, access_zones and nodes of the
PowerScale cluster
- name: Get ntp_servers, email_settings, cluster_identity and cluster_owner
of the PowerScale cluster
dellemc.powerscale.info:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/modules/nfs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
ignore_unresolvable_hosts: true
state: 'present'

- name: Get NFS Export details
- name: Get NFS Export details - {{ path }}
dellemc.powerscale.nfs:
onefs_host: "{{ onefs_host }}"
api_user: "{{ api_user }}"
Expand All @@ -83,7 +83,7 @@
- "kerberos"
state: 'present'

- name: Get NFS Export details
- name: Get NFS Export details - {{ path_system }}
dellemc.powerscale.nfs:
onefs_host: "{{ onefs_host }}"
api_user: "{{ api_user }}"
Expand Down
2 changes: 1 addition & 1 deletion playbooks/modules/smartpoolsettings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
virtual_hot_spare_hide_spare: true
state: "{{ state_present }}"

- name: Modify Smartpool settings
- name: Modify Smartpool settings with virtual_hot_spare_hide_spare disabled
dellemc.powerscale.smartpoolsettings:
onefs_host: "{{ onefs_host }}"
api_user: "{{ api_user }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/modules/smb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
description: "smb description updated"

tasks:
- name: Create SMB share for system access zone
- name: Create SMB share for system access zone in {{ system_az_path }}
dellemc.powerscale.smb:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down Expand Up @@ -63,7 +63,7 @@
inheritable_path_acl: true
state: "{{ state_present }}"

- name: Create SMB share for system access zone
- name: Create SMB share in /ifs for system access zone
dellemc.powerscale.smb:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down
6 changes: 3 additions & 3 deletions playbooks/modules/snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
snapshot_name: "{{ new_snapshot_name }}"
state: "{{ state_absent }}"

- name: Delete filesystem snapshot
- name: Delete filesystem snapshot {{ snapshot_name_1 }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -178,7 +178,7 @@
snapshot_name: "{{ snapshot_name_1 }}"
state: "{{ state_absent }}"

- name: Delete filesystem snapshot
- name: Delete filesystem snapshot {{ snapshot_name_2 }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand All @@ -187,7 +187,7 @@
snapshot_name: "{{ snapshot_name_2 }}"
state: "{{ state_absent }}"

- name: Delete filesystem snapshot
- name: Delete filesystem snapshot {{ snapshot_name_3 }}
dellemc.powerscale.snapshot:
onefs_host: "{{ onefs_host }}"
verify_ssl: "{{ verify_ssl }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/modules/user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
shell: "{{ shell }}"
state: "present"

- name: Setting user id`
- name: Setting user id for {{ account_name }}
ansible.legacy.set_fact:
sample_zone_user_id: "{{ result.user_details.uid.id.split(':')[1] }}"

Expand Down Expand Up @@ -105,7 +105,7 @@
role_state: "present-for-user"
state: "present"

- name: Setting user id`
- name: Setting user id idempotency check for {{ account_name }}
ansible.legacy.set_fact:
system_zone_user_id: "{{ result.user_details.uid.id.split(':')[1] }}"

Expand Down
5 changes: 2 additions & 3 deletions plugins/module_utils/storage/dell/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,8 @@ def is_valid_netmask(netmask):

def get_acl_object():
try:
return getattr(importlib.import_module(isi_sdk.__name__ + ".models.acl_object"),
'AclObject')

import_obj = importlib.import_module(isi_sdk.__name__ + ".models")
return import_obj.AclObject()
except ImportError:
return None

Expand Down
Loading