From ee528331063d79981e8bbe2f3ea17cfbb3c60209 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 17:17:55 +0530
Subject: [PATCH 01/10] Release 2.5.0 PowerScale

---
 CHANGELOG.rst                                 |  14 +
 README.md                                     | 102 +--
 changelogs/changelog.yaml                     |   9 +
 docs/CONTRIBUTING.md                          |  10 +-
 docs/INSTALLATION.md                          |   6 +-
 docs/ISSUE_TRIAGE.md                          |   4 +-
 docs/MAINTAINER_GUIDE.md                      |   4 +-
 docs/Release Notes.md                         |  21 +-
 docs/SECURITY.md                              |   4 +-
 docs/modules/info.rst                         |  66 ++
 docs/modules/server_certificate.rst           | 290 ++++++++
 docs/modules/synciqjob.rst                    |   1 +
 galaxy.yml                                    |   8 +-
 playbooks/modules/info.yml                    |   9 +
 playbooks/modules/server_certificate.yml      | 117 ++++
 playbooks/modules/synciqpolicy.yml            | 112 ---
 .../dell/shared_library/certificate.py        |  48 ++
 .../dell/shared_library/powerscale_base.py    |  13 +-
 plugins/modules/info.py                       |  91 ++-
 plugins/modules/server_certificate.py         | 652 ++++++++++++++++++
 plugins/modules/synciqjob.py                  |   3 +-
 tests/sanity/ignore-2.14.txt                  |  11 +-
 tests/sanity/ignore-2.15.txt                  |  11 +-
 tests/sanity/ignore-2.16.txt                  |   7 +-
 .../plugins/module_utils/mock_info_api.py     |   3 +-
 .../mock_server_certificate_api.py            | 135 ++++
 .../modules/test_server_certificate.py        | 218 ++++++
 27 files changed, 1768 insertions(+), 201 deletions(-)
 create mode 100644 docs/modules/server_certificate.rst
 create mode 100644 playbooks/modules/server_certificate.yml
 create mode 100644 plugins/module_utils/storage/dell/shared_library/certificate.py
 create mode 100644 plugins/modules/server_certificate.py
 create mode 100644 tests/unit/plugins/module_utils/mock_server_certificate_api.py
 create mode 100644 tests/unit/plugins/modules/test_server_certificate.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bda62712..81e2a0ad 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,20 @@ Dellemc.Powerscale Change Logs
 
 .. contents:: Topics
 
+
+v2.5.0
+======
+
+Minor Changes
+-------------
+
+- Added support for listing server certificates in Info module.
+
+New Modules
+-----------
+
+- dellemc.powerscale.server_certificate - Manage server certificates on a PowerScale Storage System.
+
 v2.4.1
 ======
 
diff --git a/README.md b/README.md
index 64476017..e333b305 100644
--- a/README.md
+++ b/README.md
@@ -35,20 +35,21 @@ The Ansible Modules for Dell PowerScale support the following features:
 - Get details, modify, import, and delete SyncIQ certificates.
 - Get details and modify SMB global settings.
 - Get details and modify SNMP settings.
+- Get details, import, modify, setting default and delete server certificates.
 
 The tasks can be executed by running simple playbooks written in yaml syntax.
 
 ## Table of contents
 
-* [Code of conduct](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CODE_OF_CONDUCT.md)
-* [Maintainer guide](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/MAINTAINER_GUIDE.md)
-* [Committer guide](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/COMMITTER_GUIDE.md)
-* [Contributing guide](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CONTRIBUTING.md)
-* [Branching strategy](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/BRANCHING.md)
-* [List of adopters](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/ADOPTERS.md)
-* [Maintainers](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/MAINTAINERS.md)
-* [Support](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/SUPPORT.md)
-* [Security](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/SECURITY.md)
+* [Code of conduct](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CODE_OF_CONDUCT.md)
+* [Maintainer guide](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/MAINTAINER_GUIDE.md)
+* [Committer guide](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/COMMITTER_GUIDE.md)
+* [Contributing guide](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CONTRIBUTING.md)
+* [Branching strategy](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/BRANCHING.md)
+* [List of adopters](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/ADOPTERS.md)
+* [Maintainers](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/MAINTAINERS.md)
+* [Support](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/SUPPORT.md)
+* [Security](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/SECURITY.md)
 * [License](#license)
 * [Supported platforms](#supported-platforms)
 * [Prerequisites](#prerequisites)
@@ -57,7 +58,7 @@ The tasks can be executed by running simple playbooks written in yaml syntax.
 * [Maintanence](#maintanence)
 
 ## License
-Ansible collection for PowerScale is released and licensed under the GPL-3.0 license. See [LICENSE](https://github.com/dell/ansible-powerscale/blob/2.4.1/LICENSE) for the full terms. Ansible modules and modules utilities that are part of the Ansible collection for PowerScale are released and licensed under the Apache 2.0 license. See [MODULE-LICENSE](https://github.com/dell/ansible-powerscale/blob/2.4.1/MODULE-LICENSE) for the full terms.
+Ansible collection for PowerScale is released and licensed under the GPL-3.0 license. See [LICENSE](https://github.com/dell/ansible-powerscale/blob/2.5.0/LICENSE) for the full terms. Ansible modules and modules utilities that are part of the Ansible collection for PowerScale are released and licensed under the Apache 2.0 license. See [MODULE-LICENSE](https://github.com/dell/ansible-powerscale/blob/2.5.0/MODULE-LICENSE) for the full terms.
 
 ## Supported platforms
   * Dell PowerScale OneFS versions 9.3.x, 9.4.x and 9.5.x
@@ -67,51 +68,52 @@ This table provides information about the software prerequisites for the Ansible
 
 | **Ansible Modules** | **OneFS Version** | **Python version** | **Python SDK version** | **Ansible**              |
 |---------------------|-----------------------|--------------------|----------------------------|--------------------------|
-| v2.4.1 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 9.3.0 <br> 9.4.0 <br> 9.5.0 | 2.14 <br> 2.15 <br> 2.16 |
+| v2.5.0 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 9.3.0 <br> 9.4.0 <br> 9.5.0 | 2.14 <br> 2.15 <br> 2.16 |
 
 # List of Ansible modules for Dell PowerScale
-  * [File System Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/filesystem.rst)
-  * [Access Zone Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/accesszone.rst)
-  * [User Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/user.rst)
-  * [Group Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/group.rst)
-  * [Snapshot Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/snapshot.rst)
-  * [Snapshot Schedule Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/snapshotschedule.rst)
-  * [NFS Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/nfs.rst)
-  * [SMB Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/smb.rst)
-  * [Smart Quota Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/smartquota.rst)
-  * [Info Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/info.rst)
-  * [Active Directory Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/ads.rst)
-  * [LDAP Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/ldap.rst)
-  * [Node Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/node.rst)
-  * [SyncIQ Policy Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/synciqpolicy.rst)
-  * [SyncIQ Jobs Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/synciqjob.rst)
-  * [SyncIQ Performance Rules Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/synciqrules.rst)
-  * [SyncIQ Reports Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/synciqreports.rst)
-  * [SyncIQ Target Reports Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/synciqtargetreports.rst)
-  * [Groupnet Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/groupnet.rst)
-  * [Subnet Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/subnet.rst)
-  * [Network Pool Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/networkpool.rst)
-  * [Network Rule Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/networkrule.rst)
-  * [NFS Alias Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/nfs_alias.rst)
-  * [Settings Module](https://github.com/dell/ansible-powerscale/tree/2.4.1/docs/modules/settings.rst)
-  * [Network Setting Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/networksettings.rst)
-  * [Smart Pool Setting Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/smartpoolsettings.rst)
-  * [Filepool Policy Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/filepoolpolicy.rst)
-  * [Storagepool Tier Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/storagepooltier.rst)
-  * [SMB File Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/smb_file.rst)
-  * [User Mapping Rule Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/user_mapping_rule.rst)
-  * [S3 Bucket Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/s3_bucket.rst)
-  * [NFS Default Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/nfs_default_settings.rst)
-  * [NFS Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/nfs_global_settings.rst)
-  * [NFS Zone Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/nfs_zone_settings.rst)
-  * [SyncIQ Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/synciq_global_settings.rst)
-  * [SyncIQ Certificate Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/synciqcertificate.rst)
-  * [SMB Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/smb_global_settings.rst)
-  * [SNMP Settings Module](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/modules/snmp_settings.rst)
+  * [File System Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/filesystem.rst)
+  * [Access Zone Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/accesszone.rst)
+  * [User Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/user.rst)
+  * [Group Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/group.rst)
+  * [Snapshot Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/snapshot.rst)
+  * [Snapshot Schedule Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/snapshotschedule.rst)
+  * [NFS Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/nfs.rst)
+  * [SMB Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/smb.rst)
+  * [Smart Quota Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/smartquota.rst)
+  * [Info Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/info.rst)
+  * [Active Directory Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/ads.rst)
+  * [LDAP Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/ldap.rst)
+  * [Node Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/node.rst)
+  * [SyncIQ Policy Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/synciqpolicy.rst)
+  * [SyncIQ Jobs Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/synciqjob.rst)
+  * [SyncIQ Performance Rules Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/synciqrules.rst)
+  * [SyncIQ Reports Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/synciqreports.rst)
+  * [SyncIQ Target Reports Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/synciqtargetreports.rst)
+  * [Groupnet Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/groupnet.rst)
+  * [Subnet Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/subnet.rst)
+  * [Network Pool Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/networkpool.rst)
+  * [Network Rule Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/networkrule.rst)
+  * [NFS Alias Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/nfs_alias.rst)
+  * [Settings Module](https://github.com/dell/ansible-powerscale/tree/2.5.0/docs/modules/settings.rst)
+  * [Network Setting Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/networksettings.rst)
+  * [Smart Pool Setting Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/smartpoolsettings.rst)
+  * [Filepool Policy Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/filepoolpolicy.rst)
+  * [Storagepool Tier Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/storagepooltier.rst)
+  * [SMB File Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/smb_file.rst)
+  * [User Mapping Rule Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/user_mapping_rule.rst)
+  * [S3 Bucket Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/s3_bucket.rst)
+  * [NFS Default Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/nfs_default_settings.rst)
+  * [NFS Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/nfs_global_settings.rst)
+  * [NFS Zone Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/nfs_zone_settings.rst)
+  * [SyncIQ Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/synciq_global_settings.rst)
+  * [SyncIQ Certificate Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/synciqcertificate.rst)
+  * [SMB Global Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/smb_global_settings.rst)
+  * [SNMP Settings Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/snmp_settings.rst)
+  * [Server Certificate Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/server_certificate.rst)
 
 
 ## Installation and execution of Ansible modules for Dell PowerScale
-The installation and execution steps of Ansible modules for Dell PowerScale can be found [here](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/INSTALLATION.md).
+The installation and execution steps of Ansible modules for Dell PowerScale can be found [here](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/INSTALLATION.md).
 
 ## Maintenance
 Ansible Modules for Dell Technologies PowerScale deprecation cycle is aligned with [Ansible](https://docs.ansible.com/ansible/latest/dev_guide/module_lifecycle.html).
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 7be3865b..d6c823e1 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -255,3 +255,12 @@ releases:
       minor_changes:
         - Document link fixes in README.
     release_date: '2023-12-29'
+  2.5.0:
+    changes:
+      minor_changes:
+        - Added support for listing server certificates in Info module.
+    modules:
+      - description: Manage server certificates on a PowerScale Storage System.
+        name: server_certificate
+        namespace: ''
+    release_date: '2024-02-29'
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 8adbe33a..fe98126f 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2022 Dell Inc., or its subsidiaries. All Rights Reserved.
+Copyright (c) 2024 Dell Inc., or its subsidiaries. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,7 +10,7 @@ You may obtain a copy of the License at
 
 # How to contribute
 
-Become one of the contributors to this project! We thrive to build a welcoming and open community for anyone who wants to use the project or contribute to it. There are just a few small guidelines you need to follow. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CODE_OF_CONDUCT.md).
+Become one of the contributors to this project! We thrive to build a welcoming and open community for anyone who wants to use the project or contribute to it. There are just a few small guidelines you need to follow. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CODE_OF_CONDUCT.md).
 
 ## Table of contents
 
@@ -76,7 +76,7 @@ Triage helps ensure that issues resolve quickly by:
 
 If you don't have the knowledge or time to code, consider helping with _issue triage_. The Ansible modules for Dell PowerScale community will thank you for saving them time by spending some of yours.
 
-Read more about the ways you can [Triage issues](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/ISSUE_TRIAGE.md).
+Read more about the ways you can [Triage issues](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/ISSUE_TRIAGE.md).
 
 ## Your first contribution
 
@@ -89,7 +89,7 @@ When you're ready to contribute, it's time to create a pull request.
 
 ## Branching
 
-* [Branching Strategy for Ansible modules for Dell PowerScale](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/BRANCHING.md)
+* [Branching Strategy for Ansible modules for Dell PowerScale](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/BRANCHING.md)
 
 ## Signing your commits
 
@@ -144,7 +144,7 @@ Make sure that the title for your pull request uses the same format as the subje
 
 ### Quality gates for pull requests
 
-GitHub Actions are used to enforce quality gates when a pull request is created or when any commit is made to the pull request. These GitHub Actions enforce our minimum code quality requirement for any code that get checked into the repository. If any of the quality gates fail, it is expected that the contributor will look into the check log, understand the problem and resolve the issue. If help is needed, please feel free to reach out the maintainers of the project for [support](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/SUPPORT.md).
+GitHub Actions are used to enforce quality gates when a pull request is created or when any commit is made to the pull request. These GitHub Actions enforce our minimum code quality requirement for any code that get checked into the repository. If any of the quality gates fail, it is expected that the contributor will look into the check log, understand the problem and resolve the issue. If help is needed, please feel free to reach out the maintainers of the project for [support](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/SUPPORT.md).
 
 #### Code sanitization
 
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index bec11f70..df997120 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2022 Dell Inc., or its subsidiaries. All Rights Reserved.
+Copyright (c) 2024 Dell Inc., or its subsidiaries. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ Use this procedure to install SDK:
   #### Offline installation of collections
   1. Download the latest tar build from either of the available distribution channels [Ansible Galaxy](https://galaxy.ansible.com/dellemc/powerscale) /[Automation Hub](https://console.redhat.com/ansible/automation-hub/repo/published/dellemc/powerscale) and use this command to install the collection anywhere in your system:
 
-	      ansible-galaxy collection install dellemc-powerscale-2.4.1.tar.gz -p <install_path>
+	      ansible-galaxy collection install dellemc-powerscale-2.5.0.tar.gz -p <install_path>
 
   2. Set the environment variable:
 
@@ -59,7 +59,7 @@ Use this procedure to install SDK:
 
 ## Ansible modules execution
 
-The Ansible server must be configured with Python library for OneFS to run the Ansible playbooks. The [Documents](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs) provide information on different Ansible modules along with their functions and syntax. The parameters table in the Product Guide provides information on various parameters which need to be configured before running the modules.
+The Ansible server must be configured with Python library for OneFS to run the Ansible playbooks. The [Documents](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs) provide information on different Ansible modules along with their functions and syntax. The parameters table in the Product Guide provides information on various parameters which need to be configured before running the modules.
 
 ## SSL certificate validation
 
diff --git a/docs/ISSUE_TRIAGE.md b/docs/ISSUE_TRIAGE.md
index c3564255..b2000072 100644
--- a/docs/ISSUE_TRIAGE.md
+++ b/docs/ISSUE_TRIAGE.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2022 Dell Inc., or its subsidiaries. All Rights Reserved.
+Copyright (c) 2024 Dell Inc., or its subsidiaries. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ Should explain what happened, what was expected and how to reproduce it together
 
  - Ansible Version: [e.g. 2.15]
  - Python Version [e.g. 3.11]
- - Ansible modules for Dell PowerScale Version: [e.g. 2.4.1]
+ - Ansible modules for Dell PowerScale Version: [e.g. 2.5.0]
  - PowerScale SDK version: [e.g. isilon-sdk]
  - Any other additional information...
 
diff --git a/docs/MAINTAINER_GUIDE.md b/docs/MAINTAINER_GUIDE.md
index 1fc24a36..cbca3e5c 100644
--- a/docs/MAINTAINER_GUIDE.md
+++ b/docs/MAINTAINER_GUIDE.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2022 Dell Inc., or its subsidiaries. All Rights Reserved.
+Copyright (c) 2024 Dell Inc., or its subsidiaries. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ If a candidate is approved, a Maintainer contacts the candidate to invite them t
 ## Maintainer policies
 
 * Lead by example
-* Follow the [Code of Conduct](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CODE_OF_CONDUCT.md) and the guidelines in the [Contributing](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CONTRIBUTING.md) and [Committer](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/COMMITTER_GUIDE.md) guides
+* Follow the [Code of Conduct](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CODE_OF_CONDUCT.md) and the guidelines in the [Contributing](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CONTRIBUTING.md) and [Committer](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/COMMITTER_GUIDE.md) guides
 * Promote a friendly and collaborative environment within our community
 * Be actively engaged in discussions, answering questions, updating defects, and reviewing pull requests
 * Criticize code, not people. Ideally, tell the contributor a better way to do what they need.
diff --git a/docs/Release Notes.md b/docs/Release Notes.md
index e8752dbb..57b8115e 100644
--- a/docs/Release Notes.md	
+++ b/docs/Release Notes.md	
@@ -1,8 +1,8 @@
 **Ansible Modules for Dell Technologies PowerScale** 
 =========================================
-### Release notes 2.4.1
+### Release notes 2.5.0
 
->   © 2022 Dell Inc. or its subsidiaries. All rights reserved. Dell
+>   © 2024 Dell Inc. or its subsidiaries. All rights reserved. Dell
 >   and other trademarks are trademarks of Dell Inc. or its
 >   subsidiaries. Other trademarks may be trademarks of their respective
 >   owners.
@@ -27,7 +27,7 @@ Table 1. Revision history
 
 | Revision | Date          | Description                                               |
 |----------|---------------|-----------------------------------------------------------|
-| 01       | December 2023 | Ansible Modules for Dell PowerScale 2.4.1                 |
+| 01       | February 2024 | Ansible Modules for Dell PowerScale 2.5.0                 |
 
 
 Product description
@@ -65,6 +65,7 @@ The Ansible Modules for Dell PowerScale support the following features:
 - Get details, modify, import, and delete SyncIQ certificates.
 - Get details and modify SMB global settings.
 - Get details and modify SNMP settings.
+- Import, modify, setting default, and delete a server certificate.
   
 The Ansible modules use playbooks, written in yaml syntax, to list, show, create, delete, and modify each of these entities.
 
@@ -72,18 +73,12 @@ New Features and Enhancements
 ---------------------------
 This section describes the features of the Ansible Modules for Dell PowerScale for this release.
 
-The Ansible Modules for Dell PowerScale release 2.4.1 supports the following features:
+The Ansible Modules for Dell PowerScale release 2.5.0 supports the following features:
 
-- The SMB global settings module supports this functionality:
-    - Added support for getting and modifying SMB global settings.
-- The SNMP settings module supports this functionality:
-    - Added support for getting and modifying SNMP settings.
-- The network pool module supports this functionality:
-    - Added support for removing the static route for IP address pool.
-- The settings module has been enhanced to support this functionality:
-    - Added support for getting and modifying cluster owner information and cluster identity information.
+- The server certificate module supports this functionality:
+    - Added support for importing, modifying, setting defaults, and deleting server certificates.
 - The Info module has been enhanced to support this functionality.
-    - Added support for listing SMB global settings, detailed network interfaces, NTP servers, email settings, cluster identity, cluster owner and SNMP settings through info module.
+    - Added support for listing server certificates.
 
 Known issues
 ------------
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 09e251e1..16889acb 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) 2022 Dell Inc., or its subsidiaries. All Rights Reserved.
+Copyright (c) 2024 Dell Inc., or its subsidiaries. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@ You may obtain a copy of the License at
 
 The Ansible modules for Dell PowerScale repository is inspected for security vulnerabilities via blackduck scans and static code analysis.
 
-In addition to this, there are various security checks that get executed against a branch when a pull request is created/updated.  Please refer to [pull request](https://github.com/dell/ansible-powerscale/blob/2.4.1/docs/CONTRIBUTING.md#Pull-requests) for more information.
+In addition to this, there are various security checks that get executed against a branch when a pull request is created/updated.  Please refer to [pull request](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/CONTRIBUTING.md#Pull-requests) for more information.
 
 ## Reporting a vulnerability
 
diff --git a/docs/modules/info.rst b/docs/modules/info.rst
index 808b3d45..1e68b51b 100644
--- a/docs/modules/info.rst
+++ b/docs/modules/info.rst
@@ -34,6 +34,8 @@ Get cluster owner, cluster identity and email settings details of the PowerScale
 
 Get SNMP settings details of the PowerScale cluster.
 
+Retrieve a list of server certificate details.
+
 
 
 Requirements
@@ -164,6 +166,8 @@ Parameters
 
     SNMP settings - ``snmp_settings``.
 
+    Server certificate - ``server_certificate``.
+
 
   onefs_host (True, str, None)
     IP address or FQDN of the PowerScale cluster.
@@ -512,6 +516,15 @@ Examples
         gather_subset:
           - smb_global_settings
 
+    - name: Get the list of server certificate.
+      dellemc.powerscale.info:
+        onefs_host: "{{ onefs_host }}"
+        verify_ssl: "{{ verify_ssl }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        gather_subset:
+          - server_certificate
+
     - name: Get NTP servers from PowerScale cluster
       dellemc.powerscale.info:
         onefs_host: "{{ onefs_host }}"
@@ -1766,6 +1779,59 @@ SnmpSettings (When C(snmp_settings) is in a given I(gather_subset), dict, {'read
 
 
 
+ServerCertificate (When C(server_certificate) is in a given I(gather_subset), list, [{'certificate_monitor_enabled': True, 'certificate_pre_expiration_threshold': 4294, 'description': 'This the example test description', 'dnsnames': ['powerscale'], 'fingerprints': [{'type': 'SHA1', 'value': '68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed'}, {'type': 'SHA256', 'value': '69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34'}], 'id': '6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034', 'issuer': 'C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com', 'name': 'test', 'not_after': 1769586969, 'not_before': 1706514969, 'status': 'valid', 'subject': 'C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com'}])
+  The Server certificate details.
+
+
+  description (, str, )
+    Description of the certificate.
+
+
+  id (, str, )
+    System assigned certificate id.
+
+
+  issuer (, str, )
+    Name of the certificate issuer.
+
+
+  name (, str, )
+    Name for the certificate.
+
+
+  not_after (, str, )
+    The date and time from which the certificate becomes valid and can be used for authentication and encryption.
+
+
+  not_before (, str, )
+    The date and time until which the certificate is valid and can be used for authentication and encryption.
+
+
+  status (, str, )
+    Status of the certificate.
+
+
+  fingerprints (, str, )
+    Fingerprint details of the certificate.
+
+
+  dnsnames (, list, )
+    Subject alternative names of the certificate.
+
+
+  subject (, str, )
+    Subject of the certificate.
+
+
+  certificate_monitor_enabled (, bool, )
+    Boolean value indicating whether certificate expiration monitoring is enabled.
+
+
+  certificate_pre_expiration_threshold (, int, )
+    The number of seconds before certificate expiration that the certificate expiration monitor will start raising alerts.
+
+
+
 
 
 
diff --git a/docs/modules/server_certificate.rst b/docs/modules/server_certificate.rst
new file mode 100644
index 00000000..586f38b2
--- /dev/null
+++ b/docs/modules/server_certificate.rst
@@ -0,0 +1,290 @@
+.. _server_certificate_module:
+
+
+server_certificate -- Manage server certificates on a PowerScale Storage System
+===============================================================================
+
+.. contents::
+   :local:
+   :depth: 1
+
+
+Synopsis
+--------
+
+Manage server certificates on a PowerScale Storage System includes import, update, set certificate to default, and delete server certificates.
+
+
+
+Requirements
+------------
+The below requirements are needed on the host that executes this module.
+
+- A Dell PowerScale Storage system.
+- Ansible-core 2.14 or later.
+- Python 3.9, 3.10 or 3.11.
+
+
+
+Parameters
+----------
+
+  state (optional, str, present)
+    The state option is used to mention the existence of server certificate.
+
+
+  alias_name (optional, str, None)
+    The name of the certificate.
+
+    *alias_name* is mutually exclusive with *certificate_id*.
+
+    The maximum length for *alias_name* is 128.
+
+
+  description (optional, str, None)
+    The description of the certificate.
+
+    The maximum length for *description* is 2048.
+
+    Setting an empty value is necessary to remove the certificate description.
+
+
+  new_alias_name (optional, str, None)
+    The *alias_name* of the certificate.
+
+    The maximum length for *new_alias_name* is 128.
+
+
+  certificate_id (optional, str, None)
+    The ID of the imported certificate.
+
+    *certificate_id* is mutually exclusive with *alias_name*.
+
+
+  certificate_path (optional, path, None)
+    The path of the certificate file.
+
+
+  certificate_key_path (optional, path, None)
+    The path of the certificate key file.
+
+
+  certificate_key_password (optional, str, None)
+    The password of the certificate key.
+
+    The maximum length for *certificate_key_password* is 256.
+
+
+  is_default_certificate (optional, bool, False)
+    To set the certificate as the default.
+
+    If the ``True`` is selected, the server certificate is set to default.
+
+    Another certificate must be selected as default to designate a certificate as non-default.
+
+
+  certificate_monitor_enabled (optional, bool, None)
+    Boolean value indicating whether certificate expiration monitoring is enabled.
+
+    This option is applicable if *is_default_certificate* is ``True``.
+
+
+  certificate_pre_expiration_threshold (optional, int, None)
+    The number of seconds before certificate expiration that the certificate expiration monitor will start raising alerts.
+
+    The range for this value is from 0 to 4294967295.
+
+    This option is applicable if *is_default_certificate* is ``True``.
+
+
+  onefs_host (True, str, None)
+    IP address or FQDN of the PowerScale cluster.
+
+
+  port_no (False, str, 8080)
+    Port number of the PowerScale cluster.It defaults to 8080 if not specified.
+
+
+  verify_ssl (True, bool, None)
+    boolean variable to specify whether to validate SSL certificate or not.
+
+    ``true`` - indicates that the SSL certificate should be verified.
+
+    ``false`` - indicates that the SSL certificate should not be verified.
+
+
+  api_user (True, str, None)
+    username of the PowerScale cluster.
+
+
+  api_password (True, str, None)
+    the password of the PowerScale cluster.
+
+
+
+
+
+Notes
+-----
+
+.. note::
+   - The *check_mode* is supported.
+   - The *check_mode* and idempotency is not supported for *certificate_path*, *certificate_key_path*, and *certificate_key_password* when updating certificates.
+   - The modules present in this collection named as 'dellemc.powerscale' are built to support the Dell PowerScale storage platform.
+
+
+
+
+Examples
+--------
+
+.. code-block:: yaml+jinja
+
+    
+    - name: To import the new server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: certificate_name
+        description: The certificate description
+        certificate_path: "/ifs/certificates/server.crt"
+        certificate_key_path: "/ifs/certificates/server.key"
+        certificate_key_password: "Secret@123"
+
+    - name: To import the new server certificate and set the certificate as default
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: default_certificate
+        description: The default certificate description
+        certificate_path: "/ifs/certificates/server.crt"
+        certificate_key_path: "/ifs/certificates/server.key"
+        certificate_key_password: "Secret@123"
+        is_default_certificate: true
+        certificate_monitor_enabled: true
+        certificate_pre_expiration_threshold: 300
+
+    - name: To update the server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: certificate_new_name
+        description: The updated certificate description
+
+    - name: To update the server certificate and set the certificate as default
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        certificate_id: "a851d9f3d7b16985be6fcb0402"
+        description: The updated certificate description
+        is_default_certificate: true
+        certificate_monitor_enabled: true
+        certificate_pre_expiration_threshold: 42949
+
+    - name: To delete the server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: absent
+        alias_name: certificate_new_name
+
+    - name: To delete the server certificate using certificate ID
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: absent
+        certificate_id: "a851d9f3d7b16985be6fcb0402"
+
+
+
+Return Values
+-------------
+
+changed (always, bool, false)
+  A boolean indicating if the task had to make changes.
+
+
+certificate_details (always, dict, {'certificate_monitor_enabled': True, 'certificate_pre_expiration_threshold': 4294, 'description': 'This the example test description', 'dnsnames': ['powerscale'], 'fingerprints': [{'type': 'SHA1', 'value': '68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed'}, {'type': 'SHA256', 'value': '69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34'}], 'id': '6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034', 'issuer': 'C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com', 'name': 'test', 'not_after': 1769586969, 'not_before': 1706514969, 'status': 'valid', 'subject': 'C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com'})
+  The server certificate details.
+
+
+  description (, str, )
+    Description of the certificate.
+
+
+  id (, str, )
+    System assigned certificate id.
+
+
+  issuer (, str, )
+    Name of the certificate issuer.
+
+
+  name (, str, )
+    Name for the certificate.
+
+
+  not_after (, str, )
+    The date and time from which the certificate becomes valid and can be used for authentication and encryption.
+
+
+  not_before (, str, )
+    The date and time until which the certificate is valid and can be used for authentication and encryption.
+
+
+  status (, str, )
+    Status of the certificate.
+
+
+  fingerprints (, str, )
+    Fingerprint details of the certificate.
+
+
+  dnsnames (, list, )
+    Subject alternative names of the certificate.
+
+
+  subject (, str, )
+    Subject of the certificate.
+
+
+  certificate_monitor_enabled (, bool, )
+    Boolean value indicating whether certificate expiration monitoring is enabled.
+
+
+  certificate_pre_expiration_threshold (, int, )
+    The number of seconds before certificate expiration that the certificate expiration monitor will start raising alerts.
+
+
+
+
+
+
+Status
+------
+
+
+
+
+
+Authors
+~~~~~~~
+
+- Felix Stephen (@felixs88) <ansible.team@dell.com>
+
diff --git a/docs/modules/synciqjob.rst b/docs/modules/synciqjob.rst
index 9537681d..19a66cca 100644
--- a/docs/modules/synciqjob.rst
+++ b/docs/modules/synciqjob.rst
@@ -77,6 +77,7 @@ Notes
 
 .. note::
    - There is delay in the actual state change of the SyncIQ job. The state change of jobs in 'scheduled' state is not supported.
+   - To start the SyncIQ job use the :ref:`synciqpolicy <synciqpolicy_module>` module.
    - The *check_mode* is not supported.
    - The modules present in this collection named as 'dellemc.powerscale' are built to support the Dell PowerScale storage platform.
 
diff --git a/galaxy.yml b/galaxy.yml
index 83de89f9..80958b1a 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -14,7 +14,7 @@ name: powerscale
 
 # The version of the collection.
 # Must be compatible with semantic versioning
-version: 2.4.1
+version: 2.5.0
 
 # The path to the Markdown (.md) readme file.
 # This path is relative to the root of the collection.
@@ -66,13 +66,13 @@ tags: [storage]
 dependencies: {}
 
 # The URL of the originating SCM repository
-repository: https://github.com/dell/ansible-powerscale/tree/2.4.1
+repository: https://github.com/dell/ansible-powerscale/tree/2.5.0
 
 # The URL to any online docs
-documentation: https://github.com/dell/ansible-powerscale/tree/2.4.1/docs
+documentation: https://github.com/dell/ansible-powerscale/tree/2.5.0/docs
 
 # The URL to the homepage of the collection/project
-homepage: https://github.com/dell/ansible-powerscale/tree/2.4.1
+homepage: https://github.com/dell/ansible-powerscale/tree/2.5.0
 
 # The URL to the collection issue tracker
 issues: https://www.dell.com/community/Automation/bd-p/Automation
diff --git a/playbooks/modules/info.yml b/playbooks/modules/info.yml
index d3ff650e..0b21904a 100644
--- a/playbooks/modules/info.yml
+++ b/playbooks/modules/info.yml
@@ -219,6 +219,15 @@
         gather_subset:
           - smb_global_settings
 
+    - name: Get the list of server certificate from PowerScale cluster
+      dellemc.powerscale.info:
+        onefs_host: "{{ onefs_host }}"
+        verify_ssl: "{{ verify_ssl }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        gather_subset:
+          - server_certificate
+
     - name: Get attributes, access_zones and nodes of the PowerScale cluster
       dellemc.powerscale.info:
         onefs_host: "{{ onefs_host }}"
diff --git a/playbooks/modules/server_certificate.yml b/playbooks/modules/server_certificate.yml
new file mode 100644
index 00000000..3aadc322
--- /dev/null
+++ b/playbooks/modules/server_certificate.yml
@@ -0,0 +1,117 @@
+---
+- name: Manage Server Certificate Module Operations on PowerScale Storage
+  hosts: localhost
+  connection: local
+  vars:
+    onefs_host: "10.**.**.**"
+    port_no: "1234"
+    api_user: "user"
+    api_password: "password"
+    verify_ssl: false
+
+  tasks:
+
+    - name: To import the new server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: certificate_name
+        description: The certificate description
+        certificate_path: "/ifs/certificates/server.crt"
+        certificate_key_path: "/ifs/certificates/server.key"
+        certificate_key_password: "Secret@123"
+
+    - name: To import the new server certificate and set the certificate as default
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: default_certificate
+        description: The default certificate description
+        certificate_path: "/ifs/certificates/server.crt"
+        certificate_key_path: "/ifs/certificates/server.key"
+        certificate_key_password: "Secret@123"
+        is_default_certificate: true
+        certificate_monitor_enabled: true
+        certificate_pre_expiration_threshold: 300
+
+    - name: To update the server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: certificate_new_name
+        description: The updated certificate description
+
+    - name: To update the server certificate and set the certificate as default
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        certificate_id: "a851d9f3d7b16985be6fcb0402"
+        description: The updated certificate description
+        is_default_certificate: true
+        certificate_monitor_enabled: true
+        certificate_pre_expiration_threshold: 42949
+
+    - name: To delete the server certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: absent
+        alias_name: certificate_new_name
+
+    - name: To delete the server certificate using certificate ID
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: absent
+        certificate_id: "a851d9f3d7b16985be6fcb0402"
+
+    - name: To remove the description of the certificate
+      dellemc.powerscale.server_certificate:
+        onefs_host: "{{ onefs_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        verify_ssl: "{{ verify_ssl }}"
+        state: present
+        alias_name: certificate_new_name
+        description: " "
+
+    - name: To replace the existing server certificate
+      block:
+
+        - name: To delete the server certificate
+          dellemc.powerscale.server_certificate:
+            onefs_host: "{{ onefs_host }}"
+            api_user: "{{ api_user }}"
+            api_password: "{{ api_password }}"
+            verify_ssl: "{{ verify_ssl }}"
+            state: absent
+            alias_name: certificate_name
+        
+        - name: To import the new server certificate
+          dellemc.powerscale.server_certificate:
+            onefs_host: "{{ onefs_host }}"
+            api_user: "{{ api_user }}"
+            api_password: "{{ api_password }}"
+            verify_ssl: "{{ verify_ssl }}"
+            state: present
+            alias_name: certificate_name
+            description: The replaced server certificate description
+            certificate_path: "/ifs/certificates/server.pem"
+            certificate_key_path: "/ifs/certificates/server.key"
+            certificate_key_password: "Secret@123"
diff --git a/playbooks/modules/synciqpolicy.yml b/playbooks/modules/synciqpolicy.yml
index b5eb839f..e6a2157d 100644
--- a/playbooks/modules/synciqpolicy.yml
+++ b/playbooks/modules/synciqpolicy.yml
@@ -47,39 +47,6 @@
           exp_time_unit: 'days'
         state: 'present'
 
-    - name: Create SyncIQ policy -- Idempotency
-      register: result
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        verify_ssl: "{{ verify_ssl }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        action: 'copy'
-        description: 'Creating a policy'
-        enabled: false
-        policy_name: "{{ policy_name }}"
-        run_job: "when-source-modified"
-        job_delay: 10
-        job_delay_unit: "hours"
-        source_cluster:
-          source_root_path: '/ifs/source'
-          source_exclude_directories:
-            - '/ifs/source/exclude_1'
-            - '/ifs/source/exclude_2'
-          source_include_directories: '/ifs/source/include_directory'
-          source_network:
-            pool: 'pool0'
-            subnet: 'subnet0'
-        target_cluster:
-          target_host: "{{ target_host_name }}"
-          target_path: "/ifs/target"
-          target_certificate_id: "7a3c579ea8214818a417eb4af31b0c9fc2634852498430b919d93f9ae122d545"
-        target_snapshot:
-          target_snapshot_archive: true
-          target_snapshot_expiration: 90
-          exp_time_unit: 'days'
-        state: 'present'
-
     - name: Get SyncIQ policy details
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -105,22 +72,6 @@
           target_snapshot_archive: false
         state: 'present'
 
-    - name: Modify SyncIQ policy -- Idempotency
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        verify_ssl: "{{ verify_ssl }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        policy_name: "{{ result.synciq_policy_details.name }}"
-        action: "sync"
-        description: 'Modifying a policy'
-        enabled: true
-        run_job: "on-schedule"
-        schedule: "every 1 days every 12 hours between 12:00 AM and 11:59 PM"
-        target_snapshot:
-          target_snapshot_archive: false
-        state: 'present'
-
     - name: Rename a SyncIQ policy
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -144,19 +95,6 @@
           wait_for_completion: false
         state: "present"
 
-    - name: Create a job on SyncIQ policy Idempotency case
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        verify_ssl: "{{ verify_ssl }}"
-        policy_name: "Test_SSL"
-        job_params:
-          action: "run"
-          source_snapshot: "TestSIQ-snapshot"
-          wait_for_completion: false
-        state: "present"
-
     - name: Create a resync_prep job on SyncIQ policy
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -170,19 +108,6 @@
           wait_for_completion: false
         state: "present"
 
-    - name: Create a resync_prep job on SyncIQ policy Idempotency case
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        verify_ssl: "{{ verify_ssl }}"
-        policy_name: "Test_SSL"
-        job_params:
-          action: "resync_prep"
-          source_snapshot: "TestSIQ-snapshot"
-          wait_for_completion: false
-        state: "present"
-
     - name: Allow writes on target of SyncIQ policy
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -197,20 +122,6 @@
           wait_for_completion: false
         state: "present"
 
-    - name: Allow writes on target of SyncIQ policy Idempotency case
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        verify_ssl: "{{ verify_ssl }}"
-        policy_name: "Test_SSL"
-        job_params:
-          action: "allow_write"
-          source_snapshot: "TestSIQ-snapshot"
-          workers_per_node: 3
-          wait_for_completion: false
-        state: "present"
-
     - name: Disallow writes on target of SyncIQ policy
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -225,20 +136,6 @@
           wait_for_completion: false
         state: "present"
 
-    - name: Disallow writes on target of SyncIQ policy Idempotency case
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        verify_ssl: "{{ verify_ssl }}"
-        policy_name: "Test_SSL"
-        job_params:
-          action: "allow_write_revert"
-          source_snapshot: "TestSIQ-snapshot"
-          workers_per_node: 3
-          wait_for_completion: false
-        state: "present"
-
     - name: Delete a SyncIQ policy
       dellemc.powerscale.synciqpolicy:
         onefs_host: "{{ onefs_host }}"
@@ -247,12 +144,3 @@
         verify_ssl: "{{ verify_ssl }}"
         policy_name: "{{ new_policy_name }}"
         state: "absent"
-
-    - name: Delete a SyncIQ policy -- Idempotency
-      dellemc.powerscale.synciqpolicy:
-        onefs_host: "{{ onefs_host }}"
-        api_user: "{{ api_user }}"
-        api_password: "{{ api_password }}"
-        verify_ssl: "{{ verify_ssl }}"
-        policy_name: "{{ new_policy_name }}"
-        state: "absent"
diff --git a/plugins/module_utils/storage/dell/shared_library/certificate.py b/plugins/module_utils/storage/dell/shared_library/certificate.py
new file mode 100644
index 00000000..187e0e2f
--- /dev/null
+++ b/plugins/module_utils/storage/dell/shared_library/certificate.py
@@ -0,0 +1,48 @@
+# Copyright: (c) 2024, Dell Technologies
+
+# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell \
+    import utils
+
+LOG = utils.get_logger('certificate')
+
+
+class Certificate:
+
+    '''Class with shared Certificate operations'''
+
+    def __init__(self, certificate_api, module):
+        """
+        Initialize the certificate class
+        :param certificate_api: The certificate sdk instance
+        :param module: Ansible module object
+        """
+        self.certificate_api = certificate_api
+        self.module = module
+
+    def get_server_certificate_with_default(self):
+        """
+        Get details of Server certificate.
+        """
+        try:
+            certificate = self.certificate_api.list_certificate_server().to_dict()
+            default_certificate = self.certificate_api.get_certificate_settings().to_dict()
+            if certificate and default_certificate:
+                for each_cert in certificate['certificates']:
+                    if each_cert['id'] == default_certificate['settings']['default_https_certificate']:
+                        each_cert['certificate_monitor_enabled'] = default_certificate['settings']['certificate_monitor_enabled']
+                        each_cert['certificate_pre_expiration_threshold'] = \
+                            default_certificate['settings']['certificate_pre_expiration_threshold']
+                        break
+                msg = f"Server certificate details are: {certificate}"
+                LOG.info(msg)
+                return certificate['certificates']
+        except Exception as e:
+            error_msg = f"Got error {utils.determine_error(e)} while getting Server certificate details."
+            LOG.error(error_msg)
+            self.module.fail_json(msg=error_msg)
diff --git a/plugins/module_utils/storage/dell/shared_library/powerscale_base.py b/plugins/module_utils/storage/dell/shared_library/powerscale_base.py
index b58c69b1..ab04a0f3 100644
--- a/plugins/module_utils/storage/dell/shared_library/powerscale_base.py
+++ b/plugins/module_utils/storage/dell/shared_library/powerscale_base.py
@@ -1,4 +1,4 @@
-# Copyright: (c) 2023, Dell Technologies
+# Copyright: (c) 2024, Dell Technologies
 
 # Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -50,6 +50,7 @@ def __init__(self, ansible_module, ansible_module_params):
         self._auth_api = None
         self._synciq_api = None
         self._cluster_api = None
+        self._certificate_api = None
 
     @property
     def protocol_api(self):
@@ -98,3 +99,13 @@ def cluster_api(self):
         if self._cluster_api is None:
             self._cluster_api = self.isi_sdk.ClusterApi(self.api_client)
         return self._cluster_api
+
+    @property
+    def certificate_api(self):
+        """Returns the certificate API object.
+        :return: The certificate API object.
+        :rtype: isi_sdk.CertificateApi
+        """
+        if self._certificate_api is None:
+            self._certificate_api = self.isi_sdk.CertificateApi(self.api_client)
+        return self._certificate_api
diff --git a/plugins/modules/info.py b/plugins/modules/info.py
index 9cb715c8..c33b181e 100644
--- a/plugins/modules/info.py
+++ b/plugins/modules/info.py
@@ -35,6 +35,7 @@
 - Get SMB Global Settings details of the PowerScale cluster.
 - Get cluster owner, cluster identity and email settings details of the PowerScale cluster.
 - Get SNMP settings details of the PowerScale cluster.
+- Retrieve a list of server certificate details.
 
 extends_documentation_fragment:
   - dellemc.powerscale.powerscale
@@ -128,6 +129,7 @@
     - Cluster identity C(cluster_identity)
     - Cluster owner C(cluster_owner)
     - SNMP settings - C(snmp_settings).
+    - Server certificate - C(server_certificate).
     required: true
     choices: [attributes, access_zones, nodes, providers, users, groups,
               smb_shares, nfs_exports, nfs_aliases, clients, synciq_reports, synciq_target_reports,
@@ -135,7 +137,8 @@
               network_groupnets, network_subnets, network_pools, network_rules, network_interfaces,
               node_pools, storagepool_tiers, smb_files, user_mapping_rules, ldap,
               nfs_zone_settings, nfs_default_settings, nfs_global_settings, synciq_global_settings, s3_buckets,
-              smb_global_settings, ntp_servers, email_settings, cluster_identity, cluster_owner, snmp_settings]
+              smb_global_settings, ntp_servers, email_settings, cluster_identity, cluster_owner, snmp_settings,
+              server_certificate]
     type: list
     elements: str
 notes:
@@ -447,6 +450,15 @@
     gather_subset:
       - smb_global_settings
 
+- name: Get the list of server certificate.
+  dellemc.powerscale.info:
+    onefs_host: "{{ onefs_host }}"
+    verify_ssl: "{{ verify_ssl }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    gather_subset:
+      - server_certificate
+
 - name: Get NTP servers from PowerScale cluster
   dellemc.powerscale.info:
     onefs_host: "{{ onefs_host }}"
@@ -2074,6 +2086,73 @@
         "system_contact": "system",
         "system_location": "cluster"
     }
+ServerCertificate:
+    description: The Server certificate details.
+    type: list
+    returned: When C(server_certificate) is in a given I(gather_subset)
+    contains:
+        description:
+            description: Description of the certificate.
+            type: str
+        id:
+            description: System assigned certificate id.
+            type: str
+        issuer:
+            description: Name of the certificate issuer.
+            type: str
+        name:
+            description: Name for the certificate.
+            type: str
+        not_after:
+            description: The date and time from which the certificate becomes valid and
+                can be used for authentication and encryption.
+            type: str
+        not_before:
+            description: The date and time until which the certificate is valid and
+                can be used for authentication and encryption.
+            type: str
+        status:
+            description: Status of the certificate.
+            type: str
+        fingerprints:
+            description: Fingerprint details of the certificate.
+            type: str
+        dnsnames:
+            description: Subject alternative names of the certificate.
+            type: list
+        subject:
+            description: Subject of the certificate.
+            type: str
+        certificate_monitor_enabled:
+            description: Boolean value indicating whether certificate expiration monitoring is enabled.
+            type: bool
+        certificate_pre_expiration_threshold:
+            description: The number of seconds before certificate expiration that the certificate expiration
+                monitor will start raising alerts.
+            type: int
+    sample:
+        [{
+            "certificate_monitor_enabled": true,
+            "certificate_pre_expiration_threshold": 4294,
+            "description": "This the example test description",
+            "dnsnames": ["powerscale"],
+            "fingerprints": [
+                {
+                    "type": "SHA1",
+                    "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed"
+                },
+                {
+                    "type": "SHA256",
+                    "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34"
+                }],
+            "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034",
+            "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+            "name": "test",
+            "not_after": 1769586969,
+            "not_before": 1706514969,
+            "status": "valid",
+            "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com"
+        }]
 '''
 
 from ansible.module_utils.basic import AnsibleModule
@@ -2083,6 +2162,8 @@
     import SyncIQ
 from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell.shared_library.cluster \
     import Cluster
+from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell.shared_library.certificate \
+    import Certificate
 from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell \
     import utils
 
@@ -2124,6 +2205,7 @@ def __init__(self):
         self.synciq_api = self.isi_sdk.SyncApi(self.api_client)
         self.network_api = self.isi_sdk.NetworkApi(self.api_client)
         self.storagepool_api = self.isi_sdk.StoragepoolApi(self.api_client)
+        self.certificate_api = self.isi_sdk.CertificateApi(self.api_client)
 
     def get_attributes_list(self):
         """Get the list of attributes of a given PowerScale Storage"""
@@ -2692,6 +2774,7 @@ def perform_module_operation(self):
         cluster_identity = {}
         cluster_owner = {}
         snmp_settings = {}
+        server_certificate = []
 
         if 'attributes' in str(subset):
             attributes = self.get_attributes_list()
@@ -2767,6 +2850,8 @@ def perform_module_operation(self):
         if 'snmp_settings' in str(subset):
             snmp_settings = Protocol(
                 self.protocol_api, self.module).get_snmp_settings()
+        if 'server_certificate' in str(subset):
+            server_certificate = Certificate(self.certificate_api, self.module).get_server_certificate_with_default()
 
         result = dict(
             Attributes=attributes,
@@ -2803,7 +2888,8 @@ def perform_module_operation(self):
             EmailSettings=email_settings,
             ClusterIdentity=cluster_identity,
             ClusterOwner=cluster_owner,
-            SnmpSettings=snmp_settings
+            SnmpSettings=snmp_settings,
+            ServerCertificate=server_certificate
         )
 
         result.update(SynciqTargetClusterCertificate=synciq_target_cluster_certificates)
@@ -2872,6 +2958,7 @@ def get_info_parameters():
                                     'cluster_identity',
                                     'cluster_owner',
                                     'snmp_settings',
+                                    'server_certificate',
                                     ]),
     )
 
diff --git a/plugins/modules/server_certificate.py b/plugins/modules/server_certificate.py
new file mode 100644
index 00000000..fcdc8954
--- /dev/null
+++ b/plugins/modules/server_certificate.py
@@ -0,0 +1,652 @@
+#!/usr/bin/python
+# Copyright: (c) 2024, Dell Technologies
+
+# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+"""Ansible module for managing Server certificates"""
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+DOCUMENTATION = r'''
+---
+module: server_certificate
+version_added: '2.5.0'
+short_description:  Manage server certificates on a PowerScale Storage System
+description:
+  - Manage server certificates on a PowerScale Storage System includes import, update, set certificate to default,
+    and delete server certificates.
+extends_documentation_fragment:
+  - dellemc.powerscale.powerscale
+author:
+  - Felix Stephen (@felixs88) <ansible.team@dell.com>
+options:
+  state:
+    description:
+      - The state option is used to mention the existence of server certificate.
+    type: str
+    choices: [absent, present]
+    default: present
+  alias_name:
+    description:
+      - The name of the certificate.
+      - I(alias_name) is mutually exclusive with I(certificate_id).
+      - The maximum length for I(alias_name) is 128.
+    type: str
+  description:
+    description:
+      - The description of the certificate.
+      - The maximum length for I(description) is 2048.
+      - Setting an empty value is necessary to remove the certificate description.
+    type: str
+  new_alias_name:
+    description:
+      - The I(alias_name) of the certificate.
+      - The maximum length for I(new_alias_name) is 128.
+    type: str
+  certificate_id:
+    description:
+      - The ID of the imported certificate.
+      - I(certificate_id) is mutually exclusive with I(alias_name).
+    type: str
+  certificate_path:
+    description:
+      - The path of the certificate file.
+    type: path
+  certificate_key_path:
+    description:
+      - The path of the certificate key file.
+    type: path
+  certificate_key_password:
+    description:
+      - The password of the certificate key.
+      - The maximum length for I(certificate_key_password) is 256.
+    type: str
+  is_default_certificate:
+    description:
+      - To set the certificate as the default.
+      - If the C(True) is selected, the server certificate is set to default.
+      - Another certificate must be selected as default to designate a certificate as non-default.
+    type: bool
+    default: false
+  certificate_monitor_enabled:
+    description:
+      - Boolean value indicating whether certificate expiration monitoring is enabled.
+      - This option is applicable if I(is_default_certificate) is C(True).
+    type: bool
+  certificate_pre_expiration_threshold:
+    description:
+      - The number of seconds before certificate expiration that the certificate expiration
+        monitor will start raising alerts.
+      - The range for this value is from 0 to 4294967295.
+      - This option is applicable if I(is_default_certificate) is C(True).
+    type: int
+notes:
+  - The I(check_mode) is supported.
+  - The I(check_mode) and idempotency is not supported for I(certificate_path), I(certificate_key_path),
+    and I(certificate_key_password) when updating certificates.
+'''
+
+EXAMPLES = r'''
+- name: To import the new server certificate
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: present
+    alias_name: certificate_name
+    description: The certificate description
+    certificate_path: "/ifs/certificates/server.crt"
+    certificate_key_path: "/ifs/certificates/server.key"
+    certificate_key_password: "Secret@123"
+
+- name: To import the new server certificate and set the certificate as default
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: present
+    alias_name: default_certificate
+    description: The default certificate description
+    certificate_path: "/ifs/certificates/server.crt"
+    certificate_key_path: "/ifs/certificates/server.key"
+    certificate_key_password: "Secret@123"
+    is_default_certificate: true
+    certificate_monitor_enabled: true
+    certificate_pre_expiration_threshold: 300
+
+- name: To update the server certificate
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: present
+    alias_name: certificate_new_name
+    description: The updated certificate description
+
+- name: To update the server certificate and set the certificate as default
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: present
+    certificate_id: "a851d9f3d7b16985be6fcb0402"
+    description: The updated certificate description
+    is_default_certificate: true
+    certificate_monitor_enabled: true
+    certificate_pre_expiration_threshold: 42949
+
+- name: To delete the server certificate
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: absent
+    alias_name: certificate_new_name
+
+- name: To delete the server certificate using certificate ID
+  dellemc.powerscale.server_certificate:
+    onefs_host: "{{ onefs_host }}"
+    api_user: "{{ api_user }}"
+    api_password: "{{ api_password }}"
+    verify_ssl: "{{ verify_ssl }}"
+    state: absent
+    certificate_id: "a851d9f3d7b16985be6fcb0402"
+'''
+
+RETURN = r'''
+changed:
+  description: A boolean indicating if the task had to make changes.
+  returned: always
+  type: bool
+  sample: "false"
+certificate_details:
+  description: The server certificate details.
+  type: dict
+  returned: always
+  contains:
+    description:
+      description: Description of the certificate.
+      type: str
+    id:
+      description: System assigned certificate id.
+      type: str
+    issuer:
+      description: Name of the certificate issuer.
+      type: str
+    name:
+      description: Name for the certificate.
+      type: str
+    not_after:
+      description: The date and time from which the certificate becomes valid and
+        can be used for authentication and encryption.
+      type: str
+    not_before:
+      description: The date and time until which the certificate is valid and
+        can be used for authentication and encryption.
+      type: str
+    status:
+      description: Status of the certificate.
+      type: str
+    fingerprints:
+      description: Fingerprint details of the certificate.
+      type: str
+    dnsnames:
+      description: Subject alternative names of the certificate.
+      type: list
+    subject:
+      description: Subject of the certificate.
+      type: str
+    certificate_monitor_enabled:
+      description: Boolean value indicating whether certificate expiration monitoring is enabled.
+      type: bool
+    certificate_pre_expiration_threshold:
+      description: The number of seconds before certificate expiration that the certificate expiration
+        monitor will start raising alerts.
+      type: int
+  sample:
+    {
+      "certificate_monitor_enabled": true,
+      "certificate_pre_expiration_threshold": 4294,
+      "description": "This the example test description",
+      "dnsnames": ["powerscale"],
+      "fingerprints": [
+        {
+          "type": "SHA1",
+          "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed"
+        },
+        {
+          "type": "SHA256",
+          "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34"
+        }],
+      "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034",
+      "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+      "name": "test",
+      "not_after": 1769586969,
+      "not_before": 1706514969,
+      "status": "valid",
+      "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com"
+    }
+'''
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell.shared_library.powerscale_base \
+    import PowerScaleBase
+from ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell \
+    import utils
+
+LOG = utils.get_logger('server_certificate')
+
+
+class ServerCertificate(PowerScaleBase):
+
+    def __init__(self):
+        """
+        Initializes the class instance.
+
+        :param self: The class instance.
+        """
+        mutually_exclusive = [['certificate_id', 'alias_name']]
+        required_one_of = [['certificate_id', 'alias_name']]
+
+        ansible_module_params = {
+            'argument_spec': self.get_certificate_parameters(),
+            'mutually_exclusive': mutually_exclusive,
+            'required_one_of': required_one_of,
+            'supports_check_mode': True,
+        }
+        super().__init__(AnsibleModule, ansible_module_params)
+
+        self.result.update({
+            "certificate_details": {}
+        })
+
+    def get_certificate_parameters(self):
+        """
+        Returns a dictionary containing the parameters for a certificate.
+
+        :return: A dictionary containing the parameters for a certificate.
+        :rtype: dict
+        """
+        return dict(
+            state=dict(type='str', choices=['present', 'absent'], default='present'),
+            alias_name=dict(type='str'),
+            new_alias_name=dict(type='str'),
+            certificate_id=dict(type='str'),
+            certificate_path=dict(type='path'),
+            certificate_key_path=dict(type='path'),
+            certificate_key_password=dict(type='str', no_log=True),
+            description=dict(type='str'),
+            is_default_certificate=dict(type='bool', default=False),
+            certificate_monitor_enabled=dict(type='bool'),
+            certificate_pre_expiration_threshold=dict(type='int'),
+        )
+
+    def validate_params(self, module_params):
+        """
+        Validates the parameters passed to the function.
+
+        Args:
+            module_params (dict): A dictionary containing the module parameters.
+        """
+
+        alias_name = module_params.get('alias_name')
+        new_alias_name = module_params.get('new_alias_name')
+        description = module_params.get('description')
+        certificate_key_password = module_params.get('certificate_key_password')
+        threshold = module_params.get('certificate_pre_expiration_threshold')
+
+        if (alias_name is not None and len(alias_name) > 128) or (new_alias_name is not None and len(new_alias_name) > 128):
+            self.module.fail_json(msg='The maximum length for alias_name|new_alias_name is 128.')
+        if description is not None and len(description) > 2048:
+            self.module.fail_json(msg='The maximum length for description is 2048.')
+        if certificate_key_password is not None and len(certificate_key_password) > 256:
+            self.module.fail_json(msg='The maximum length for certificate_key_password is 256.')
+        if threshold is not None and not (0 < threshold < 4294967295):
+            self.module.fail_json(msg='The range of certificate_pre_expiration_threshold is 0 - 4294967295.')
+
+    def get_certificate_details(self, module_params):
+        """
+        Retrieves the details of a certificate based on the provided module parameters.
+
+        Args:
+            module_params (dict): A dictionary containing the module parameters.
+
+        Returns:
+            dict: A dictionary containing the certificate details.
+        """
+        alias_name = module_params.get('alias_name')
+        certificate_id = module_params.get('certificate_id')
+        certificate = {}
+        try:
+            if alias_name is not None:
+                certificate_list = self.certificate_api.list_certificate_server().to_dict()
+                for each in certificate_list['certificates']:
+                    if each['name'] == alias_name:
+                        certificate = each
+                        break
+
+            if certificate_id is not None:
+                certificate_list = self.certificate_api.get_certificate_server_by_id(certificate_id).to_dict()
+                if certificate_list:
+                    certificate = certificate_list['certificates'][0]
+        except Exception as e:
+            error_message = f"Failed to retrieve the server certificate: {utils.determine_error(e)}"
+            LOG.error(error_message)
+        return certificate
+
+    def get_default_certificate(self):
+        """
+        Get the default certificate settings.
+
+        Returns:
+            dict: The default certificate settings.
+        """
+        default_certificate = self.certificate_api.get_certificate_settings().to_dict()
+        return default_certificate['settings']
+
+    def make_certificate_default(self, module_params, certificate_id):
+        """
+        Make the certificate default by updating the certificate settings.
+
+        Parameters:
+            module_params (dict): A dictionary containing the module parameters.
+            certificate_id (str): The ID of the certificate to be made default.
+
+        Returns:
+            bool: True if the certificate is successfully made default, False otherwise.
+        """
+        certificate_monitor = module_params.get('certificate_monitor_enabled')
+        certificate_pre_expiration = module_params.get('certificate_pre_expiration_threshold')
+        updated_values = {}
+
+        updated_values['default_https_certificate'] = certificate_id
+        if certificate_monitor is not None:
+            updated_values['certificate_monitor_enabled'] = certificate_monitor
+        if certificate_pre_expiration is not None:
+            updated_values['certificate_pre_expiration_threshold'] = certificate_pre_expiration
+        self.certificate_api.update_certificate_settings(updated_values)
+        return True
+
+    def import_certificate(self, module_params):
+        """
+        Import a certificate and its associated key to the server.
+
+        Args:
+            module_params (dict): A dictionary containing the module parameters.
+
+        Returns:
+            tuple: A tuple containing a boolean indicating success or failure and a dictionary containing the certificate details.
+        """
+
+        alias_name = module_params["alias_name"]
+        new_alias_name = module_params.get("new_alias_name")
+        certificate_path = module_params.get('certificate_path', None)
+        certificate_key_path = module_params.get('certificate_key_path', None)
+        is_certificate_default = module_params.get('is_default_certificate')
+
+        if not alias_name.strip():
+            self.module.fail_json(msg="alias_name is required for importing a certificate.")
+
+        if certificate_path is None or certificate_key_path is None:
+            self.module.fail_json(msg='Required both certificate_path|certificate_key_path for importing a new server certificate.')
+
+        if self.module.check_mode:
+            return True, {}
+
+        description = module_params.get("description")
+        certificate_path = module_params.get("certificate_path")
+        certificate_key_path = module_params.get("certificate_key_path")
+        certificate_key_password = module_params.get("certificate_key_password")
+
+        certificate_server_item = {"name": alias_name, "certificate_path": certificate_path,
+                                   "certificate_key_path": certificate_key_path}
+
+        if description is not None:
+            certificate_server_item["description"] = description
+        if certificate_key_password is not None:
+            certificate_server_item["certificate_key_password"] = certificate_key_password
+
+        certificate = {}
+        try:
+            certificate_id = self.certificate_api.create_certificate_server_item(certificate_server_item).to_dict()
+            if not certificate_id:
+                error_message = "Failed to create the server certificate."
+                LOG.error(error_message)
+                self.module.fail_json(msg=error_message)
+            if is_certificate_default:
+                self.make_certificate_default(module_params, certificate_id['id'])
+            certificate = self.get_certificate_details(module_params)
+            if new_alias_name is not None and new_alias_name.strip():
+                changed, certificate = self.update_certificate(module_params, certificate)
+        except Exception as e:
+            error_message = f"Failed to create the server certificate: {utils.determine_error(e)}"
+            LOG.error(error_message)
+            self.module.fail_json(msg=error_message)
+        return True, certificate
+
+    def get_updated_diff(self, module_params, certificate_details):
+        """
+        Generates the updated diff and returns the changes and updated certificate details.
+
+        Parameters:
+            module_params (dict): The module parameters.
+            certificate_details (dict): The details of the certificate.
+
+        Returns:
+            tuple: A tuple containing the following:
+                - diff_changes (bool): True if there are any changes in the diff, False otherwise.
+                - updated_cert (dict): The updated certificate details.
+                - updated_values (dict): The updated values.
+        """
+
+        new_alias_name = module_params.get('new_alias_name')
+        description = module_params.get('description', '')
+        is_default_certificate = module_params.get('is_default_certificate')
+        certificate_monitor = module_params.get('certificate_monitor_enabled')
+        certificate_pre_expiration = module_params.get('certificate_pre_expiration_threshold')
+
+        updated_values, default_cert_value = {}, {}
+        diff_changes_lst, updated_default_cert = [], False
+        if new_alias_name:
+            updated_values['name'] = new_alias_name
+        if description:
+            updated_values['description'] = description
+
+        default_cert_valid = certificate_details['id'] == self.get_default_certificate()['default_https_certificate']
+        if is_default_certificate or (certificate_details and default_cert_valid):
+
+            default_cert_value['default_https_certificate'] = certificate_details['id']
+            if certificate_monitor is not None:
+                default_cert_value['certificate_monitor_enabled'] = certificate_monitor
+            if certificate_pre_expiration is not None:
+                default_cert_value['certificate_pre_expiration_threshold'] = certificate_pre_expiration
+            default_cert = self.get_default_certificate()
+            default_cert_copy = default_cert.copy()
+            default_cert_copy.update(default_cert_value)
+            updated_default_cert = default_cert_copy != default_cert
+            diff_changes_lst.append(updated_default_cert)
+
+        updated_cert = certificate_details.copy()
+        updated_cert.update(updated_values)
+        diff_changes_lst.append(updated_cert != certificate_details)
+        diff_changes = any(diff_changes_lst)
+        return diff_changes, updated_cert, updated_values, updated_default_cert
+
+    def update_certificate(self, module_params, certificate_details):
+        """
+        Update the certificate with the given module parameters and certificate details.
+
+        Args:
+            module_params (dict): The module parameters containing the new alias name, description, and is_default_certificate.
+            certificate_details (dict): The details of the certificate to be updated.
+
+        Returns:
+            tuple: A tuple containing a boolean indicating if the certificate was updated and the updated certificate details.
+        """
+
+        updated, updated_cert, updated_new_cert, updated_default_cert = \
+            self.get_updated_diff(module_params, certificate_details)
+
+        if self.module.check_mode and (updated or not updated):
+            return updated, certificate_details
+        elif not updated:
+            return updated, certificate_details
+
+        updated_values = {}
+        updated_alias_name = updated_new_cert.get('name')
+        updated_description = updated_new_cert.get('description')
+        if updated_alias_name:
+            updated_values['name'] = updated_alias_name
+        if updated_description:
+            updated_values['description'] = updated_description
+
+        try:
+            if updated_values:
+                self.certificate_api.update_certificate_server_by_id(updated_values, certificate_details['id'])
+            if updated_default_cert:
+                self.make_certificate_default(module_params, certificate_details['id'])
+        except Exception as e:
+            error_message = f"Failed to update the server certificate: {utils.determine_error(e)}"
+            LOG.error(error_message)
+            self.module.fail_json(msg=error_message)
+        return True, updated_cert
+
+    def delete_certificate(self, certificate_details, module_params):
+        """
+        Deletes a certificate from the server.
+
+        Args:
+            certificate_details (dict): A dictionary containing the details of the certificate to be deleted.
+
+        Returns:
+            tuple: A tuple containing a boolean indicating if the certificate was successfully deleted and a dictionary with the certificate details.
+        """
+
+        if certificate_details and (certificate_details['id'] == self.get_default_certificate()['default_https_certificate']):
+            self.module.fail_json(msg="The removal of the default certificate is not allowed.")
+
+        if not self.module.check_mode and certificate_details:
+            self.certificate_api.delete_certificate_server_by_id(certificate_details['id'])
+            certificate = self.get_certificate_details(module_params)
+            return True, certificate
+
+        if not certificate_details:
+            return False, {}
+        return True, certificate_details
+
+
+class ServerCertificateExitHandler:
+
+    def handle(self, certificate_obj, certificate_details):
+        """
+        Handles the certificate object and certificate details.
+
+        Args:
+            certificate_obj (Certificate): The certificate object.
+            certificate_details (dict): The details of the certificate.
+
+        Returns:
+            None
+        """
+        certificate_obj.result['certificate_details'] = certificate_details
+        certificate_obj.module.exit_json(**certificate_obj.result)
+
+
+class ServerCertificateCreateHandler:
+
+    def handle(self, certificate_obj, certificate_details, module_params):
+        """
+        Handles the certificate object and its details.
+
+        Args:
+            certificate_obj (Certificate): The certificate object to be handled.
+            certificate_details (dict): The details of the certificate.
+
+        Returns:
+            None
+        """
+        state = module_params['state']
+        certificate_id = module_params.get('certificate_id')
+        alias_name = module_params.get('alias_name')
+        details = {}
+        if state == 'present' and not certificate_details:
+            changed, details = certificate_obj.import_certificate(module_params)
+            certificate_obj.result['changed'] = changed
+        ServerCertificateUpdateHandler().handle(certificate_obj, module_params, certificate_details, details)
+
+
+class ServerCertificateUpdateHandler:
+
+    def handle(self, certificate_obj, module_params, certificate_details, details):
+        """
+        Handles the certificate object by updating the certificate and setting the result.
+
+        Args:
+            certificate_obj (Certificate): The certificate object to handle.
+            module_params (dict): The module parameters.
+            certificate_details (dict): The certificate details.
+
+        Returns:
+            None
+        """
+        state = module_params['state']
+        certificate_id = module_params.get('certificate_id')
+        alias_name = module_params.get('alias_name')
+        if state == 'present' and certificate_details and (certificate_id is not None or alias_name is not None):
+            changed, details = certificate_obj.update_certificate(module_params, certificate_details)
+            certificate_obj.result['changed'] = changed
+        ServerCertificateDeleteHandler().handle(certificate_obj, certificate_details, module_params, details)
+
+
+class ServerCertificateDeleteHandler:
+
+    def handle(self, certificate_obj, certificate_details, module_params, details):
+        """
+        Deletes a certificate using the provided certificate details.
+
+        Args:
+            certificate_obj (Certificate): The certificate object to delete.
+            certificate_details (dict): The details of the certificate to delete.
+
+        Returns:
+            tuple: A tuple containing a boolean indicating if the certificate was deleted successfully, and a dictionary of details about the deletion process.
+        """
+        state = module_params['state']
+        if state == 'absent':
+            changed, details = certificate_obj.delete_certificate(certificate_details, module_params)
+            certificate_obj.result['changed'] = changed
+        ServerCertificateExitHandler().handle(certificate_obj, details)
+
+
+class ServerCertificateHandler:
+
+    def handle(self, certificate_obj, module_params):
+        """
+        Handles the certificate object based on the given module parameters.
+
+        Args:
+            certificate_obj (Certificate): The certificate object to be handled.
+            module_params (dict): The module parameters containing the certificate details.
+
+        Returns:
+            None
+        """
+        certificate_obj.validate_params(module_params)
+        certificate_details = certificate_obj.get_certificate_details(module_params)
+        ServerCertificateCreateHandler().handle(certificate_obj, certificate_details, module_params)
+
+
+def main():
+    obj = ServerCertificate()
+    ServerCertificateHandler().handle(obj, obj.module.params)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/plugins/modules/synciqjob.py b/plugins/modules/synciqjob.py
index 1ec4a9d4..ba9fa24e 100644
--- a/plugins/modules/synciqjob.py
+++ b/plugins/modules/synciqjob.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright: (c) 2021, Dell Technologies
+# Copyright: (c) 2024, Dell Technologies
 
 # Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -51,6 +51,7 @@
 notes:
 - There is delay in the actual state change of the SyncIQ job. The state
   change of jobs in 'scheduled' state is not supported.
+- To start the SyncIQ job use the M(synciqpolicy) module.
 - The I(check_mode) is not supported.
 '''
 
diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt
index d3d41a9d..16b00050 100644
--- a/tests/sanity/ignore-2.14.txt
+++ b/tests/sanity/ignore-2.14.txt
@@ -126,4 +126,13 @@ plugins/modules/snmp_settings.py validate-modules:missing-gplv3-license
 plugins/modules/snmp_settings.py import-2.7
 plugins/modules/snmp_settings.py compile-2.7
 plugins/modules/snmp_settings.py import-3.5
-plugins/modules/snmp_settings.py compile-3.5
\ No newline at end of file
+plugins/modules/snmp_settings.py compile-3.5
+plugins/modules/server_certificate.py import-2.7
+plugins/modules/server_certificate.py import-3.5
+plugins/modules/server_certificate.py compile-2.7
+plugins/modules/server_certificate.py compile-3.5
+plugins/module_utils/storage/dell/shared_library/certificate.py compile-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py import-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py compile-3.5
+plugins/module_utils/storage/dell/shared_library/certificate.py import-3.5
+plugins/modules/server_certificate.py validate-modules:missing-gplv3-license
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt
index d3d41a9d..16b00050 100644
--- a/tests/sanity/ignore-2.15.txt
+++ b/tests/sanity/ignore-2.15.txt
@@ -126,4 +126,13 @@ plugins/modules/snmp_settings.py validate-modules:missing-gplv3-license
 plugins/modules/snmp_settings.py import-2.7
 plugins/modules/snmp_settings.py compile-2.7
 plugins/modules/snmp_settings.py import-3.5
-plugins/modules/snmp_settings.py compile-3.5
\ No newline at end of file
+plugins/modules/snmp_settings.py compile-3.5
+plugins/modules/server_certificate.py import-2.7
+plugins/modules/server_certificate.py import-3.5
+plugins/modules/server_certificate.py compile-2.7
+plugins/modules/server_certificate.py compile-3.5
+plugins/module_utils/storage/dell/shared_library/certificate.py compile-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py import-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py compile-3.5
+plugins/module_utils/storage/dell/shared_library/certificate.py import-3.5
+plugins/modules/server_certificate.py validate-modules:missing-gplv3-license
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt
index cf9bf4ca..3afa015b 100644
--- a/tests/sanity/ignore-2.16.txt
+++ b/tests/sanity/ignore-2.16.txt
@@ -82,4 +82,9 @@ plugins/modules/smb_global_settings.py compile-2.7
 plugins/modules/smb_global_settings.py validate-modules:missing-gplv3-license
 plugins/modules/snmp_settings.py validate-modules:missing-gplv3-license
 plugins/modules/snmp_settings.py import-2.7
-plugins/modules/snmp_settings.py compile-2.7
\ No newline at end of file
+plugins/modules/snmp_settings.py compile-2.7
+plugins/modules/server_certificate.py import-2.7
+plugins/modules/server_certificate.py compile-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py compile-2.7
+plugins/module_utils/storage/dell/shared_library/certificate.py import-2.7
+plugins/modules/server_certificate.py validate-modules:missing-gplv3-license
\ No newline at end of file
diff --git a/tests/unit/plugins/module_utils/mock_info_api.py b/tests/unit/plugins/module_utils/mock_info_api.py
index 002e3371..1d6b4a90 100644
--- a/tests/unit/plugins/module_utils/mock_info_api.py
+++ b/tests/unit/plugins/module_utils/mock_info_api.py
@@ -80,7 +80,8 @@ class MockGatherfactsApi:
         'NTPServers': {},
         'EmailSettings': {},
         'ClusterIdentity': {},
-        'ClusterOwner': {}
+        'ClusterOwner': {},
+        'ServerCertificate': []
     }
     API = "api"
     MODULE = "module"
diff --git a/tests/unit/plugins/module_utils/mock_server_certificate_api.py b/tests/unit/plugins/module_utils/mock_server_certificate_api.py
new file mode 100644
index 00000000..a13a086e
--- /dev/null
+++ b/tests/unit/plugins/module_utils/mock_server_certificate_api.py
@@ -0,0 +1,135 @@
+# Copyright: (c) 2024, Dell Technologies
+
+# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+"""Mock Api response for Unit tests of server certificate module on PowerScale"""
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+
+class MockServerCertificateApi:
+    MODULE_UTILS_PATH = 'ansible_collections.dellemc.powerscale.plugins.module_utils.storage.dell.utils'
+
+    SERVER_CERTIFICATE_COMMON_ARGS = {
+        "onefs_host": "**.***.**.***",
+        "description": "The test description",
+        "state": 'present',
+        "verify_ssl": False
+    }
+
+    GET_SERVER_CERTIFICATE_RESPONSE = {
+        "certificates": [
+            {
+                "description": "This the example test description",
+                "dnsnames": ["powerscale"],
+                "fingerprints": [
+                    {
+                        "type": "SHA1",
+                        "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed",
+                    },
+                    {
+                        "type": "SHA256",
+                        "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34",
+                    },
+                ],
+                "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034",
+                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "name": "test",
+                "not_after": 1769586969,
+                "not_before": 1706514969,
+                "status": "valid",
+                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+            },
+            {
+                "description": "This the example new_test description",
+                "dnsnames": ["powerscale"],
+                "fingerprints": [
+                    {
+                        "type": "SHA1",
+                        "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed",
+                    },
+                    {
+                        "type": "SHA256",
+                        "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34",
+                    },
+                ],
+                "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81035",
+                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "name": "new_test",
+                "not_after": 1769586969,
+                "not_before": 1706514969,
+                "status": "valid",
+                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+            },
+        ]
+    }
+
+    GET_DEFAULT_CERTIFICATE = {
+        "settings": {
+            "default_https_certificate": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034"
+        }
+    }
+
+    IMPORT_CERTIFICATE_GET_RESPONSE = {
+        "certificates": [
+            {
+                "description": "This the example new_test description",
+                "dnsnames": ["powerscale"],
+                "fingerprints": [
+                    {
+                        "type": "SHA1",
+                        "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed",
+                    },
+                    {
+                        "type": "SHA256",
+                        "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34",
+                    },
+                ],
+                "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81036",
+                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "name": "test_new_cert",
+                "not_after": 1769586969,
+                "not_before": 1706514969,
+                "status": "valid",
+                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+            }
+        ]
+    }
+
+    IMPORT_CERTIFICATE_RESPONSE = {"id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81036"}
+    UPDATE_DEFAULT_CERTIFICATE = ""
+    IMPORT_CERTIFICATE_RESPONSE_EMPTY = {}
+
+    @staticmethod
+    def get_default_certificate_error():
+        return "The removal of the default certificate is not allowed."
+
+    @staticmethod
+    def get_module_params_error(response_type):
+        if response_type == "alias_name_error" or response_type == "new_alias_name_error":
+            return "The maximum length for alias_name"
+        elif response_type == "description_error":
+            return "The maximum length for description"
+        elif response_type == "key_password_error":
+            return "The maximum length for certificate_key_password"
+        elif response_type == "threshold_error":
+            return "The range of certificate_pre_expiration_threshold"
+
+    @staticmethod
+    def get_certificate_error(response_type):
+        if response_type == "get_certificate_error_id":
+            return "Failed to retrieve the server certificate"
+
+    @staticmethod
+    def get_import_certificate_error(response_type):
+        if response_type == "certificate_required_error":
+            return "Required both certificate_path|certificate_key_path for importing a new server certificate."
+        elif response_type == "certificate_exception":
+            return "Failed to create the server certificate"
+
+    @staticmethod
+    def update_server_certificate_error(response_type):
+        if response_type == "update_failure_response":
+            return "Failed to update the server certificate"
diff --git a/tests/unit/plugins/modules/test_server_certificate.py b/tests/unit/plugins/modules/test_server_certificate.py
new file mode 100644
index 00000000..29bd1344
--- /dev/null
+++ b/tests/unit/plugins/modules/test_server_certificate.py
@@ -0,0 +1,218 @@
+# Copyright: (c) 2024, Dell Technologies
+
+# Apache License version 2.0 (see MODULE-LICENSE or http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+"""Unit Tests for server certificate module on PowerScale"""
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import pytest
+from mock.mock import MagicMock
+# pylint: disable=unused-import
+from ansible_collections.dellemc.powerscale.tests.unit.plugins.module_utils.shared_library.initial_mock \
+    import utils
+from ansible_collections.dellemc.powerscale.plugins.modules.server_certificate import ServerCertificate, ServerCertificateHandler
+from ansible_collections.dellemc.powerscale.tests.unit.plugins.module_utils.mock_server_certificate_api \
+    import MockServerCertificateApi
+from ansible_collections.dellemc.powerscale.tests.unit.plugins.module_utils.mock_api_exception \
+    import MockApiException
+from ansible_collections.dellemc.powerscale.tests.unit.plugins.module_utils.shared_library.powerscale_unit_base \
+    import PowerScaleUnitBase
+
+
+CRT_PATH = "/ifs/server.crt"
+KEY_PATH = "/ifs/server.key"
+KEY_PASSWORD = "Secret@123!"
+ALIAS_NAME = "test"
+CERTIFICATE_ID = "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034"
+
+
+class TestServerCertificate(PowerScaleUnitBase):
+    server_certificate_args = MockServerCertificateApi.SERVER_CERTIFICATE_COMMON_ARGS
+
+    @pytest.fixture
+    def module_object(self):
+        return ServerCertificate
+
+    def test_validate_module_params(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": ALIAS_NAME * 129})
+        self.capture_fail_json_call(MockServerCertificateApi.get_module_params_error("alias_name_error"),
+                                    powerscale_module_mock, ServerCertificateHandler)
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "description": ALIAS_NAME * 2048, "alias_name": ALIAS_NAME})
+        self.capture_fail_json_call(MockServerCertificateApi.get_module_params_error("description_error"),
+                                    powerscale_module_mock, ServerCertificateHandler)
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "description": ALIAS_NAME, "alias_name": ALIAS_NAME,
+                                "certificate_key_password": KEY_PASSWORD * 256})
+        self.capture_fail_json_call(MockServerCertificateApi.get_module_params_error("key_password_error"),
+                                    powerscale_module_mock, ServerCertificateHandler)
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "description": ALIAS_NAME, "alias_name": ALIAS_NAME,
+                                "certificate_key_password": KEY_PASSWORD, "certificate_path": CRT_PATH,
+                                "certificate_key_path": KEY_PATH, "certificate_pre_expiration_threshold": -10})
+        self.capture_fail_json_call(MockServerCertificateApi.get_module_params_error("threshold_error"),
+                                    powerscale_module_mock, ServerCertificateHandler)
+
+    def test_import_server_certificate_error(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "alias_name": "test_new_cert",
+                                "description": "This is the example for test new certificate.",
+                                "certificate_key_password": KEY_PASSWORD, "is_default_certificate": True,
+                                "certificate_monitor_enabled": True, "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.certificate_api.create_certificate_server_item().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.IMPORT_CERTIFICATE_RESPONSE)
+        self.capture_fail_json_call(MockServerCertificateApi.get_import_certificate_error('certificate_required_error'),
+                                    powerscale_module_mock, ServerCertificateHandler)
+
+    def test_import_server_certificate_exception(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "alias_name": "test_new_cert", "certificate_path": CRT_PATH,
+                                "description": "This is the example for test_new cert.",
+                                "certificate_key_path": KEY_PATH, "certificate_key_password": KEY_PASSWORD,
+                                "is_default_certificate": True, "certificate_monitor_enabled": True,
+                                "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.certificate_api.create_certificate_server_item().to_dict = MagicMock(
+            return_value=MockApiException)
+        self.capture_fail_json_call(MockServerCertificateApi.get_import_certificate_error('certificate_exception'),
+                                    powerscale_module_mock, ServerCertificateHandler)
+
+    def test_import_server_certificate_check_mode(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "alias_name": "test_new_cert", "certificate_path": CRT_PATH,
+                                "description": "This is the example for test_new cert.",
+                                "certificate_key_path": KEY_PATH, "certificate_key_password": KEY_PASSWORD,
+                                "is_default_certificate": True, "certificate_monitor_enabled": True,
+                                "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.module.check_mode = True
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_import_server_certificate_response_empty(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "alias_name": "test_new_cert", "certificate_path": CRT_PATH,
+                                "description": "This is the example for test new cert.",
+                                "certificate_key_path": KEY_PATH, "certificate_key_password": KEY_PASSWORD,
+                                "is_default_certificate": True, "certificate_monitor_enabled": True,
+                                "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.certificate_api.create_certificate_server_item().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.IMPORT_CERTIFICATE_RESPONSE_EMPTY)
+        self.capture_fail_json_call(MockServerCertificateApi.get_import_certificate_error('certificate_exception'),
+                                    powerscale_module_mock, ServerCertificateHandler)
+
+    def test_import_server_certificate(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "alias_name": "test_new_cert", "certificate_path": CRT_PATH,
+                                "description": "This is the example for test new cert.",
+                                "certificate_key_path": KEY_PATH, "certificate_key_password": KEY_PASSWORD,
+                                "is_default_certificate": True, "certificate_monitor_enabled": True,
+                                "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.certificate_api.update_certificate_settings().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.UPDATE_DEFAULT_CERTIFICATE)
+        powerscale_module_mock.certificate_api.create_certificate_server_item().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.IMPORT_CERTIFICATE_RESPONSE)
+        powerscale_module_mock.certificate_api.list_certificate_server().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_update_server_certificate_without_value(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "new_alias_name": None, "alias_name": None,
+                                "description": None, "certificate_id": CERTIFICATE_ID,
+                                "is_default_certificate": False})
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed']
+
+    def test_update_server_certificate_check_mode(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "new_alias_name": "test_updated", "alias_name": None,
+                                "description": None, "certificate_id": CERTIFICATE_ID,
+                                "is_default_certificate": False})
+        powerscale_module_mock.module.check_mode = True
+        powerscale_module_mock.certificate_api.get_certificate_server_by_id(CERTIFICATE_ID).to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_update_server_certificate_idempotence(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "new_alias_name": "test", "alias_name": None,
+                                "description": None, "certificate_id": CERTIFICATE_ID,
+                                "is_default_certificate": False})
+        powerscale_module_mock.module.check_mode = True
+        powerscale_module_mock.certificate_api.get_certificate_server_by_id(CERTIFICATE_ID).to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert not powerscale_module_mock.module.exit_json.call_args[1]['changed']
+
+    def test_update_server_certificate(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "present", "new_alias_name": "updated_test", "certificate_id": CERTIFICATE_ID,
+                                "description": "This is the updated description certificate.",
+                                "is_default_certificate": True, "certificate_monitor_enabled": True,
+                                "certificate_pre_expiration_threshold": 45673})
+        powerscale_module_mock.certificate_api.update_certificate_server_by_id().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.UPDATE_DEFAULT_CERTIFICATE)
+        powerscale_module_mock.certificate_api.update_certificate_settings().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.UPDATE_DEFAULT_CERTIFICATE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_delete_certificate_name(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": ALIAS_NAME})
+        powerscale_module_mock.certificate_api.list_certificate_server().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_delete_certificate_id(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "certificate_id": CERTIFICATE_ID})
+        powerscale_module_mock.certificate_api.get_certificate_server_by_id(CERTIFICATE_ID).to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_delete_certificate_check_mode(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": ALIAS_NAME})
+        powerscale_module_mock.module.check_mode = True
+        powerscale_module_mock.certificate_api.list_certificate_server().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert powerscale_module_mock.module.exit_json.call_args[1]['changed'] is True
+
+    def test_delete_certificate_check_mode_invalid_alias_name(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": "test_example", "certificate_id": None})
+        powerscale_module_mock.module.check_mode = True
+        powerscale_module_mock.certificate_api.list_certificate_server().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        ServerCertificateHandler().handle(powerscale_module_mock, powerscale_module_mock.module.params)
+        assert not powerscale_module_mock.module.exit_json.call_args[1]['changed']
+
+    def test_delete_default_certificate(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": ALIAS_NAME})
+        powerscale_module_mock.certificate_api.list_certificate_server().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_SERVER_CERTIFICATE_RESPONSE)
+        powerscale_module_mock.certificate_api.get_certificate_settings().to_dict = MagicMock(
+            return_value=MockServerCertificateApi.GET_DEFAULT_CERTIFICATE)
+        self.capture_fail_json_call(MockServerCertificateApi.get_default_certificate_error(),
+                                    powerscale_module_mock, ServerCertificateHandler)
+
+    def test_delete_certificate_exception(self, powerscale_module_mock):
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "alias_name": ALIAS_NAME})
+        certificate_id = "6999b9c02949c962e84b600"
+        self.set_module_params(powerscale_module_mock, self.server_certificate_args,
+                               {"state": "absent", "certificate_id": certificate_id})
+        powerscale_module_mock.certificate_api.get_certificate_server_by_id(certificate_id).to_dict = MagicMock(
+            return_value=MockApiException)
+        self.capture_fail_json_call(MockServerCertificateApi.get_certificate_error('get_certificate_error_id'),
+                                    powerscale_module_mock, ServerCertificateHandler)

From fd30fa511ac8cdb06300282af19294825d05d6e3 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 17:39:29 +0530
Subject: [PATCH 02/10] fix for sanity

---
 docs/modules/synciqjob.rst   | 2 +-
 plugins/modules/synciqjob.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/modules/synciqjob.rst b/docs/modules/synciqjob.rst
index 19a66cca..58b39ea9 100644
--- a/docs/modules/synciqjob.rst
+++ b/docs/modules/synciqjob.rst
@@ -77,7 +77,7 @@ Notes
 
 .. note::
    - There is delay in the actual state change of the SyncIQ job. The state change of jobs in 'scheduled' state is not supported.
-   - To start the SyncIQ job use the :ref:`synciqpolicy <synciqpolicy_module>` module.
+   - To start the SyncIQ job use the :ref:`dellemc.powerscale.synciqpolicy <dellemc.powerscale.synciqpolicy_module>` module.
    - The *check_mode* is not supported.
    - The modules present in this collection named as 'dellemc.powerscale' are built to support the Dell PowerScale storage platform.
 
diff --git a/plugins/modules/synciqjob.py b/plugins/modules/synciqjob.py
index ba9fa24e..e98c4011 100644
--- a/plugins/modules/synciqjob.py
+++ b/plugins/modules/synciqjob.py
@@ -51,7 +51,7 @@
 notes:
 - There is delay in the actual state change of the SyncIQ job. The state
   change of jobs in 'scheduled' state is not supported.
-- To start the SyncIQ job use the M(synciqpolicy) module.
+- To start the SyncIQ job use the M(dellemc.powerscale.synciqpolicy) module.
 - The I(check_mode) is not supported.
 '''
 

From fd978e067059f962fda44195cbc714d6448fb19f Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 17:44:58 +0530
Subject: [PATCH 03/10] Fix for lint

---
 playbooks/modules/server_certificate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/modules/server_certificate.yml b/playbooks/modules/server_certificate.yml
index 3aadc322..a3cea834 100644
--- a/playbooks/modules/server_certificate.yml
+++ b/playbooks/modules/server_certificate.yml
@@ -102,7 +102,7 @@
             verify_ssl: "{{ verify_ssl }}"
             state: absent
             alias_name: certificate_name
-        
+
         - name: To import the new server certificate
           dellemc.powerscale.server_certificate:
             onefs_host: "{{ onefs_host }}"

From 52ae38309cbad4ef6eb6f02d40c803ac692815cb Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 18:24:43 +0530
Subject: [PATCH 04/10] updated workflow config

---
 .github/workflows/ansible-test.yml | 98 ++++++++++++------------------
 .gitignore                         |  4 ++
 codecov.yml                        |  2 +
 galaxy.yml                         |  3 +-
 4 files changed, 48 insertions(+), 59 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 codecov.yml

diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index e15fb8c9..66657f0a 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -2,9 +2,8 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
   schedule:
     - cron: '0 3 * * *'
 
@@ -15,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ansible-version: [stable-2.14]
+        ansible-version: [stable-2.14, stable-2.15, stable-2.16, devel]
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -43,41 +42,33 @@ jobs:
   # https://docs.ansible.com/ansible/latest/dev_guide/testing_units.html
 
   unit:
-    name: Unit Tests
+    name: Unit Tests (Ⓐ${{ matrix.ansible }} with ${{ matrix.python }} python)
     needs: [build]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-        ansible-version: [stable-2.14, stable-2.15, stable-2.16]
+        python: ['3.9', '3.10', '3.11']
+        ansible:
+          - 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
+          - ansible: stable-2.16
+            python: '3.9'
+          - ansible: devel
+            python: '3.9'
 
     steps:
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Perform unit testing with ansible-test
+        uses: ansible-community/ansible-test-gh-action@release/v1
         with:
-          python-version: ${{ matrix.python-version }}
+          testing-type: units
+          coverage: always
+          ansible-core-version: ${{ matrix.ansible }}
+          target-python-version: ${{ matrix.python }}
 
-      - name: Install ansible (${{ matrix.ansible-version }}) version
-        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
-
-      - name: Download migrated collection artifacts
-        uses: actions/download-artifact@v1
-        with:
-          name: collection
-          path: .cache/collection-tarballs
-
-      - name: Setup Unit test Pre-requisites
-        run: |
-          ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
-          if [ -f /home/runner/.ansible/collections/ansible_collections/dellemc/powerscale/tests/requirements.txt ]; then pip install -r /home/runner/.ansible/collections/ansible_collections/dellemc/powerscale/tests/requirements.txt; fi
-      - name: Run Unit tests using ansible-test
-        run: ansible-test units -v --color --python ${{ matrix.python-version }} --coverage
-        working-directory: /home/runner/.ansible/collections/ansible_collections/dellemc/powerscale
 
   ###
   # Sanity tests (REQUIRED)
@@ -85,45 +76,34 @@ jobs:
   # https://docs.ansible.com/ansible/latest/dev_guide/testing_sanity.html
 
   sanity:
-    name: Sanity Tests
+    name: Sanity (Ⓐ${{ matrix.ansible }} with ${{ matrix.python }} python)
     runs-on: ubuntu-latest
     needs: [build]
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-        ansible-version: [stable-2.14, stable-2.15, stable-2.16]
+        python: ['3.9', '3.10', '3.11']
+        ansible:
+          - 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
+          - ansible: stable-2.16
+            python: '3.9'
+          - ansible: devel
+            python: '3.9'
 
     steps:
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v4
-        with:
-          # it is just required to run that once as "ansible-test sanity" in the docker image
-          # will run on all python versions it supports.
-          python-version: 3.11
-
-      - name: Install ansible (${{ matrix.ansible-version }}) version
-        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
-
-      - name: Download migrated collection artifacts
-        uses: actions/download-artifact@v1
+      - name: Perform sanity testing
+        uses: ansible-community/ansible-test-gh-action@release/v1
         with:
-          name: collection
-          path: .cache/collection-tarballs
+          ansible-core-version: ${{ matrix.ansible }}
+          target-python-version: ${{ matrix.python }}
+          testing-type: sanity
+          pull-request-change-detection: true
+          coverage: never
 
-      - name: Setup Sanity test Pre-requisites
-        run: ansible-galaxy collection install .cache/collection-tarballs/*.tar.gz
-
-      # run ansible-test sanity inside of Docker.
-      # The docker container has all the pinned dependencies that are required
-      # and all python versions ansible supports.
-      - name: Run sanity tests
-        run: ansible-test sanity --docker -v --color
-        working-directory: /home/runner/.ansible/collections/ansible_collections/dellemc/powerscale
   lint:
     name: Ansible lint
     runs-on: ubuntu-latest
@@ -132,10 +112,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
-        ansible-version: [stable-2.14, stable-2.15, stable-2.16]
+        ansible-version: [stable-2.14, stable-2.15, stable-2.16, devel]
         exclude:
           - ansible-version: stable-2.16
             python-version: '3.9'
+          - ansible-version: devel
+            python-version: '3.9'
 
     steps:
       # Important: This sets up your GITHUB_WORKSPACE environment variable
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f7072c88
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+
+output
+__pycache__/
+*.log
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..c372cba0
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,2 @@
+fixes:
+  - "/ansible_collections/dellemc/powerstore/::"
diff --git a/galaxy.yml b/galaxy.yml
index 80958b1a..5017563d 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -82,4 +82,5 @@ issues: https://www.dell.com/community/Automation/bd-p/Automation
 # the relative path of the file or directory of the collection directory.
 # This uses 'fnmatch' to match the files or directories. Some directories and
 # files like 'galaxy.yml', '*.pyc', '*.retry', and '.git' are always filtered
-build_ignore: []
+build_ignore:
+  - codecov.yml

From de29fbce82d1fc7663afdd8c6cce9f354005a5e2 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 18:32:21 +0530
Subject: [PATCH 05/10] updated codecov.yml

---
 codecov.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codecov.yml b/codecov.yml
index c372cba0..fdae8e3b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,2 +1,2 @@
 fixes:
-  - "/ansible_collections/dellemc/powerstore/::"
+  - "/ansible_collections/dellemc/powerscale/::"

From ab29276c3a928b91ccde400e02a42bc480d55b01 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Thu, 22 Feb 2024 18:53:41 +0530
Subject: [PATCH 06/10] updated ignore txt

---
 tests/sanity/ignore-2.17.txt      | 39 +++++++++++++++++++++++++++++++
 tests/{ => unit}/requirements.txt |  0
 2 files changed, 39 insertions(+)
 create mode 100644 tests/sanity/ignore-2.17.txt
 rename tests/{ => unit}/requirements.txt (100%)

diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
new file mode 100644
index 00000000..a2ce76dc
--- /dev/null
+++ b/tests/sanity/ignore-2.17.txt
@@ -0,0 +1,39 @@
+plugins/modules/accesszone.py validate-modules:missing-gplv3-license
+plugins/modules/ads.py validate-modules:missing-gplv3-license
+plugins/modules/filesystem.py validate-modules:missing-gplv3-license
+plugins/modules/s3_bucket.py validate-modules:missing-gplv3-license
+plugins/modules/nfs_zone_settings.py validate-modules:missing-gplv3-license
+plugins/modules/info.py validate-modules:missing-gplv3-license
+plugins/modules/group.py validate-modules:missing-gplv3-license
+plugins/modules/ldap.py validate-modules:missing-gplv3-license
+plugins/modules/nfs.py validate-modules:missing-gplv3-license
+plugins/modules/node.py validate-modules:missing-gplv3-license
+plugins/modules/smartquota.py validate-modules:missing-gplv3-license
+plugins/modules/smb.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/synciqjob.py validate-modules:missing-gplv3-license
+plugins/modules/synciqpolicy.py validate-modules:missing-gplv3-license
+plugins/modules/synciqreports.py validate-modules:missing-gplv3-license
+plugins/modules/synciqrules.py validate-modules:missing-gplv3-license
+plugins/modules/synciqtargetreports.py validate-modules:missing-gplv3-license
+plugins/modules/user.py validate-modules:missing-gplv3-license
+plugins/modules/groupnet.py validate-modules:missing-gplv3-license
+plugins/modules/subnet.py validate-modules:missing-gplv3-license
+plugins/modules/networkrule.py validate-modules:missing-gplv3-license
+plugins/modules/nfs_alias.py validate-modules:missing-gplv3-license
+plugins/modules/settings.py validate-modules:missing-gplv3-license
+plugins/modules/networksettings.py validate-modules:missing-gplv3-license
+plugins/modules/smartpoolsettings.py validate-modules:missing-gplv3-license
+plugins/modules/filepoolpolicy.py validate-modules:missing-gplv3-license
+plugins/modules/storagepooltier.py validate-modules:missing-gplv3-license
+plugins/modules/smb_file.py validate-modules:missing-gplv3-license
+plugins/modules/user_mapping_rule.py validate-modules:missing-gplv3-license
+plugins/modules/networkpool.py validate-modules:missing-gplv3-license
+plugins/modules/nfs_global_settings.py validate-modules:missing-gplv3-license
+plugins/modules/nfs_default_settings.py validate-modules:missing-gplv3-license
+plugins/modules/synciq_global_settings.py validate-modules:missing-gplv3-license
+plugins/modules/synciqcertificate.py validate-modules:missing-gplv3-license
+plugins/modules/smb_global_settings.py validate-modules:missing-gplv3-license
+plugins/modules/snmp_settings.py validate-modules:missing-gplv3-license
+plugins/modules/server_certificate.py validate-modules:missing-gplv3-license
\ No newline at end of file
diff --git a/tests/requirements.txt b/tests/unit/requirements.txt
similarity index 100%
rename from tests/requirements.txt
rename to tests/unit/requirements.txt

From 0c9440290d11a00ef04e29d89c8eb9d362a26635 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Fri, 23 Feb 2024 16:58:28 +0530
Subject: [PATCH 07/10] updated with sonar issue fix

---
 codecov.yml                                          |  1 +
 playbooks/modules/server_certificate.yml             |  2 +-
 plugins/modules/server_certificate.py                |  6 +-----
 .../module_utils/mock_server_certificate_api.py      | 12 ++++++------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index fdae8e3b..9b71ce9b 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,2 +1,3 @@
+---
 fixes:
   - "/ansible_collections/dellemc/powerscale/::"
diff --git a/playbooks/modules/server_certificate.yml b/playbooks/modules/server_certificate.yml
index a3cea834..4d4ad760 100644
--- a/playbooks/modules/server_certificate.yml
+++ b/playbooks/modules/server_certificate.yml
@@ -24,7 +24,7 @@
         certificate_key_path: "/ifs/certificates/server.key"
         certificate_key_password: "Secret@123"
 
-    - name: To import the new server certificate and set the certificate as default
+    - name: Import and set the new server certificate as default
       dellemc.powerscale.server_certificate:
         onefs_host: "{{ onefs_host }}"
         api_user: "{{ api_user }}"
diff --git a/plugins/modules/server_certificate.py b/plugins/modules/server_certificate.py
index fcdc8954..ceab464b 100644
--- a/plugins/modules/server_certificate.py
+++ b/plugins/modules/server_certificate.py
@@ -494,9 +494,7 @@ def update_certificate(self, module_params, certificate_details):
         updated, updated_cert, updated_new_cert, updated_default_cert = \
             self.get_updated_diff(module_params, certificate_details)
 
-        if self.module.check_mode and (updated or not updated):
-            return updated, certificate_details
-        elif not updated:
+        if (self.module.check_mode) or not updated:
             return updated, certificate_details
 
         updated_values = {}
@@ -573,8 +571,6 @@ def handle(self, certificate_obj, certificate_details, module_params):
             None
         """
         state = module_params['state']
-        certificate_id = module_params.get('certificate_id')
-        alias_name = module_params.get('alias_name')
         details = {}
         if state == 'present' and not certificate_details:
             changed, details = certificate_obj.import_certificate(module_params)
diff --git a/tests/unit/plugins/module_utils/mock_server_certificate_api.py b/tests/unit/plugins/module_utils/mock_server_certificate_api.py
index a13a086e..08882bd4 100644
--- a/tests/unit/plugins/module_utils/mock_server_certificate_api.py
+++ b/tests/unit/plugins/module_utils/mock_server_certificate_api.py
@@ -27,20 +27,20 @@ class MockServerCertificateApi:
                 "fingerprints": [
                     {
                         "type": "SHA1",
-                        "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3:ed",
+                        "value": "68:b2:d5:5d:cc:b0:70:f1:f0:39:3a:bb:e0:44:49:70:6e:05:c3",
                     },
                     {
                         "type": "SHA256",
-                        "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10:34",
+                        "value": "69:99:b9:c0:29:49:c9:62:e8:4b:60:05:60:a8:fa:f0:01:ab:24:43:8a:47:4c:2f:66:2c:95:a1:7c:d8:10",
                     },
                 ],
                 "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81034",
-                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=info@dell.com",
                 "name": "test",
                 "not_after": 1769586969,
                 "not_before": 1706514969,
                 "status": "valid",
-                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ESG, CN=powerscale, emailAddress=info@dell.com",
             },
             {
                 "description": "This the example new_test description",
@@ -56,12 +56,12 @@ class MockServerCertificateApi:
                     },
                 ],
                 "id": "6999b9c02949c962e84b600560a8faf001ab24438a474c2f662c95a17cd81035",
-                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "issuer": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=mail@dell.com",
                 "name": "new_test",
                 "not_after": 1769586969,
                 "not_before": 1706514969,
                 "status": "valid",
-                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ISG, CN=powerscale, emailAddress=contact@dell.com",
+                "subject": "C=IN, ST=Karnataka, L=Bangalore, O=Dell, OU=ESG, CN=powerscale, emailAddress=mail@dell.com",
             },
         ]
     }

From 34f393b5a9195eea4f2079991dc8e9301873d258 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Tue, 27 Feb 2024 11:22:13 +0530
Subject: [PATCH 08/10] updated version and gitignore file

---
 .gitignore            | 1 -
 docs/Release Notes.md | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7072c88..29185f6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-
 output
 __pycache__/
 *.log
diff --git a/docs/Release Notes.md b/docs/Release Notes.md
index 57b8115e..e639c7b4 100644
--- a/docs/Release Notes.md	
+++ b/docs/Release Notes.md	
@@ -124,7 +124,7 @@ This section lists the limitations in this release of Ansible Modules for Dell P
 Software media, organization, and files 
 -----------
 The software package is available for download from the [Ansible Modules
-for PowerScale GitHub](https://github.com/dell/ansible-powerscale/tree/2.4.1) page.
+for PowerScale GitHub](https://github.com/dell/ansible-powerscale/tree/2.5.0) page.
 
 Additional resources
 --------------------

From ac0f4fa1d7a93be14abeb6eecde257710f118ebb Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Tue, 27 Feb 2024 14:31:50 +0530
Subject: [PATCH 09/10] updated SDK version

---
 README.md            | 10 +++++-----
 docs/ISSUE_TRIAGE.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e333b305..84a5bd28 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ This table provides information about the software prerequisites for the Ansible
 
 | **Ansible Modules** | **OneFS Version** | **Python version** | **Python SDK version** | **Ansible**              |
 |---------------------|-----------------------|--------------------|----------------------------|--------------------------|
-| v2.5.0 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 9.3.0 <br> 9.4.0 <br> 9.5.0 | 2.14 <br> 2.15 <br> 2.16 |
+| v2.5.0 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 0.3.0.1 <br> 0.3.0.1 <br> 0.3.0.1 | 2.14 <br> 2.15 <br> 2.16 |
 
 # List of Ansible modules for Dell PowerScale
   * [File System Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/filesystem.rst)
@@ -76,10 +76,10 @@ This table provides information about the software prerequisites for the Ansible
   * [User Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/user.rst)
   * [Group Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/group.rst)
   * [Snapshot Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/snapshot.rst)
-  * [Snapshot Schedule Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/snapshotschedule.rst)
-  * [NFS Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/nfs.rst)
-  * [SMB Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/smb.rst)
-  * [Smart Quota Module](https://github.com/dell/ansible-powerscale/blob/2.5./docs/modules/smartquota.rst)
+  * [Snapshot Schedule Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/snapshotschedule.rst)
+  * [NFS Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/nfs.rst)
+  * [SMB Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/smb.rst)
+  * [Smart Quota Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/smartquota.rst)
   * [Info Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/info.rst)
   * [Active Directory Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/ads.rst)
   * [LDAP Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/ldap.rst)
diff --git a/docs/ISSUE_TRIAGE.md b/docs/ISSUE_TRIAGE.md
index b2000072..43737819 100644
--- a/docs/ISSUE_TRIAGE.md
+++ b/docs/ISSUE_TRIAGE.md
@@ -44,7 +44,7 @@ Should explain what happened, what was expected and how to reproduce it together
  - Ansible Version: [e.g. 2.15]
  - Python Version [e.g. 3.11]
  - Ansible modules for Dell PowerScale Version: [e.g. 2.5.0]
- - PowerScale SDK version: [e.g. isilon-sdk]
+ - PowerScale SDK version: [e.g. 0.3.0.1]
  - Any other additional information...
 
 #### Feature requests

From f4e484fb0b827741aa8d2cb1b812755744a5a885 Mon Sep 17 00:00:00 2001
From: felix Stephen <felix_s@dell.com>
Date: Tue, 27 Feb 2024 15:08:37 +0530
Subject: [PATCH 10/10] updated README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 84a5bd28..3a90c3e7 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ This table provides information about the software prerequisites for the Ansible
 
 | **Ansible Modules** | **OneFS Version** | **Python version** | **Python SDK version** | **Ansible**              |
 |---------------------|-----------------------|--------------------|----------------------------|--------------------------|
-| v2.5.0 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 0.3.0.1 <br> 0.3.0.1 <br> 0.3.0.1 | 2.14 <br> 2.15 <br> 2.16 |
+| v2.5.0 | 9.3.x <br> 9.4.x <br> 9.5.x | 3.9 <br> 3.10 <br> 3.11 | 0.3.0.1 | 2.14 <br> 2.15 <br> 2.16 |
 
 # List of Ansible modules for Dell PowerScale
   * [File System Module](https://github.com/dell/ansible-powerscale/blob/2.5.0/docs/modules/filesystem.rst)