From b6dc17afede93878515a071d6f3293a71b3002bf Mon Sep 17 00:00:00 2001
From: Pradeepsingh Bhati <pradeep.bhati@nutanix.com>
Date: Thu, 9 Nov 2023 23:23:28 +0530
Subject: [PATCH] Release/1.9.1 (#428)

* example fix (#420)

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* Add cluster URL to response only when there is cluster creation (#402)

* Create cluster url when it is required

* Minor fix

* fiql string in filtering (#423)

* fiql string in filtering

* fix

* Add Tests

* example for filter string

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>
Co-authored-by: Alaa Bishtawi <alaa.bishtawi@nutanix.com>

* Bug/issue#383 (#411)

* Fix Jekyll Build

* fix

* Fix #391 and #418 (#419)

* Create cluster url when it is required

* Minor fix

* Change api url for fetching time machine using name to get complete info same as uuid

* Add attribute in clone modules in ndb for creation or refresh using latestSnapshot

* Minor typo fix

* Minor typo fix

* functionality to update owner of vms (#412)

* functionality to update owner of vm

* sanity fix

* add test

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>
Co-authored-by: Alaa Bishtawi <alaa.bishtawi@nutanix.com>

* example for vms inventory (#410)

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* fix for custom filter and examples (#417)

* fix for custom filter and examples

* black fix

* sanity fix

* Add test

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>
Co-authored-by: Alaa Bishtawi <alaa.bishtawi@nutanix.com>

* example for vms inventory  (#426)

* example for vms inventory

* ansible cfg

* Move cfg to inventory example folder

* Minor name changes

* Minor fix

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>
Co-authored-by: Pradeepsingh Bhati <pradeep.bhati@nutanix.com>

* Add support for PC Categories (#405)

Co-authored-by: Gianluca Salvo <gianluca.salvo@gruppomol.it>

* Bug/issue#400 (#403)

* fix issue #400

* fix issue #400

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* example for VMs with guest customization file which injects variables from the playbook (#396)

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* Fix: Syntax Errors in Create App Security Rule Ex (#394)

* functionality to handle issue when size of new disk is absent (#393)

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* example fix (#392)

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* sanity fix

* fix for issue#360 (#408)

* fix for issue#360

* fix

---------

Co-authored-by: Gevorg-Khachatryaan <Gevorg1050.1>

* improve clone examples (#407)

* imporve clone examples

* Fix Examples

* sanity fix

* disbale tests

* Enhance Acp Tests

* fix disks issue when size gb is not given for clone image disks

* Set release version 1.9.1

* enable image tests

* enable foundation sanity test

* Minor foundation test fix

* Enable pc tests

* Enable karbon and foundation sanity

* disables tests

* enables tests

* enable pc tests

* add tests for clones with latest snapshot. And enable clones and NDB database sanity tests

* skip protection rules tests

* Add random naming for acp test with user reference

* Bug/191 fix database sanity test (#430)

* Revert "Bug/issue#383 (#411)"

This reverts commit d1a0016b2954d0f7e89834bccb5de5eb8c392116.

* Fix Properties map

* Skip jelkyll check on database sanity test build issue

---------

Co-authored-by: Pradeepsingh Bhati <pradeep.bhati@nutanix.com>

* fix ntnx_database_sanity

* Add Contributaiong (#431)

* Add Contributaiong

* enhance contributaion

* fix readme

* Add comments to sample var files for simplicity

* Minor typo

---------

Co-authored-by: Pradeepsingh Bhati <pradeep.bhati@nutanix.com>

* Release Notes and changelog changes

* Minor typo fix

* remove unrequired file

* Minor release bug list change due to non cherry picks

---------

Co-authored-by: Gevorg Khachatryan <gevorg.khachatryan@nutanix.com>
Co-authored-by: Alaa Bishtawi <alaa.bishtawi@nutanix.com>
Co-authored-by: Gianluca Salvo <Gianlu@users.noreply.github.com>
Co-authored-by: Gianluca Salvo <gianluca.salvo@gruppomol.it>
Co-authored-by: Nathaniel Roberts <107402519+Nathaniel-Roberts@users.noreply.github.com>
---
 CHANGELOG.md                                  |  28 +++
 CHANGELOG.rst                                 |  27 +++
 README.md                                     |  58 ++++++
 changelogs/changelog.yaml                     |  31 +++
 examples/clusters_info.yml                    |   8 +
 examples/fip_info.yml                         |   9 +
 examples/hosts_info.yml                       |   8 +
 examples/inventory/ansible.cfg                |   7 +
 examples/inventory/nutanix.yaml               |  13 ++
 examples/ndb/create_clone.yml                 | 121 ++++++++++++
 examples/ndb/refresh_clone.yml                |  40 ++++
 examples/subnet_info.yml                      |   9 +
 examples/vm.yml                               |  15 +-
 examples/vm_info.yml                          |  17 +-
 examples/vm_operations.yml                    |   3 +-
 galaxy.yml                                    |   2 +-
 plugins/doc_fragments/ntnx_info.py            |   8 +-
 plugins/doc_fragments/ntnx_vms_base.py        |  15 ++
 plugins/inventory/ntnx_prism_vm_inventory.py  |   5 +
 plugins/module_utils/base_info_module.py      |   9 +
 plugins/module_utils/entity.py                |  21 +-
 plugins/module_utils/ndb/database_clones.py   |   8 +-
 plugins/module_utils/ndb/time_machines.py     |   7 +-
 plugins/module_utils/prism/spec/vms.py        |   3 +
 plugins/module_utils/prism/vms.py             |  41 +++-
 plugins/modules/ntnx_foundation.py            |   4 +-
 plugins/modules/ntnx_images_info.py           |   2 +-
 .../ntnx_ndb_database_clone_refresh.py        |  16 +-
 plugins/modules/ntnx_ndb_database_clones.py   |   7 +-
 .../modules/ntnx_ndb_time_machines_info.py    |   2 +-
 plugins/modules/ntnx_security_rules.py        |  36 ++--
 plugins/modules/ntnx_vms_clone.py             |   4 +-
 .../targets/ntnx_acps/tasks/create_acps.yml   |  32 ++-
 .../targets/ntnx_acps/tasks/delete_acp.yml    |   9 +-
 .../targets/ntnx_acps_info/aliases            |   1 -
 .../targets/ntnx_address_groups/aliases       |   1 -
 .../targets/ntnx_address_groups_info/aliases  |   1 -
 .../targets/ntnx_categories/aliases           |   1 -
 .../targets/ntnx_categories_info/aliases      |   1 -
 .../targets/ntnx_clusters_info/aliases        |   1 -
 .../tasks/image_nodes.yml                     |  37 ++++
 .../targets/ntnx_hosts_info/aliases           |   1 -
 .../aliases                                   |   1 -
 .../ntnx_image_placement_policy/aliases       |   1 -
 tests/integration/targets/ntnx_images/aliases |   1 -
 .../targets/ntnx_images_info/aliases          |   1 -
 .../targets/ntnx_karbon_registries/aliases    |   2 +-
 .../ntnx_karbon_registries_info/aliases       |   2 +-
 .../ntnx_ndb_availability_databases/aliases   |   1 -
 .../targets/ntnx_ndb_clones_info/aliases      |   3 +-
 .../targets/ntnx_ndb_clusters/aliases         |   2 +-
 .../targets/ntnx_ndb_database_clones/aliases  |   1 -
 .../ntnx_ndb_database_clones/tasks/clones.yml | 112 +++++++++--
 .../ntnx_ndb_databases_actions/aliases        |   4 +-
 .../targets/ntnx_ndb_databases_sanity/aliases |   2 -
 .../ntnx_ndb_databases_sanity/tasks/tests.yml |  10 +-
 .../aliases                                   |   4 +-
 .../aliases                                   |   4 +-
 .../targets/ntnx_ndb_db_server_vms/aliases    |   4 +-
 .../ntnx_ndb_maintenance_windows/aliases      |   3 +-
 .../targets/ntnx_ndb_profiles/aliases         |   2 +-
 .../targets/ntnx_ndb_profiles_info/aliases    |   2 +-
 .../integration/targets/ntnx_ndb_slas/aliases |   4 +-
 .../targets/ntnx_ndb_snapshots_info/aliases   |   4 +-
 .../ntnx_ndb_software_profiles/aliases        |   2 +-
 .../integration/targets/ntnx_ndb_tags/aliases |   1 +
 .../ntnx_ndb_time_machines_info/aliases       |   2 +-
 .../aliases                                   |   4 +-
 .../targets/ntnx_ndb_vlans/aliases            |   4 +-
 tests/integration/targets/ntnx_ova/aliases    |   1 -
 .../targets/ntnx_permissions_info/aliases     |   1 -
 .../integration/targets/ntnx_projects/aliases |   1 -
 .../targets/ntnx_projects_info/aliases        |   1 -
 .../ntnx_recovery_plans_and_jobs/aliases      |   2 +-
 .../ntnx_recovery_plans_and_jobs_info/aliases |   2 +-
 tests/integration/targets/ntnx_roles/aliases  |   1 -
 .../targets/ntnx_roles_info/aliases           |   1 -
 .../targets/ntnx_security_rules/aliases       |   1 -
 .../targets/ntnx_security_rules_info/aliases  |   1 -
 .../targets/ntnx_service_groups/aliases       |   1 -
 .../targets/ntnx_service_groups_info/aliases  |   1 -
 .../targets/ntnx_static_routes/aliases        |   1 -
 .../targets/ntnx_static_routes_info/aliases   |   1 -
 .../targets/ntnx_user_groups/aliases          |   1 -
 tests/integration/targets/ntnx_users/aliases  |   1 -
 .../targets/ntnx_users_info/aliases           |   1 -
 .../targets/ntnx_vms_clone/aliases            |   1 -
 .../targets/nutanix_floating_ips/aliases      |   1 -
 .../targets/nutanix_floating_ips_info/aliases |   1 -
 .../integration/targets/nutanix_pbrs/aliases  |   1 -
 .../targets/nutanix_pbrs_info/aliases         |   1 -
 .../targets/nutanix_subnets/aliases           |   1 -
 .../targets/nutanix_subnets_info/aliases      |   1 -
 .../tasks/list_subnets.yml                    |  15 ++
 tests/integration/targets/nutanix_vms/aliases |   1 -
 .../targets/nutanix_vms/tasks/create.yml      |  35 ++++
 .../nutanix_vms/tasks/negtaive_scenarios.yml  |  30 +++
 .../targets/nutanix_vms/tasks/vm_update.yml   |  22 +++
 .../targets/nutanix_vms_info/aliases          |   1 -
 .../nutanix_vms_info/tasks/list_vms.yml       |  48 +++++
 .../integration/targets/nutanix_vpcs/aliases  |   1 -
 .../targets/nutanix_vpcs_info/aliases         |   1 -
 .../targets/prepare_env/vars/main.yml         | 145 ++++++++++++++
 .../prepare_foundation_env/vars/main.yml      |  95 +++++++++
 .../targets/prepare_ndb_env/vars/main.yml     | 184 ++++++++++++++++++
 105 files changed, 1308 insertions(+), 148 deletions(-)
 create mode 100644 examples/inventory/ansible.cfg
 create mode 100644 examples/inventory/nutanix.yaml
 create mode 100644 examples/ndb/create_clone.yml
 create mode 100644 examples/ndb/refresh_clone.yml
 create mode 100644 tests/integration/targets/prepare_foundation_env/vars/main.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e00212444..61def8c5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## v1.9.1 (09 November 2023)
+
+
+**Improvements:**
+
+- docs - [Imprv] add doc regarding running integration tests locally [[\#435](https://github.com/nutanix/nutanix.ansible/issues/435)]
+- info modules - [Imprv] add examples for custom_filter  [[\#416](https://github.com/nutanix/nutanix.ansible/issues/416)]
+- ndb clones - [Imprv] Enable database clones and clone refresh using latest snapshot flag [[\#391](https://github.com/nutanix/nutanix.ansible/issues/391)]
+- ndb clones - [Imprv] add examples for NDB database clone under examples folder [[\#386](https://github.com/nutanix/nutanix.ansible/issues/386)]
+- ntnx_prism_vm_inventory - Add support for PC Categories [[\#405](https://github.com/nutanix/nutanix.ansible/issues/405)]
+- ntnx_prism_vm_inventory - [Imprv] add examples for dynamic inventory using ntnx_prism_vm_inventory  [[\#401](https://github.com/nutanix/nutanix.ansible/issues/401)]
+- ntnx_vms - [Imprv] add possibility to specify / modify vm user ownership and project [[\#378](https://github.com/nutanix/nutanix.ansible/issues/378)]
+- ntnx_vms - owner association upon vm creation module [[\#359](https://github.com/nutanix/nutanix.ansible/issues/359)]
+- ntnx_vms_info - [Imprv] add examples with guest customization for module ntnx_vms [[\#395](https://github.com/nutanix/nutanix.ansible/issues/395)]
+
+**Bugs:**
+
+- ntnx_foundation - [Bug] Error when Clusters Block is missing in module ntnx_foundation [[\#397](https://github.com/nutanix/nutanix.ansible/issues/397)]
+- ntnx_ndb_time_machines_info - [Bug] ntnx_ndb_time_machines_info not fetching all attributes when name is used for fetching [[\#418](https://github.com/nutanix/nutanix.ansible/issues/418)]
+- ntnx_security_rules - Fix Syntax Errors in Create App Security Rule Example [[\#394](https://github.com/nutanix/nutanix.ansible/pull/394/files)]
+- ntnx_vms - [Bug] Error when updating size_gb using the int filter in module ntnx_vms [[\#400](https://github.com/nutanix/nutanix.ansible/issues/400)]
+- ntnx_vms - [Bug] hard_poweroff has been moved to state from operation [[\#415](https://github.com/nutanix/nutanix.ansible/issues/415)]
+- ntnx_vms_clone - [Bug] cannot change boot_config when cloning in module ntnx_vms_clone [[\#360](https://github.com/nutanix/nutanix.ansible/issues/359)]
+- website - [Bug] Github page deployment action is failing. [[\#483](https://github.com/nutanix/nutanix.ansible/issues/483)]
+
+**Full Changelog:** [here](https://github.com/nutanix/nutanix.ansible/compare/v1.9.0...v1.9.1)
+
 ## v1.9.0 (11 July 2023)
 
 
@@ -19,6 +46,7 @@
 - ntnx_karbon_clusters_node_pools - Create,Update and Delete worker node pools with the provided configuration.
 - ntnx_ndb_tags_info - info module for ndb tags info
 
+**Full Changelog:** [here](https://github.com/nutanix/nutanix.ansible/compare/v1.8.0...v1.9.0)
 
 
 ## v1.8.0 (28 Feb 2023)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c6d112a4b..90345a08d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,33 @@ Nutanix.Ncp Release Notes
 .. contents:: Topics
 
 
+v1.9.1
+======
+
+Minor Changes
+-------------
+
+- docs - [Imprv] add doc regarding running integration tests locally [[\#435](https://github.com/nutanix/nutanix.ansible/issues/435)]
+- info modules - [Imprv] add examples for custom_filter  [[\#416](https://github.com/nutanix/nutanix.ansible/issues/416)]
+- ndb clones - [Imprv] Enable database clones and clone refresh using latest snapshot flag [[\#391](https://github.com/nutanix/nutanix.ansible/issues/391)]
+- ndb clones - [Imprv] add examples for NDB database clone under examples folder [[\#386](https://github.com/nutanix/nutanix.ansible/issues/386)]
+- ntnx_prism_vm_inventory - Add support for PC Categories [[\#405](https://github.com/nutanix/nutanix.ansible/issues/405)]
+- ntnx_prism_vm_inventory - [Imprv] add examples for dynamic inventory using ntnx_prism_vm_inventory  [[\#401](https://github.com/nutanix/nutanix.ansible/issues/401)]
+- ntnx_vms - [Imprv] add possibility to specify / modify vm user ownership and project [[\#378](https://github.com/nutanix/nutanix.ansible/issues/378)]
+- ntnx_vms - owner association upon vm creation module [[\#359](https://github.com/nutanix/nutanix.ansible/issues/359)]
+- ntnx_vms_info - [Imprv] add examples with guest customization for module ntnx_vms [[\#395](https://github.com/nutanix/nutanix.ansible/issues/395)]
+
+Bugfixes
+--------
+
+- ntnx_foundation - [Bug] Error when Clusters Block is missing in module ntnx_foundation [[\#397](https://github.com/nutanix/nutanix.ansible/issues/397)]
+- ntnx_ndb_time_machines_info - [Bug] ntnx_ndb_time_machines_info not fetching all attributes when name is used for fetching [[\#418](https://github.com/nutanix/nutanix.ansible/issues/418)]
+- ntnx_security_rules - Fix Syntax Errors in Create App Security Rule Example [[\#394](https://github.com/nutanix/nutanix.ansible/pull/394/files)]
+- ntnx_vms - [Bug] Error when updating size_gb using the int filter in module ntnx_vms [[\#400](https://github.com/nutanix/nutanix.ansible/issues/400)]
+- ntnx_vms - [Bug] hard_poweroff has been moved to state from operation [[\#415](https://github.com/nutanix/nutanix.ansible/issues/415)]
+- ntnx_vms_clone - [Bug] cannot change boot_config when cloning in module ntnx_vms_clone [[\#360](https://github.com/nutanix/nutanix.ansible/issues/359)]
+- website - [Bug] Github page deployment action is failing. [[\#483](https://github.com/nutanix/nutanix.ansible/issues/483)]
+
 v1.9.0
 ======
 
diff --git a/README.md b/README.md
index 3e59c706a..999354992 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@ This collection requires Python 2.7 or greater
 
 > For the 1.9.0 release of the ansible plugin it will have N-1 compatibility with the Prism Central APIs. This release was tested against Prism Central version pc.2023.1 and pc.2023.1.0.1 .
 
+> For the 1.9.1 release of the ansible plugin it will have N-1 compatibility with the Prism Central APIs. This release was tested against Prism Central version pc.2023.3 and pc.2023.1.0.2 .
+
 ### Notes:
 1. Static routes module (ntnx_static_routes) is supported for PC versions >= pc.2022.1
 
@@ -55,6 +57,8 @@ Prism Central based examples: https://github.com/nutanix/nutanix.ansible/tree/ma
 ## Foundation
 > For the 1.1.0 release of the ansible plugin, it will have N-1 compatibility with the Foundation. This release was tested against Foundation versions v5.2 and v5.1.1
 
+> For the 1.9.1 release of the ansible plugin, it was tested against NDB versions v2.5.2
+
 Foundation based examples : https://github.com/nutanix/nutanix.ansible/tree/main/examples/foundation
 
 ## Foundation Central
@@ -67,6 +71,8 @@ Foundation Central based examples : https://github.com/nutanix/nutanix.ansible/t
 
 > For the 1.9.0 release of the ansible plugin, it was tested against Karbon versions v2.6.0, v2.7.0 and v2.8.0 
 
+> For the 1.9.1 release of the ansible plugin, it was tested against Karbon version v2.8.0 
+
 Karbon based examples : https://github.com/nutanix/nutanix.ansible/tree/main/examples/karbon
 
 ## Nutanix Database Service (ERA)
@@ -75,6 +81,8 @@ Karbon based examples : https://github.com/nutanix/nutanix.ansible/tree/main/exa
 
 > For the 1.9.0 release of the ansible plugin, it was tested against NDB versions v2.5.0.2
 
+> For the 1.9.1 release of the ansible plugin, it was tested against NDB versions v2.5.1.1
+
 NDB based examples : https://github.com/nutanix/nutanix.ansible/tree/main/examples/ndb
 
 ### Notes:
@@ -260,6 +268,56 @@ We glady welcome contributions from the community. From updating the documentati
 * [Contributing Guide](CONTRIBUTING.md)
 * [Code of Conduct](CODE_OF_CONDUCT.md)
 
+# Testing
+
+## Integration Testing for Nutanix Ansible Modules
+
+To conduct integration tests for a specific Ansible module such as the `ntnx_vms` module, the following step-by-step procedures can be followed:
+
+### Prerequisites
+- Ensure you are in the installed collection directory where the module is located. For example: 
+`/Users/mac.user1/.ansible/collections/ansible_collections/nutanix/ncp`
+
+### Setting up Variables
+1. Navigate to the `tests/integration/targets` directory within the collection.
+
+2. Define the necessary variables within the feature-specific var files, such as `tests/integration/targets/prepare_env/vars/main.yml`, `tests/integration/targets/prepare_foundation_env/vars/main.yml`,`tests/integration/targets/prepare_ndb_env/tasks/prepare_env.yml`, etc. 
+
+Note: For Karbon and FC tests, use the PC vars exclusively, as these features rely on pc setup. Not all variables are mandatory; define only the required variables for the particular feature to be tested.
+
+3. Run the test setup playbook for the specific feature you intend to test to create entities in setup:
+    - For PC, NDB, and Foundation tests, execute the relevant commands:
+      ```bash
+      ansible-playbook prepare_env/tasks/prepare_env.yml
+      ansible-playbook prepare_ndb_env/tasks/prepare_env.yml
+      ansible-playbook prepare_foundation_env/tasks/prepare_foundation_env.yml
+      ```
+
+### Running Integration Tests
+1. Conduct integration tests for all modules using:
+    ```bash
+    ansible-test integration
+    ```
+
+2. To perform integration tests for a specific module:
+    ```bash
+    ansible-test integration module_test_name
+    ```
+    Replace `module_test_name` with test directory name under tests/integration/targets.
+
+### Cleanup
+1. After completing the integration tests, perform a cleanup specific to the tested feature:
+    - For PC tests, execute the command:
+      ```bash
+      ansible-playbook prepare_env/tasks/clean_up.yml
+      ```
+    - For Foundation tests, execute the command:
+      ```bash
+      ansible-playbook prepare_foundation_env/tasks/clean_up.yml
+      ```
+
+By following these steps, you can perform comprehensive integration testing for the specified Ansible module and ensure a clean testing environment afterward. Define only the necessary variables for the specific feature you intend to test.
+
 # Examples
 ## Playbook for IaaS provisioning on Nutanix
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 628bfed57..8b6e643af 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -417,3 +417,34 @@ releases:
       name: ntnx_ndb_tags_info
       namespace: ''
     release_date: '2023-07-11'
+  1.9.1:
+    changes:
+      bugfixes:
+      - ntnx_foundation - [Bug] Error when Clusters Block is missing in module ntnx_foundation
+        [[\#397](https://github.com/nutanix/nutanix.ansible/issues/397)]
+      - ntnx_ndb_time_machines_info - [Bug] ntnx_ndb_time_machines_info not fetching
+        all attributes when name is used for fetching [[\#418](https://github.com/nutanix/nutanix.ansible/issues/418)]
+      - ntnx_security_rules - Fix Syntax Errors in Create App Security Rule Example
+        [[\#394](https://github.com/nutanix/nutanix.ansible/pull/394/files)]
+      - ntnx_vms - [Bug] Error when updating size_gb using the int filter in module
+        ntnx_vms [[\#400](https://github.com/nutanix/nutanix.ansible/issues/400)]
+      - ntnx_vms - [Bug] hard_poweroff has been moved to state from operation [[\#415](https://github.com/nutanix/nutanix.ansible/issues/415)]
+      - ntnx_vms_clone - [Bug] cannot change boot_config when cloning in module ntnx_vms_clone
+        [[\#360](https://github.com/nutanix/nutanix.ansible/issues/359)]
+      - website - [Bug] Github page deployment action is failing. [[\#483](https://github.com/nutanix/nutanix.ansible/issues/483)]
+      minor_changes:
+      - docs - [Imprv] add doc regarding running integration tests locally [[\#435](https://github.com/nutanix/nutanix.ansible/issues/435)]
+      - info modules - [Imprv] add examples for custom_filter  [[\#416](https://github.com/nutanix/nutanix.ansible/issues/416)]
+      - ndb clones - [Imprv] Enable database clones and clone refresh using latest
+        snapshot flag [[\#391](https://github.com/nutanix/nutanix.ansible/issues/391)]
+      - ndb clones - [Imprv] add examples for NDB database clone under examples folder
+        [[\#386](https://github.com/nutanix/nutanix.ansible/issues/386)]
+      - ntnx_prism_vm_inventory - Add support for PC Categories [[\#405](https://github.com/nutanix/nutanix.ansible/issues/405)]
+      - ntnx_prism_vm_inventory - [Imprv] add examples for dynamic inventory using
+        ntnx_prism_vm_inventory  [[\#401](https://github.com/nutanix/nutanix.ansible/issues/401)]
+      - ntnx_vms - [Imprv] add possibility to specify / modify vm user ownership and
+        project [[\#378](https://github.com/nutanix/nutanix.ansible/issues/378)]
+      - ntnx_vms - owner association upon vm creation module [[\#359](https://github.com/nutanix/nutanix.ansible/issues/359)]
+      - ntnx_vms_info - [Imprv] add examples with guest customization for module ntnx_vms
+        [[\#395](https://github.com/nutanix/nutanix.ansible/issues/395)]
+    release_date: '2023-10-09'
diff --git a/examples/clusters_info.yml b/examples/clusters_info.yml
index 12c0ec7c2..7eab579f3 100644
--- a/examples/clusters_info.yml
+++ b/examples/clusters_info.yml
@@ -28,3 +28,11 @@
       sort_order: "ASCENDING"
       sort_attribute: "name"
     register: result
+
+  - name: List clusters using filter and custom_filter
+    ntnx_clusters_info:
+      filter:
+        name: <name>
+      custom_filter:
+        external_ip: <external_ip>
+    register: result
diff --git a/examples/fip_info.yml b/examples/fip_info.yml
index ac17a5231..804e9ebd4 100644
--- a/examples/fip_info.yml
+++ b/examples/fip_info.yml
@@ -29,3 +29,12 @@
         offset: 0
       register: result
       ignore_errors: True
+
+
+    - name: List floating_ips using filter and custom_filter
+      ntnx_floating_ips_info:
+        filter:
+          name: <name>
+        custom_filter:
+          private_ip: <private_ip>
+      register: result
diff --git a/examples/hosts_info.yml b/examples/hosts_info.yml
index ea7483968..1984cc41c 100644
--- a/examples/hosts_info.yml
+++ b/examples/hosts_info.yml
@@ -29,3 +29,11 @@
       sort_attribute: "name"
     register: result
     ignore_errors: True
+
+  - name: List hosts using filter and custom_filter
+    ntnx_hosts_info:
+      filter:
+        name: <name>
+      custom_filter:
+        serial_number: <serial_number>
+    register: result
diff --git a/examples/inventory/ansible.cfg b/examples/inventory/ansible.cfg
new file mode 100644
index 000000000..7c5781ba3
--- /dev/null
+++ b/examples/inventory/ansible.cfg
@@ -0,0 +1,7 @@
+[defaults]
+inventory = nutanix.yaml
+
+[inventory]
+enable_plugins = nutanix.ncp.ntnx_prism_vm_inventory
+
+
diff --git a/examples/inventory/nutanix.yaml b/examples/inventory/nutanix.yaml
new file mode 100644
index 000000000..b38ba655e
--- /dev/null
+++ b/examples/inventory/nutanix.yaml
@@ -0,0 +1,13 @@
+plugin: nutanix.ncp.ntnx_prism_vm_inventory
+nutanix_hostname: <pc_ip>
+nutanix_username: <username>
+nutanix_password: <password>
+validate_certs: false
+data: {"offset": 0, "length": 1000}
+groups:
+  group_1: "'<name_prefix>' in name"
+  group_2: "'<vm_name>'==name"
+keyed_groups:
+  - prefix: "host"
+    separator: ':'
+    key: "ansible_host"
\ No newline at end of file
diff --git a/examples/ndb/create_clone.yml b/examples/ndb/create_clone.yml
new file mode 100644
index 000000000..d2533e4f7
--- /dev/null
+++ b/examples/ndb/create_clone.yml
@@ -0,0 +1,121 @@
+---
+- name: Create clone
+  hosts: localhost
+  gather_facts: false
+  collections:
+    - nutanix.ncp
+  module_defaults:
+    group/nutanix.ncp.ntnx:
+      nutanix_host: <ndb-era-ip>
+      nutanix_username: <username>
+      nutanix_password: <password>
+      validate_certs: false
+
+  tasks:
+    - set_fact:
+        clone_db:
+          name: <Clone Db Name>
+        db_params_profile:
+          name: <Db Profile Name>
+        vm:
+          name: <Vm Name>
+          password: <Vm password>
+        cluster:
+          name: <Cluster Name>
+        network_profile:
+          name: <Network Profile Name>
+        compute_profile:
+          name: <Compute Profile Name>
+        public_ssh_key: <Public SSH Key>
+        time_machine:
+          name: <Time Machine Name>
+        snapshot:
+          uuid: <Snapshot UUID>
+
+    - name: create clone using snapshot
+      ntnx_ndb_database_clones:
+        name: "{{clone_db.name}}"
+        desc: "ansible-created-clone"
+
+        db_params_profile:
+          name: "{{db_params_profile.name}}"
+
+        db_vm:
+          create_new_server:
+            name: "{{ vm.name }}"
+            desc: "vm for db server"
+            password: "{{ vm.password }}"
+            cluster:
+              name: "{{cluster.name}}"
+            network_profile:
+              name: "{{ network_profile.name }}"
+            compute_profile:
+              name: "{{ compute_profile.name }}"
+            pub_ssh_key: "{{ public_ssh_key }}"
+
+        postgres:
+          db_password: "{{vm.password}}"
+
+        time_machine:
+          name: "{{time_machine.name}}"
+          snapshot_uuid: "{{snapshot.uuid}}"
+
+        removal_schedule:
+          days: 2
+          timezone: "Asia/Calcutta"
+          remind_before_in_days: 1
+          delete_database: True
+
+        refresh_schedule:
+          days: 2
+          time: "12:00:00"
+          timezone: "Asia/Calcutta"
+
+      register: output
+
+    - debug:
+        msg: "{{output}}"
+  
+    - name: create clone using point in time
+      ntnx_ndb_database_clones:
+        name: "{{clone_db.name}}"
+        desc: "ansible-created-clone"
+
+        db_params_profile:
+          name: "{{db_params_profile.name}}"
+
+        db_vm:
+          create_new_server:
+            name: "{{ vm.name }}"
+            desc: "vm for db server"
+            password: "{{ vm.password }}"
+            cluster:
+              name: "{{cluster.name}}"
+            network_profile:
+              name: "{{ network_profile.name }}"
+            compute_profile:
+              name: "{{ compute_profile.name }}"
+            pub_ssh_key: "{{ public_ssh_key }}"
+
+        postgres:
+          db_password: "{{vm.password}}"
+
+        time_machine:
+          name: "{{time_machine.name}}"
+          pitr_timestamp: "2023-02-28 12:00:00"
+          timestamp: "Asia/Calcutta"
+
+        removal_schedule:
+          days: 2
+          timezone: "Asia/Calcutta"
+          remind_before_in_days: 1
+          delete_database: True
+
+        refresh_schedule:
+          days: 2
+          time: "12:00:00"
+          timezone: "Asia/Calcutta"
+      register: output
+    
+    - debug:
+        msg: "{{output}}"
diff --git a/examples/ndb/refresh_clone.yml b/examples/ndb/refresh_clone.yml
new file mode 100644
index 000000000..c1230d549
--- /dev/null
+++ b/examples/ndb/refresh_clone.yml
@@ -0,0 +1,40 @@
+---
+- name: Create Refresh clone
+  hosts: localhost
+  gather_facts: false
+  collections:
+    - nutanix.ncp
+  module_defaults:
+    group/nutanix.ncp.ntnx:
+      nutanix_host: <ndb-era-ip>
+      nutanix_username: <username>
+      nutanix_password: <password>
+      validate_certs: false
+
+  tasks:
+    - set_fact:
+        clone_db:
+          uuid: <Clone Db UUID>
+        snapshot:
+          uuid: <Snapshot UUID>
+
+    - name: create spec for refresh clone to a pitr timestamp
+      check_mode: yes
+      ntnx_ndb_database_clone_refresh:
+        uuid: "{{clone_db.uuid}}"
+        pitr_timestamp: "2023-02-04 07:29:36"
+        timezone: "UTC"
+      register: output
+
+    
+    - debug:
+        msg: "{{output}}"
+
+    - name: refresh db clone
+      ntnx_ndb_database_clone_refresh:
+        uuid: "{{clone_db.uuid}}"
+        snapshot_uuid: "{{snapshot.uuid}}"
+      register: output
+
+    - debug:
+        msg: "{{output}}"
diff --git a/examples/subnet_info.yml b/examples/subnet_info.yml
index dd6790857..1d9d93314 100644
--- a/examples/subnet_info.yml
+++ b/examples/subnet_info.yml
@@ -29,3 +29,12 @@
       check_mode: true
       register: result
       ignore_errors: True
+
+    - name: List subnets filter and custom_filter
+      ntnx_subnets_info:
+        filter:
+          name: <name>
+        custom_filter:
+          adapter_type: <adapter_type>
+          vswitch_name: <vswitch_name>
+      register: result
diff --git a/examples/vm.yml b/examples/vm.yml
index ebb7da68d..f88ab7064 100644
--- a/examples/vm.yml
+++ b/examples/vm.yml
@@ -17,6 +17,19 @@
         script_path: ""
         subnet_name: ""
         image_name: ""
+        password: ""
+        fqdn: ""
+
+  - name: Create Cloud-init Script file
+    copy:
+      dest: "cloud_init.yml"
+      content: |
+         #cloud-config
+         chpasswd:
+           list: |
+             root: "{{ password }}"
+             expire: False
+         fqdn: "{{ fqdn }}"
 
   - name: create Vm
     ntnx_vms:
@@ -47,7 +60,7 @@
       memory_gb: 1
       guest_customization:
         type: "cloud_init"
-        script_path: "{{ script_path }}"
+        script_path: "./cloud_init.yml"
         is_overridable: True
     register: output
 
diff --git a/examples/vm_info.yml b/examples/vm_info.yml
index 53e1e01ea..02e362489 100644
--- a/examples/vm_info.yml
+++ b/examples/vm_info.yml
@@ -22,7 +22,13 @@
         kind: vm
       register: result
       ignore_errors: True
-    
+
+    - name: List vms using FIQL filter string
+      ntnx_vms_info:
+        filter_string: "vm_name=={{vm.name}};power_state==off"
+      register: result
+      ignore_errors: True
+
     - name: List vms using length, offset and ascending vm_name sorting 
       ntnx_vms_info:
         length: 10
@@ -31,3 +37,12 @@
         sort_attribute: "vm_name"
       register: result
       ignore_errors: True
+
+    - name: List vms using filter and custom_filter
+      ntnx_vms_info:
+        filter:
+          vm_name: <name>
+        custom_filter:
+          num_sockets: <num_sockets>
+
+      register: result
diff --git a/examples/vm_operations.yml b/examples/vm_operations.yml
index 7c4743734..50a977bae 100644
--- a/examples/vm_operations.yml
+++ b/examples/vm_operations.yml
@@ -20,9 +20,8 @@
         
   - name: hard power off the vm
     ntnx_vms:
-        state: present
+        state: hard_poweroff
         vm_uuid: "{{ vm_uuid }}"
-        operation: hard_poweroff
     register: result
     ignore_errors: true
     
diff --git a/galaxy.yml b/galaxy.yml
index 2ce0b0240..19f7173bf 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: "nutanix"
 name: "ncp"
-version: "1.9.0"
+version: "1.9.1"
 readme: "README.md"
 authors:
   - "Abhishek Chaudhary (@abhimutant)"
diff --git a/plugins/doc_fragments/ntnx_info.py b/plugins/doc_fragments/ntnx_info.py
index bc0be2293..387d503b5 100644
--- a/plugins/doc_fragments/ntnx_info.py
+++ b/plugins/doc_fragments/ntnx_info.py
@@ -31,10 +31,14 @@ class ModuleDocFragment(object):
     type: int
   filter:
     description:
-      - The filter in FIQL syntax used for the results
+      - The filter in key-value syntax used for the results
     type: dict
   custom_filter:
     description:
-      - The filter in FIQL syntax used for the results
+      - The filter in key-value syntax used for the results
     type: dict
+  filter_string:
+    description:
+      - The filter in FIQL syntax used for the results
+    type: str
 """
diff --git a/plugins/doc_fragments/ntnx_vms_base.py b/plugins/doc_fragments/ntnx_vms_base.py
index fed985866..635168013 100644
--- a/plugins/doc_fragments/ntnx_vms_base.py
+++ b/plugins/doc_fragments/ntnx_vms_base.py
@@ -194,4 +194,19 @@ class ModuleDocFragment(object):
           - CDROM
           - DISK
           - NETWORK
+  owner:
+    description: Name or UUID of the owner
+    required: false
+    type: dict
+    suboptions:
+      name:
+        description:
+          - Owner Name
+          - Mutually exclusive with C(uuid)
+        type: str
+      uuid:
+        description:
+          - Owner UUID
+          - Mutually exclusive with C(name)
+        type: str
 """
diff --git a/plugins/inventory/ntnx_prism_vm_inventory.py b/plugins/inventory/ntnx_prism_vm_inventory.py
index 5273275a3..29cc63551 100644
--- a/plugins/inventory/ntnx_prism_vm_inventory.py
+++ b/plugins/inventory/ntnx_prism_vm_inventory.py
@@ -179,6 +179,11 @@ def parse(self, inventory, loader, path, cache=True):
             for key, value in entity["status"]["resources"].items():
                 self.inventory.set_variable(vm_name, key, value)
 
+            if "metadata" in entity and "categories" in entity["metadata"]:
+                self.inventory.set_variable(
+                    vm_name, "ntnx_categories", entity["metadata"]["categories"]
+                )
+
             # Add variables created by the user's Jinja2 expressions to the host
             self._set_composite_vars(
                 self.get_option("compose"),
diff --git a/plugins/module_utils/base_info_module.py b/plugins/module_utils/base_info_module.py
index 14c4f1849..5adefc4ea 100644
--- a/plugins/module_utils/base_info_module.py
+++ b/plugins/module_utils/base_info_module.py
@@ -15,12 +15,21 @@ class BaseInfoModule(BaseModule):
         length=dict(type="int"),
         filter=dict(type="dict"),
         custom_filter=dict(type="dict"),
+        filter_string=dict(type="str"),
     )
 
+    info_args_mutually_exclusive = [
+        ("filter", "filter_string"),
+    ]
+
     def __init__(self, skip_info_args=False, **kwargs):
         self.argument_spec = deepcopy(BaseModule.argument_spec)
         self.argument_spec.pop("state")
         self.argument_spec.pop("wait")
         if not skip_info_args:
             self.argument_spec.update(self.info_argument_spec)
+            info_args_mutually_exclusive = deepcopy(self.info_args_mutually_exclusive)
+            if kwargs.get("mutually_exclusive"):
+                info_args_mutually_exclusive.extend(kwargs["mutually_exclusive"])
+            kwargs["mutually_exclusive"] = info_args_mutually_exclusive
         super(BaseInfoModule, self).__init__(**kwargs)
diff --git a/plugins/module_utils/entity.py b/plugins/module_utils/entity.py
index a1dc79461..735d9d3d5 100644
--- a/plugins/module_utils/entity.py
+++ b/plugins/module_utils/entity.py
@@ -175,6 +175,17 @@ def list(
             timeout=timeout,
         )
         if resp:
+            custom_filters = self.module.params.get("custom_filter")
+
+            if custom_filters:
+                entities_list = self._filter_entities(
+                    resp[self.entity_type], custom_filters
+                )
+                entities_count = len(entities_list)
+
+                resp[self.entity_type] = entities_list
+                resp["metadata"]["length"] = entities_count
+
             return resp
         entities_list = []
         main_length = data.get("length")
@@ -283,10 +294,14 @@ def get_info_spec(self):
             else:
                 spec.pop(key)
 
-        if params.get("filter", {}).get("name") and params.get("kind") == "vm":
-            spec["filter"]["vm_name"] = spec["filter"].pop("name")
+        if params.get("filter"):
+            if params.get("filter", {}).get("name") and params.get("kind") == "vm":
+                spec["filter"]["vm_name"] = spec["filter"].pop("name")
+
+            spec["filter"] = self._parse_filters(params.get("filter", {}))
 
-        spec["filter"] = self._parse_filters(params.get("filter", {}))
+        elif params.get("filter_string"):
+            spec["filter"] = params["filter_string"]
 
         return spec, None
 
diff --git a/plugins/module_utils/ndb/database_clones.py b/plugins/module_utils/ndb/database_clones.py
index 721bfddd0..8493faa80 100644
--- a/plugins/module_utils/ndb/database_clones.py
+++ b/plugins/module_utils/ndb/database_clones.py
@@ -200,10 +200,12 @@ def get_clone_refresh_spec(self):
             payload["snapshotId"] = self.module.params.get("snapshot_uuid")
         elif self.module.params.get("pitr_timestamp"):
             payload["userPitrTimestamp"] = self.module.params.get("pitr_timestamp")
+        elif self.module.params.get("latest_snapshot", False):
+            payload["latestSnapshot"] = True
         else:
             return (
                 None,
-                "snapshot_uuid or pitr_timestamp is required for database clone refresh",
+                "One of snapshot_uuid, pitr_timestamp or latest_snapshot is required for database clone refresh",
             )
 
         payload["timeZone"] = self.module.params.get("timezone")
@@ -237,10 +239,12 @@ def _build_spec_time_machine(self, payload, time_machine):
             payload["snapshotId"] = time_machine.get("snapshot_uuid")
         elif time_machine.get("pitr_timestamp"):
             payload["userPitrTimestamp"] = time_machine.get("pitr_timestamp")
+        elif time_machine.get("latest_snapshot", False):
+            payload["latestSnapshot"] = True
         else:
             return (
                 None,
-                "Required snapshot_uuid or pitr_timestamp for source of db clone",
+                "Required one of snapshot_uuid, pitr_timestamp or latest_snapshot for source of db clone",
             )
 
         payload["timeZone"] = time_machine.get("timezone")
diff --git a/plugins/module_utils/ndb/time_machines.py b/plugins/module_utils/ndb/time_machines.py
index dc54b0dc0..7f78858c7 100644
--- a/plugins/module_utils/ndb/time_machines.py
+++ b/plugins/module_utils/ndb/time_machines.py
@@ -37,8 +37,11 @@ def get_time_machine(self, uuid=None, name=None, query=None):
         if uuid:
             resp = self.read(uuid=uuid, query=query)
         elif name:
-            endpoint = "{0}/{1}".format("name", name)
-            resp = self.read(endpoint=endpoint, query=query)
+            if not query:
+                query = {}
+            query["value_type"] = "name"
+            query["value"] = name
+            resp = self.read(query=query)
             if isinstance(resp, list):
                 if not resp:
                     return None, "Time machine with name {0} not found".format(name)
diff --git a/plugins/module_utils/prism/spec/vms.py b/plugins/module_utils/prism/spec/vms.py
index 760aeb89b..11f66384f 100644
--- a/plugins/module_utils/prism/spec/vms.py
+++ b/plugins/module_utils/prism/spec/vms.py
@@ -50,6 +50,9 @@ class DefaultVMSpec:
         project=dict(
             type="dict", options=entity_by_spec, mutually_exclusive=mutually_exclusive
         ),
+        owner=dict(
+            type="dict", options=entity_by_spec, mutually_exclusive=mutually_exclusive
+        ),
         cluster=dict(
             type="dict", options=entity_by_spec, mutually_exclusive=mutually_exclusive
         ),
diff --git a/plugins/module_utils/prism/vms.py b/plugins/module_utils/prism/vms.py
index a1ca89876..b4522add6 100644
--- a/plugins/module_utils/prism/vms.py
+++ b/plugins/module_utils/prism/vms.py
@@ -17,6 +17,7 @@
 from .projects import Project
 from .spec.categories_mapping import CategoriesMapping
 from .subnets import get_subnet_uuid
+from .users import User
 
 
 class VM(Prism):
@@ -32,6 +33,7 @@ def __init__(self, module):
             "name": self._build_spec_name,
             "desc": self._build_spec_desc,
             "project": self._build_spec_project,
+            "owner": self._build_spec_owner,
             "cluster": self._build_spec_cluster,
             "vcpus": self._build_spec_vcpus,
             "cores_per_vcpu": self._build_spec_cores,
@@ -169,6 +171,14 @@ def _get_default_spec(self):
             }
         )
 
+    def _get_default_boot_config_spec(self):
+        return deepcopy(
+            {
+                "boot_type": "LEGACY",
+                "boot_device_order_list": ["CDROM", "DISK", "NETWORK"],
+            }
+        )
+
     def _get_default_network_spec(self):
         return deepcopy(
             {
@@ -220,11 +230,26 @@ def _build_spec_project(self, payload, param):
         )
         return payload, None
 
+    def _build_spec_owner(self, payload, param):
+        if "name" in param:
+            owner = User(self.module)
+            name = param["name"]
+            uuid = owner.get_uuid(name, key="username")
+            if not uuid:
+                error = "Owner {0} not found.".format(name)
+                return None, error
+
+        elif "uuid" in param:
+            uuid = param["uuid"]
+
+        payload["metadata"].update({"owner_reference": {"uuid": uuid, "kind": "user"}})
+        return payload, None
+
     def _build_spec_cluster(self, payload, param):
         uuid, err = get_cluster_uuid(param, self.module)
         if err:
             return None, err
-        payload["spec"]["cluster_reference"]["uuid"] = uuid
+        payload["spec"]["cluster_reference"] = {"kind": "cluster", "uuid": uuid}
         return payload, None
 
     def _build_spec_vcpus(self, payload, vcpus):
@@ -340,7 +365,12 @@ def _build_spec_disks(self, payload, vdisks):
         return payload, None
 
     def _build_spec_boot_config(self, payload, param):
+        if not payload["spec"]["resources"].get("boot_config"):
+            payload["spec"]["resources"][
+                "boot_config"
+            ] = self._get_default_boot_config_spec()
         boot_config = payload["spec"]["resources"]["boot_config"]
+
         if "LEGACY" == param["boot_type"] and "boot_order" in param:
             boot_config["boot_device_order_list"] = param["boot_order"]
 
@@ -425,14 +455,14 @@ def _generate_disk_spec(
 
         else:
             if vdisk.get("size_gb"):
-                disk_size_bytes = vdisk["size_gb"] * 1024 * 1024 * 1024
+                disk_size_bytes = int(vdisk["size_gb"]) * 1024 * 1024 * 1024
                 if not vdisk.get("uuid") or (
                     "disk_size_bytes" in disk
                     and disk_size_bytes >= disk.get("disk_size_bytes", 0)
                 ):
                     if disk.get("bus") in ["IDE", "SATA"]:
                         self.require_vm_restart = True
-                    disk["disk_size_bytes"] = vdisk["size_gb"] * 1024 * 1024 * 1024
+                    disk["disk_size_bytes"] = disk_size_bytes
                 else:
                     if disk.get("device_properties", {}).get("device_type") == "CDROM":
                         self.module.fail_json(
@@ -456,6 +486,11 @@ def _generate_disk_spec(
                     return None, error
 
                 disk["storage_config"]["storage_container_reference"]["uuid"] = uuid
+                if not vdisk.get("uuid") and not vdisk.get("size_gb"):
+                    self.module.fail_json(
+                        msg="Unsupported operation: Unable to create disk, 'size_gb' is required for using storage container.",
+                        disk=disk,
+                    )
 
             elif vdisk.get("clone_image"):
                 uuid, error = get_image_uuid(vdisk["clone_image"], self.module)
diff --git a/plugins/modules/ntnx_foundation.py b/plugins/modules/ntnx_foundation.py
index 9b2abd41e..f5b7a3d15 100644
--- a/plugins/modules/ntnx_foundation.py
+++ b/plugins/modules/ntnx_foundation.py
@@ -15,7 +15,7 @@
 description: 'Nutanix module to image nodes and optionally create clusters'
 options:
     hypervisor_nameserver:
-        description: to-write
+        description: name server for hypervisors
         type: str
         required: false
     cvm_gateway:
@@ -1244,7 +1244,7 @@ def image_nodes(module, result):
 
     # add cluster urls if any cluster created
     cluster_urls = []
-    if spec["clusters"]:
+    if spec.get("clusters"):
         for cluster in spec["clusters"]:
             cluster_urls.append(
                 {
diff --git a/plugins/modules/ntnx_images_info.py b/plugins/modules/ntnx_images_info.py
index 1f456eb0e..96fbd78f2 100644
--- a/plugins/modules/ntnx_images_info.py
+++ b/plugins/modules/ntnx_images_info.py
@@ -38,7 +38,7 @@
       nutanix_password: "{{ password }}"
       validate_certs: False
       filter:
-        - name: Ubuntu
+        name: Ubuntu
     register: result
 """
 RETURN = r"""
diff --git a/plugins/modules/ntnx_ndb_database_clone_refresh.py b/plugins/modules/ntnx_ndb_database_clone_refresh.py
index 687145e37..e1e488b08 100644
--- a/plugins/modules/ntnx_ndb_database_clone_refresh.py
+++ b/plugins/modules/ntnx_ndb_database_clone_refresh.py
@@ -31,6 +31,10 @@
             - timestamp for point in time database cone refresh
             - format is 'yyyy-mm-dd hh:mm:ss'
         type: str
+      latest_snapshot:
+        description:
+            - write
+        type: bool
 extends_documentation_fragment:
       - nutanix.ncp.ntnx_ndb_base_module
       - nutanix.ncp.ntnx_operations
@@ -301,6 +305,7 @@ def get_module_spec():
         snapshot_uuid=dict(type="str", required=False),
         timezone=dict(type="str", default="Asia/Calcutta", required=False),
         pitr_timestamp=dict(type="str", required=False),
+        latest_snapshot=dict(type="bool", required=False),
     )
     return module_args
 
@@ -340,12 +345,19 @@ def refresh_clone(module, result):
 
 def run_module():
     mutually_exclusive_list = [
-        ("snapshot_uuid", "pitr_timestamp"),
+        ("snapshot_uuid", "pitr_timestamp", "latest_snapshot"),
     ]
     module = NdbBaseModule(
         argument_spec=get_module_spec(),
         supports_check_mode=True,
-        required_if=[("state", "present", ("snapshot_uuid", "pitr_timestamp"), True)],
+        required_if=[
+            (
+                "state",
+                "present",
+                ("snapshot_uuid", "pitr_timestamp", "latest_snapshot"),
+                True,
+            )
+        ],
         mutually_exclusive=mutually_exclusive_list,
     )
     remove_param_with_none_value(module.params)
diff --git a/plugins/modules/ntnx_ndb_database_clones.py b/plugins/modules/ntnx_ndb_database_clones.py
index a6485ee76..d8ada7059 100644
--- a/plugins/modules/ntnx_ndb_database_clones.py
+++ b/plugins/modules/ntnx_ndb_database_clones.py
@@ -169,6 +169,10 @@
                 description:
                     - timestamp for create clone from point in time
                 type: str
+            latest_snapshot:
+                description:
+                    - write
+                type: bool
       postgres:
         description:
             - postgres database related config
@@ -652,6 +656,7 @@ def get_module_spec():
         uuid=dict(type="str", required=False),
         snapshot_uuid=dict(type="str", required=False),
         pitr_timestamp=dict(type="str", required=False),
+        latest_snapshot=dict(type="bool", required=False),
         timezone=dict(type="str", default="Asia/Calcutta", required=False),
     )
 
@@ -700,7 +705,7 @@ def get_module_spec():
         time_machine=dict(
             type="dict",
             options=time_machine,
-            mutually_exclusive=[("snapshot_uuid", "pitr_timestamp")],
+            mutually_exclusive=[("snapshot_uuid", "pitr_timestamp", "latest_snapshot")],
             required=False,
         ),
         postgres=dict(type="dict", options=postgres, required=False),
diff --git a/plugins/modules/ntnx_ndb_time_machines_info.py b/plugins/modules/ntnx_ndb_time_machines_info.py
index f3d9dc861..8fce6fdae 100644
--- a/plugins/modules/ntnx_ndb_time_machines_info.py
+++ b/plugins/modules/ntnx_ndb_time_machines_info.py
@@ -307,7 +307,7 @@ def get_time_machine(module, result):
     resp, err = tm.get_time_machine(uuid=uuid, name=name, query=query_params)
     if err:
         result["error"] = err
-        module.fail_json(msg="Failed fetching sla info", **result)
+        module.fail_json(msg="Failed fetching time machine info", **result)
     result["response"] = resp
 
 
diff --git a/plugins/modules/ntnx_security_rules.py b/plugins/modules/ntnx_security_rules.py
index a6c92e5de..16124e568 100644
--- a/plugins/modules/ntnx_security_rules.py
+++ b/plugins/modules/ntnx_security_rules.py
@@ -879,45 +879,47 @@
 - name: create app security rule
   ntnx_security_rules:
     name: test_app_rule
+    allow_ipv6_traffic: true
+    policy_hitlog: true
     app_rule:
+      policy_mode: MONITOR
       target_group:
         categories:
             apptype: Apache_Spark
         default_internal_policy: DENY_ALL
-      inbound:
+      inbounds:
         - categories:
               AppFamily:
                 - Databases
                 - DevOps
-          icmp:
-            - code: 1
-              type: 1
+          protocol:
+            icmp:
+              - code: 1
+                type: 1
         - categories:
               AppFamily:
                 - Databases
                 - DevOps
-          tcp:
-            - start_port: 22
-              end_port: 80
+          protocol:
+            tcp:
+              - start_port: 22
+                end_port: 80
         - categories:
               AppFamily:
                 - Databases
                 - DevOps
-          udp:
-            - start_port: 82
-              end_port: 8080
+          protocol:
+            udp:
+              - start_port: 82
+                end_port: 8080
+          description: test description
         - ip_subnet:
+            ip: 192.168.1.0
             prefix_length: 24
-            ip: 192.168.1.1
-          description: test description
-          protocol: ALL
-      outbound:
+      outbounds:
         - categories:
               AppFamily:
                 - Databases
-      policy_mode: MONITOR
-    allow_ipv6_traffic: true
-    policy_hitlog:: true
   register: result
 - name: update app security rule with outbound list
   ntnx_security_rules:
diff --git a/plugins/modules/ntnx_vms_clone.py b/plugins/modules/ntnx_vms_clone.py
index dd1d0dc6a..5b4d35a5f 100644
--- a/plugins/modules/ntnx_vms_clone.py
+++ b/plugins/modules/ntnx_vms_clone.py
@@ -285,6 +285,7 @@ def get_module_spec():
 
 def clone_vm(module, result):
     src_vm_uuid = module.params["src_vm_uuid"]
+    result["src_vm_uuid"] = src_vm_uuid
 
     vm = VM(module)
 
@@ -305,7 +306,8 @@ def clone_vm(module, result):
 
     if module.params.get("wait"):
         wait_for_task_completion(module, result)
-        resp = vm.read(src_vm_uuid)
+        vm_uuid = result["response"]["entity_reference_list"][0]["uuid"]
+        resp = vm.read(vm_uuid)
         result["response"] = resp
 
 
diff --git a/tests/integration/targets/ntnx_acps/tasks/create_acps.yml b/tests/integration/targets/ntnx_acps/tasks/create_acps.yml
index ea7478d17..6b22c74c0 100644
--- a/tests/integration/targets/ntnx_acps/tasks/create_acps.yml
+++ b/tests/integration/targets/ntnx_acps/tasks/create_acps.yml
@@ -1,9 +1,21 @@
 ---
+- name: Generate random name
+  set_fact:
+    random_name: "{{query('community.general.random_string',numbers=false, special=false,length=12)}}"
+
+- set_fact:
+    acp1_name: "{{random_name[0]}}1"
+    acp2_name: "{{random_name[0]}}2"
+    acp3_name: "{{random_name[0]}}3"
+    acp4_name: "{{random_name[0]}}4"
+    acp5_name: "{{random_name[0]}}5"
+
+
 - name: Create min ACP
   ntnx_acps:
     state: present
     wait: True
-    name: MinACP2
+    name: "{{acp1_name}}"
     role:
       uuid: "{{ acp.role.uuid }}"
   register: result
@@ -16,15 +28,15 @@
       - result.response is defined
       - result.changed == false
       - result.failed == false
-      - result.response.spec.name == 'MinACP2'
+      - result.response.spec.name == "{{acp1_name}}"
     fail_msg: " Unable to create Min ACP with check mode "
     success_msg: " Min ACP with check mode passed"
-##########################################################
+# ##########################################################
 - name: Create min ACP
   ntnx_acps:
     state: present
     wait: true
-    name: MinACP2
+    name: "{{acp2_name}}"
     role:
       uuid: '{{ acp.role.uuid }}'
   check_mode: false
@@ -36,7 +48,7 @@
     that:
       - result.response is defined
       - result.response.status.state == 'COMPLETE'
-      - result.response.spec.name == 'MinACP2'
+      - result.response.spec.name == "{{acp2_name}}"
     fail_msg: " Unable to create Min ACP "
     success_msg: " Min ACP created successfully "
 
@@ -46,7 +58,7 @@
 - name: Create ACP with user reference
   ntnx_acps:
     state: present
-    name: acp_with_user_reference2
+    name: "{{acp5_name}}"
     role:
       uuid: "{{ acp.role.uuid }}"
     user_uuids:
@@ -59,7 +71,7 @@
     that:
       - result.response is defined
       - result.response.status.state == 'COMPLETE'
-      - result.response.spec.name == 'acp_with_user_reference2'
+      - result.response.spec.name == "{{acp5_name}}"
       - result.response.status.resources.role_reference.uuid == "{{ acp.role.uuid }}"
       - result.response.status.resources.user_reference_list.0.uuid == "{{ acp.user_uuid }}"
     fail_msg: " Unable to Create ACP with user reference "
@@ -71,7 +83,7 @@
 - name: Create ACP with user ad user group reference
   ntnx_acps:
     state: present
-    name: acp_with_user_and_user_group_reference2
+    name: "{{acp3_name}}"
     role:
       uuid: "{{ acp.role.uuid }}"
     user_uuids:
@@ -86,7 +98,7 @@
     that:
       - result.response is defined
       - result.response.status.state == 'COMPLETE'
-      - result.response.spec.name == 'acp_with_user_and_user_group_reference2'
+      - result.response.spec.name == "{{acp3_name}}"
       - result.response.status.resources.role_reference.uuid == "{{ acp.role.uuid }}"
       - result.response.status.resources.user_reference_list.0.uuid == "{{ acp.user_uuid }}"
       - result.response.status.resources.user_group_reference_list.0.uuid == "{{ acp.user_group_uuid }}"
@@ -99,7 +111,7 @@
 - name: Create ACP with all specfactions
   ntnx_acps:
     state: present
-    name: acp_with_all_specfactions1
+    name: "{{acp4_name}}"
     role:
       uuid: "{{ acp.role.uuid }}"
     user_uuids:
diff --git a/tests/integration/targets/ntnx_acps/tasks/delete_acp.yml b/tests/integration/targets/ntnx_acps/tasks/delete_acp.yml
index cb5c3d188..5cbab58cf 100644
--- a/tests/integration/targets/ntnx_acps/tasks/delete_acp.yml
+++ b/tests/integration/targets/ntnx_acps/tasks/delete_acp.yml
@@ -1,8 +1,15 @@
 ---
+- name: Generate random name
+  set_fact:
+    random_name: "{{query('community.general.random_string',numbers=false, special=false,length=12)}}"
+
+- set_fact:
+    acp1_name: "{{random_name[0]}}1"
+
 - name: Create ACP with all specfactions
   ntnx_acps:
     state: present
-    name: acp_with_all_specfactions1
+    name: "{{acp1_name}}"
     role:
       uuid: "{{ acp.role.uuid }}"
     user_uuids:
diff --git a/tests/integration/targets/ntnx_acps_info/aliases b/tests/integration/targets/ntnx_acps_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_acps_info/aliases
+++ b/tests/integration/targets/ntnx_acps_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_address_groups/aliases b/tests/integration/targets/ntnx_address_groups/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_address_groups/aliases
+++ b/tests/integration/targets/ntnx_address_groups/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_address_groups_info/aliases b/tests/integration/targets/ntnx_address_groups_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_address_groups_info/aliases
+++ b/tests/integration/targets/ntnx_address_groups_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_categories/aliases b/tests/integration/targets/ntnx_categories/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_categories/aliases
+++ b/tests/integration/targets/ntnx_categories/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_categories_info/aliases b/tests/integration/targets/ntnx_categories_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_categories_info/aliases
+++ b/tests/integration/targets/ntnx_categories_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_clusters_info/aliases b/tests/integration/targets/ntnx_clusters_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_clusters_info/aliases
+++ b/tests/integration/targets/ntnx_clusters_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_foundation_sanity/tasks/image_nodes.yml b/tests/integration/targets/ntnx_foundation_sanity/tasks/image_nodes.yml
index 49e4b651b..be63b56f2 100644
--- a/tests/integration/targets/ntnx_foundation_sanity/tasks/image_nodes.yml
+++ b/tests/integration/targets/ntnx_foundation_sanity/tasks/image_nodes.yml
@@ -116,6 +116,43 @@
       fail_msg: " Fail : unable to create spec for imaging nodes"
       success_msg: "Succes: spec generated successfully"
 
+  - name: Image nodes without cluster creation
+    ntnx_foundation:
+      timeout: 4500
+      cvm_gateway: "{{cvm_gateway}}"
+      cvm_netmask: "{{cvm_netmask}}"
+      hypervisor_gateway: "{{hypervisor_gateway}}"
+      hypervisor_netmask: "{{hypervisor_netmask}}"
+      default_ipmi_user: "{{default_ipmi_user}}"
+      current_cvm_vlan_tag: "{{nodes.current_cvm_vlan_tag}}"
+      nos_package: "{{images.aos_packages[0]}}"
+      blocks:
+        - block_id: "{{nodes.block_id}}"
+          nodes:
+            - manual_mode:
+                cvm_ip: "{{nodes.node1.cvm_ip}}"
+                cvm_gb_ram: 50
+                hypervisor_hostname: "{{nodes.node1.hypervisor_hostname}}"
+                ipmi_netmask: "{{nodes.node1.ipmi_netmask}}"
+                ipmi_gateway: "{{nodes.node1.ipmi_gateway}}"
+                ipmi_ip: "{{nodes.node1.ipmi_ip}}"
+                ipmi_password: "{{nodes.node1.ipmi_password}}"
+                hypervisor: "{{nodes.node1.hypervisor}}"
+                hypervisor_ip: "{{nodes.node1.hypervisor_ip}}"
+                node_position: "{{nodes.node1.node_position}}"
+    register: result
+    no_log: true
+    ignore_errors: True
+
+  - name: Creation Status
+    assert:
+      that:
+        - result.response is defined
+        - result.failed==false
+        - result.changed==true
+      fail_msg: " Fail : unable to image nodes"
+      success_msg: "Succes: node imaging done successfully"
+
   - name: Image nodes and create cluster out of it
     ntnx_foundation:
       timeout: 4500
diff --git a/tests/integration/targets/ntnx_hosts_info/aliases b/tests/integration/targets/ntnx_hosts_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_hosts_info/aliases
+++ b/tests/integration/targets/ntnx_hosts_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_image_placement_policies_info/aliases b/tests/integration/targets/ntnx_image_placement_policies_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_image_placement_policies_info/aliases
+++ b/tests/integration/targets/ntnx_image_placement_policies_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_image_placement_policy/aliases b/tests/integration/targets/ntnx_image_placement_policy/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_image_placement_policy/aliases
+++ b/tests/integration/targets/ntnx_image_placement_policy/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_images/aliases b/tests/integration/targets/ntnx_images/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_images/aliases
+++ b/tests/integration/targets/ntnx_images/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_images_info/aliases b/tests/integration/targets/ntnx_images_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_images_info/aliases
+++ b/tests/integration/targets/ntnx_images_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_karbon_registries/aliases b/tests/integration/targets/ntnx_karbon_registries/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_karbon_registries/aliases
+++ b/tests/integration/targets/ntnx_karbon_registries/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_karbon_registries_info/aliases b/tests/integration/targets/ntnx_karbon_registries_info/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_karbon_registries_info/aliases
+++ b/tests/integration/targets/ntnx_karbon_registries_info/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_availability_databases/aliases b/tests/integration/targets/ntnx_ndb_availability_databases/aliases
index d10d66c76..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_availability_databases/aliases
+++ b/tests/integration/targets/ntnx_ndb_availability_databases/aliases
@@ -1,2 +1 @@
 disabled
-
diff --git a/tests/integration/targets/ntnx_ndb_clones_info/aliases b/tests/integration/targets/ntnx_ndb_clones_info/aliases
index b29a52bdb..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_clones_info/aliases
+++ b/tests/integration/targets/ntnx_ndb_clones_info/aliases
@@ -1,2 +1 @@
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_clusters/aliases b/tests/integration/targets/ntnx_ndb_clusters/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_clusters/aliases
+++ b/tests/integration/targets/ntnx_ndb_clusters/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_database_clones/aliases b/tests/integration/targets/ntnx_ndb_database_clones/aliases
index 87e7bdaae..e69de29bb 100644
--- a/tests/integration/targets/ntnx_ndb_database_clones/aliases
+++ b/tests/integration/targets/ntnx_ndb_database_clones/aliases
@@ -1 +0,0 @@
-disabled
\ No newline at end of file
diff --git a/tests/integration/targets/ntnx_ndb_database_clones/tasks/clones.yml b/tests/integration/targets/ntnx_ndb_database_clones/tasks/clones.yml
index 899853d9e..b47fcf6c6 100644
--- a/tests/integration/targets/ntnx_ndb_database_clones/tasks/clones.yml
+++ b/tests/integration/targets/ntnx_ndb_database_clones/tasks/clones.yml
@@ -431,7 +431,7 @@
     fail_msg: "schedules update failed"
     success_msg: "schedules removed succefully"
 
-############################################ refresh clone ###########################################
+########################################### refresh clone ###########################################
 
 
 - name: create spec for refresh clone to a pitr timestamp
@@ -472,7 +472,7 @@
     fail_msg: "database refresh failed"
     success_msg: "database refresh completed succefully"
 
-############################################ delete clone tests ###########################################
+########################################### delete clone tests###########################################
 
 
 - name: create soft remove spec
@@ -536,7 +536,7 @@
     fail_msg: "database delete failed"
     success_msg: "database deleted successfully"
 
-############################################ authorize and deauthorize db server vms###########################################
+########################################### authorize and deauthorize db server vms###########################################
 
 
 - name: authorize db server vms
@@ -600,20 +600,8 @@
 ############################################ clone on authorized db server vm ###########################################
 
 
-- name: Get timestamp in secs
-  shell: "date +'%s'"
-  register: timestamp
-
-- set_fact:
-    timestamp: "{{timestamp.stdout|int + 60*60*48|int}}"
-
-- name: Get timestamp in datetime format
-  shell: "date -d @{{timestamp}} '+%Y-%m-%d %H:%M:%S'"
-  register: timestamp
-
 - set_fact:
-    timestamp: "{{timestamp.stdout}}"
-
+    timestamp: "2123-11-08 12:36:15"
 - name: create clone using snapshot on authorized server
   ntnx_ndb_database_clones:
     name: "{{clone_db1}}"
@@ -666,6 +654,98 @@
     fail_msg: "Unable to create clone"
     success_msg: "Database clone created succefully"
 
+- set_fact:
+    delete_clone_uuid: "{{result.uuid}}"
+
+- name: delete clone db
+  ntnx_ndb_database_clones:
+    state: "absent"
+    uuid: "{{delete_clone_uuid}}"
+    delete_from_vm: true
+  register: result
+
+- name: verify status of db clone delete
+  assert: 
+    that:
+      - result.changed == True
+      - result.failed == false
+      - result.response.status == "5"
+    fail_msg: "database delete failed"
+    success_msg: "database deleted successfully"
+
+########################################### create clone from latest snapshot ##################################
+
+- name: authorize again db server vm
+  ntnx_ndb_authorize_db_server_vms:
+    time_machine:
+      name: "{{tm1}}"
+    db_server_vms:
+      - name: "{{vm1_name}}"
+  register: result
+
+
+
+- name: verify status of authorization of db server vms
+  assert: 
+    that:
+      - result.changed == True
+      - result.failed == false
+      - result.response.status == "success"
+    fail_msg: "database authorization with time machine failed"
+    success_msg: "database authorization with time machine successfully"
+
+- name: create clone using latest snapshot on authorized server
+  ntnx_ndb_database_clones:
+    name: "{{clone_db1}}fromLatestSnapshot"
+    desc: "ansible-created-clone from latest snapshot"
+
+    db_params_profile:
+      name: "{{db_params_profile.name}}"
+    
+    db_vm:
+      use_authorized_server:
+        name: "{{ vm1_name }}"
+
+    postgres:
+      db_password: "{{vm_password}}"
+    
+    time_machine:
+      uuid: "{{time_machine_uuid}}"
+      latest_snapshot: True
+    
+    removal_schedule:
+      timestamp: "{{timestamp}}"
+      timezone: "Asia/Calcutta"
+      remind_before_in_days: 1
+      delete_database: True
+    
+    refresh_schedule:
+      days: 2
+      time: "12:00:00"
+      timezone: "Asia/Calcutta"
+
+    tags:
+      ansible-clones: ansible-test-db-clones
+  register: result
+
+
+
+- name: Clone create status on authorized db server vm
+  assert: 
+    that:
+      - result.response is defined
+      - result.changed == True
+      - result.uuid is defined
+      - result.uuid == result.response.id
+      - result.response.status == "READY"
+      - result.response.name == "{{clone_db1}}fromLatestSnapshot"
+      - result.response.description == "ansible-created-clone from latest snapshot"
+      - result.response.clone == True
+      - result.response.databaseNodes[0].dbserverId == db_server_uuid
+      - result.response.parentTimeMachineId ==  time_machine_uuid
+    fail_msg: "Unable to create clone from latest snapshot"
+    success_msg: "Database clone created from latest snapshot successfully"
+
 
 
 - set_fact:
diff --git a/tests/integration/targets/ntnx_ndb_databases_actions/aliases b/tests/integration/targets/ntnx_ndb_databases_actions/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_databases_actions/aliases
+++ b/tests/integration/targets/ntnx_ndb_databases_actions/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_databases_sanity/aliases b/tests/integration/targets/ntnx_ndb_databases_sanity/aliases
index 139597f9c..e69de29bb 100644
--- a/tests/integration/targets/ntnx_ndb_databases_sanity/aliases
+++ b/tests/integration/targets/ntnx_ndb_databases_sanity/aliases
@@ -1,2 +0,0 @@
-
-
diff --git a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml
index 6e8240cf9..fcfbbe519 100644
--- a/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml
+++ b/tests/integration/targets/ntnx_ndb_databases_sanity/tasks/tests.yml
@@ -274,11 +274,19 @@
 - set_fact:
     db_uuid: "{{result.db_uuid}}"
 
+- name: Ensure properties is defined
+  set_fact:
+    properties: {}
+  when: properties is undefined
+
+# skip jekyll/Liquid syntax check
+# 
 - name: create properties map
   set_fact: 
-      properties: "{{ properties | default({}) | combine ({ item['name'] : item['value'] }) }}"
+      properties: "{{ properties | combine ({ item['name'] : item['value'] }) }}"
   loop: "{{result.response.properties}}" 
   no_log: true
+#
 
 - name: Creation Status
   assert: 
diff --git a/tests/integration/targets/ntnx_ndb_databases_single_instance_1/aliases b/tests/integration/targets/ntnx_ndb_databases_single_instance_1/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_databases_single_instance_1/aliases
+++ b/tests/integration/targets/ntnx_ndb_databases_single_instance_1/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_databases_single_instance_2/aliases b/tests/integration/targets/ntnx_ndb_databases_single_instance_2/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_databases_single_instance_2/aliases
+++ b/tests/integration/targets/ntnx_ndb_databases_single_instance_2/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_db_server_vms/aliases b/tests/integration/targets/ntnx_ndb_db_server_vms/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_db_server_vms/aliases
+++ b/tests/integration/targets/ntnx_ndb_db_server_vms/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_maintenance_windows/aliases b/tests/integration/targets/ntnx_ndb_maintenance_windows/aliases
index b29a52bdb..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_maintenance_windows/aliases
+++ b/tests/integration/targets/ntnx_ndb_maintenance_windows/aliases
@@ -1,2 +1 @@
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_profiles/aliases b/tests/integration/targets/ntnx_ndb_profiles/aliases
index 8b1378917..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_profiles/aliases
+++ b/tests/integration/targets/ntnx_ndb_profiles/aliases
@@ -1 +1 @@
-
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_profiles_info/aliases b/tests/integration/targets/ntnx_ndb_profiles_info/aliases
index 8b1378917..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_profiles_info/aliases
+++ b/tests/integration/targets/ntnx_ndb_profiles_info/aliases
@@ -1 +1 @@
-
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_slas/aliases b/tests/integration/targets/ntnx_ndb_slas/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_slas/aliases
+++ b/tests/integration/targets/ntnx_ndb_slas/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_snapshots_info/aliases b/tests/integration/targets/ntnx_ndb_snapshots_info/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_snapshots_info/aliases
+++ b/tests/integration/targets/ntnx_ndb_snapshots_info/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_software_profiles/aliases b/tests/integration/targets/ntnx_ndb_software_profiles/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_software_profiles/aliases
+++ b/tests/integration/targets/ntnx_ndb_software_profiles/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_tags/aliases b/tests/integration/targets/ntnx_ndb_tags/aliases
index e69de29bb..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_tags/aliases
+++ b/tests/integration/targets/ntnx_ndb_tags/aliases
@@ -0,0 +1 @@
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_time_machines_info/aliases b/tests/integration/targets/ntnx_ndb_time_machines_info/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_time_machines_info/aliases
+++ b/tests/integration/targets/ntnx_ndb_time_machines_info/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_time_machines_with_multi_clusters/aliases b/tests/integration/targets/ntnx_ndb_time_machines_with_multi_clusters/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_time_machines_with_multi_clusters/aliases
+++ b/tests/integration/targets/ntnx_ndb_time_machines_with_multi_clusters/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ndb_vlans/aliases b/tests/integration/targets/ntnx_ndb_vlans/aliases
index 2774d8d3a..7a68b11da 100644
--- a/tests/integration/targets/ntnx_ndb_vlans/aliases
+++ b/tests/integration/targets/ntnx_ndb_vlans/aliases
@@ -1,3 +1 @@
-
-
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_ova/aliases b/tests/integration/targets/ntnx_ova/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_ova/aliases
+++ b/tests/integration/targets/ntnx_ova/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_permissions_info/aliases b/tests/integration/targets/ntnx_permissions_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_permissions_info/aliases
+++ b/tests/integration/targets/ntnx_permissions_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_projects/aliases b/tests/integration/targets/ntnx_projects/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_projects/aliases
+++ b/tests/integration/targets/ntnx_projects/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_projects_info/aliases b/tests/integration/targets/ntnx_projects_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_projects_info/aliases
+++ b/tests/integration/targets/ntnx_projects_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_recovery_plans_and_jobs/aliases b/tests/integration/targets/ntnx_recovery_plans_and_jobs/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_recovery_plans_and_jobs/aliases
+++ b/tests/integration/targets/ntnx_recovery_plans_and_jobs/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_recovery_plans_and_jobs_info/aliases b/tests/integration/targets/ntnx_recovery_plans_and_jobs_info/aliases
index 87e7bdaae..7a68b11da 100644
--- a/tests/integration/targets/ntnx_recovery_plans_and_jobs_info/aliases
+++ b/tests/integration/targets/ntnx_recovery_plans_and_jobs_info/aliases
@@ -1 +1 @@
-disabled
\ No newline at end of file
+disabled
diff --git a/tests/integration/targets/ntnx_roles/aliases b/tests/integration/targets/ntnx_roles/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_roles/aliases
+++ b/tests/integration/targets/ntnx_roles/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_roles_info/aliases b/tests/integration/targets/ntnx_roles_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_roles_info/aliases
+++ b/tests/integration/targets/ntnx_roles_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_security_rules/aliases b/tests/integration/targets/ntnx_security_rules/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_security_rules/aliases
+++ b/tests/integration/targets/ntnx_security_rules/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_security_rules_info/aliases b/tests/integration/targets/ntnx_security_rules_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_security_rules_info/aliases
+++ b/tests/integration/targets/ntnx_security_rules_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_service_groups/aliases b/tests/integration/targets/ntnx_service_groups/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_service_groups/aliases
+++ b/tests/integration/targets/ntnx_service_groups/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_service_groups_info/aliases b/tests/integration/targets/ntnx_service_groups_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_service_groups_info/aliases
+++ b/tests/integration/targets/ntnx_service_groups_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_static_routes/aliases b/tests/integration/targets/ntnx_static_routes/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_static_routes/aliases
+++ b/tests/integration/targets/ntnx_static_routes/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_static_routes_info/aliases b/tests/integration/targets/ntnx_static_routes_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_static_routes_info/aliases
+++ b/tests/integration/targets/ntnx_static_routes_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_user_groups/aliases b/tests/integration/targets/ntnx_user_groups/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_user_groups/aliases
+++ b/tests/integration/targets/ntnx_user_groups/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_users/aliases b/tests/integration/targets/ntnx_users/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_users/aliases
+++ b/tests/integration/targets/ntnx_users/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_users_info/aliases b/tests/integration/targets/ntnx_users_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_users_info/aliases
+++ b/tests/integration/targets/ntnx_users_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/ntnx_vms_clone/aliases b/tests/integration/targets/ntnx_vms_clone/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/ntnx_vms_clone/aliases
+++ b/tests/integration/targets/ntnx_vms_clone/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_floating_ips/aliases b/tests/integration/targets/nutanix_floating_ips/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_floating_ips/aliases
+++ b/tests/integration/targets/nutanix_floating_ips/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_floating_ips_info/aliases b/tests/integration/targets/nutanix_floating_ips_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_floating_ips_info/aliases
+++ b/tests/integration/targets/nutanix_floating_ips_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_pbrs/aliases b/tests/integration/targets/nutanix_pbrs/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_pbrs/aliases
+++ b/tests/integration/targets/nutanix_pbrs/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_pbrs_info/aliases b/tests/integration/targets/nutanix_pbrs_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_pbrs_info/aliases
+++ b/tests/integration/targets/nutanix_pbrs_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_subnets/aliases b/tests/integration/targets/nutanix_subnets/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_subnets/aliases
+++ b/tests/integration/targets/nutanix_subnets/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_subnets_info/aliases b/tests/integration/targets/nutanix_subnets_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_subnets_info/aliases
+++ b/tests/integration/targets/nutanix_subnets_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_subnets_info/tasks/list_subnets.yml b/tests/integration/targets/nutanix_subnets_info/tasks/list_subnets.yml
index b6b9890cc..cb7478a72 100644
--- a/tests/integration/targets/nutanix_subnets_info/tasks/list_subnets.yml
+++ b/tests/integration/targets/nutanix_subnets_info/tasks/list_subnets.yml
@@ -42,3 +42,18 @@
     fail_msg: " Unable to list subnets "
     success_msg: " Subnets listed successfully "
 #########################################################
+- name: List subnet using custom_filter
+  ntnx_subnets_info:
+    custom_filter:
+      vswitch_name: br0
+  register: result
+  ignore_errors: True
+
+- name: Listing Status
+  assert:
+    that:
+      - result.response is defined
+      - result.response.entities[0].status.resources.vswitch_name == "br0"
+    fail_msg: " Unable to List subnet using custom_filter "
+    success_msg: "List subnet using custom_filter listed successfully "
+#########################################################
\ No newline at end of file
diff --git a/tests/integration/targets/nutanix_vms/aliases b/tests/integration/targets/nutanix_vms/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_vms/aliases
+++ b/tests/integration/targets/nutanix_vms/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_vms/tasks/create.yml b/tests/integration/targets/nutanix_vms/tasks/create.yml
index f8f43736a..afe4c5d7c 100644
--- a/tests/integration/targets/nutanix_vms/tasks/create.yml
+++ b/tests/integration/targets/nutanix_vms/tasks/create.yml
@@ -39,6 +39,41 @@
       fail_msg: 'Unable to Create VM with none values  '
       success_msg: 'VM with none values created successfully '
 
+  - set_fact:
+      todelete: '{{ todelete + [  result["response"]["metadata"]["uuid"] ] }}'
+# ##################################################################################
+  - name: VM with owner name
+    ntnx_vms:
+      state: present
+      name: none
+      timezone: GMT
+      project:
+        uuid: "{{ project.uuid }}"
+      cluster:
+        name: "{{ cluster.name }}"
+      categories:
+        AppType:
+          - Apache_Spark
+      owner:
+        name: "{{ vm_owner.name }}"
+      disks:
+        - type: DISK
+          size_gb: 5
+          bus: SCSI
+    register: result
+    ignore_errors: true
+
+  - name: Creation Status
+    assert:
+      that:
+        - result.response is defined
+        - result.response.status.state == 'COMPLETE'
+        - result.response.metadata.owner_reference.name == "{{ vm_owner.name }}"
+        - result.response.metadata.owner_reference.uuid == "{{ vm_owner.uuid }}"
+        - result.response.metadata.owner_reference.kind == "user"
+      fail_msg: 'Unable to Create VM with owner'
+      success_msg: 'VM with owner created successfully '
+
   - set_fact:
       todelete: '{{ todelete + [  result["response"]["metadata"]["uuid"] ] }}'
 ##################################################################################
diff --git a/tests/integration/targets/nutanix_vms/tasks/negtaive_scenarios.yml b/tests/integration/targets/nutanix_vms/tasks/negtaive_scenarios.yml
index 4d03ea781..62541322a 100644
--- a/tests/integration/targets/nutanix_vms/tasks/negtaive_scenarios.yml
+++ b/tests/integration/targets/nutanix_vms/tasks/negtaive_scenarios.yml
@@ -28,6 +28,36 @@
         - result.error == "Project project not found."
       success_msg: ' Success: returned error as expected '
 #############################################################
+  - name: Check if error is produced when disk size is not given for storage container
+    check_mode: yes
+    ntnx_vms:
+      state: present
+      name: VM with storage container
+      timezone: GMT
+      cluster:
+        name: "{{ cluster.name }}"
+      categories:
+        AppType:
+          - Apache_Spark
+      disks:
+        - type: DISK
+          bus: SCSI
+          storage_container:
+            name: "{{ storage_container.name }}"
+      vcpus: 1
+      cores_per_vcpu: 1
+      memory_gb: 1
+    register: result
+    ignore_errors: True
+    
+  - name: Creation Status
+    assert:
+      that:
+        - result.msg == "Unsupported operation: Unable to create disk, 'size_gb' is required for using storage container."
+        - result.failed == True
+        - result.failed is defined
+      success_msg: ' Success: returned error as expected '
+##################################################################################
   - name: Unknown Cluster
     ntnx_vms:
       state: present
diff --git a/tests/integration/targets/nutanix_vms/tasks/vm_update.yml b/tests/integration/targets/nutanix_vms/tasks/vm_update.yml
index d8ee4048f..8ce3b8bc7 100644
--- a/tests/integration/targets/nutanix_vms/tasks/vm_update.yml
+++ b/tests/integration/targets/nutanix_vms/tasks/vm_update.yml
@@ -26,6 +26,28 @@
     fail_msg: ' Unable to create VM with minimum requiremnts '
     success_msg: ' VM with minimum requiremnts created successfully '
 ####################################################################
+- name: update vm by set owner by uuid
+  ntnx_vms:
+    vm_uuid: "{{ result.vm_uuid }}"
+    owner:
+      uuid: "{{vm_owner.uuid}}"
+  register: result
+  ignore_errors: true
+
+- name: Update Status
+  assert:
+    that:
+      - result.response is defined
+      - result.vm_uuid
+      - result.task_uuid
+      - result.response.status.state == "COMPLETE"
+      - result.response.metadata.owner_reference.name == "{{ vm_owner.name }}"
+      - result.response.metadata.owner_reference.uuid == "{{ vm_owner.uuid }}"
+      - result.response.metadata.owner_reference.kind == "user"
+    fail_msg: ' Unable to update vm by setting owner '
+    success_msg: ' VM updated successfully by setting owner '
+####################################################################
+
 - debug:
     msg: Start update tests for memory vcpus cores_per_vcpu 
 
diff --git a/tests/integration/targets/nutanix_vms_info/aliases b/tests/integration/targets/nutanix_vms_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_vms_info/aliases
+++ b/tests/integration/targets/nutanix_vms_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_vms_info/tasks/list_vms.yml b/tests/integration/targets/nutanix_vms_info/tasks/list_vms.yml
index 1b758596b..991d25733 100644
--- a/tests/integration/targets/nutanix_vms_info/tasks/list_vms.yml
+++ b/tests/integration/targets/nutanix_vms_info/tasks/list_vms.yml
@@ -1,3 +1,43 @@
+- set_fact:
+    todelete: []
+
+- name: Creat anohter VM with same name 
+  ntnx_vms:
+    name: "{{ vm.name }}"
+    cluster:
+      name: "{{ cluster.name }}"
+    state: "power_off"
+  register: output
+  ignore_errors: true
+  
+- name: Creation Status
+  assert:
+    that:
+      - output.response is defined
+      - output.response.status.state == 'COMPLETE'
+    fail_msg: ' Unable to create VM with minimum requiremnts '
+    success_msg: ' VM with minimum requiremnts created successfully '
+
+- set_fact:
+    todelete: '{{ todelete + [  output["response"]["metadata"]["uuid"] ] }}'
+  when: output.response.status.state == 'COMPLETE'
+##################################################
+- name: List vms using filter_string
+  ntnx_vms_info:
+    filter_string: vm_name=={{vm.name}};power_state==off
+  register: result
+  ignore_errors: True
+
+- name: Listing Status
+  assert:
+    that:
+      - result.response is defined
+      - result.response.entities[0].metadata.uuid == '{{output["response"]["metadata"]["uuid"]}}'
+      - result.response.metadata.kind == "vm"
+      - result.response.metadata.total_matches == 1
+    fail_msg: " Unable to list vms using filter_string"
+    success_msg: " VMs listed successfully using filter_string "
+################################################## 
 - name: List vms using name filter criteria
   ntnx_vms_info:
     filter:
@@ -44,3 +84,11 @@
     fail_msg: " Unable to list vms "
     success_msg: " VMs listed successfully "
 ####################################################
+- name: Delete all Created VMs 
+  ntnx_vms:
+    state: absent
+    vm_uuid: '{{ item }}'
+  register: result
+  loop: '{{ todelete }}'
+- set_fact:
+    todelete: []
\ No newline at end of file
diff --git a/tests/integration/targets/nutanix_vpcs/aliases b/tests/integration/targets/nutanix_vpcs/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_vpcs/aliases
+++ b/tests/integration/targets/nutanix_vpcs/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/nutanix_vpcs_info/aliases b/tests/integration/targets/nutanix_vpcs_info/aliases
index 8b1378917..e69de29bb 100644
--- a/tests/integration/targets/nutanix_vpcs_info/aliases
+++ b/tests/integration/targets/nutanix_vpcs_info/aliases
@@ -1 +0,0 @@
-
diff --git a/tests/integration/targets/prepare_env/vars/main.yml b/tests/integration/targets/prepare_env/vars/main.yml
index e69de29bb..508f92c27 100644
--- a/tests/integration/targets/prepare_env/vars/main.yml
+++ b/tests/integration/targets/prepare_env/vars/main.yml
@@ -0,0 +1,145 @@
+ip: TEST_PC_IP
+username: TEST_PC_USERNAME
+password: TEST_PC_PASSWORD
+validate_certs: TEST_VALIDATE_CERT_FLAG
+
+# for NKE related tests 
+k8s_version: TEST_K8S_VERSION
+host_os: TEST_HOST_OS
+nutanix_cluster_password: TEST_CLUSTER_PASSWORD
+nutanix_cluster_username: TEST_CLUSTER_USERNAME
+cni:
+  node_cidr_mask_size: "TEST_MASK_CIDR"
+  service_ipv4_cidr: "TEST_SERVICE_CIDR"
+  pod_ipv4_cidr: "TEST_POD_CIDR"
+
+# docker registry url for nke tests
+url: TEST_REGISTRIES_URL
+
+# cluster reference for several tests
+cluster:
+  name: TEST_CLUSTER_NAME
+  uuid: TEST_CLUSTER_UUID
+
+# For tests like vms, etc.
+network:
+  dhcp:
+    name: TEST_VLAN_NAME
+    uuid: TEST_VLAN_UUID
+  static:
+    ip: TEST_STATIC_IP
+
+vm_owner:
+  name: TEST_OWNER_NAME
+  uuid: TEST_OWNER_UUID
+
+# can be skipped
+todelete: []
+
+# for ntnx_image tests
+disk_image:
+  url: TEST_IMAGE_URL
+  dest: TEST_DEST_PATH
+  checksum: TEST_CHECKSUM
+  centos: "TEST_CENTOS"
+
+# used in test setup for creation of networks and some networking tests
+external_nat_subnets:
+  name: TEST_NAT_NAME
+  vlan_id: TEST_VLAN_ID
+  gateway_ip_address: TEST_GATEWAY_IP
+  network_prefix: TEST_PREFIX
+  network_ip: TEST_NETWORK_IP
+  dhcp:
+    start_address: TEST_START_DHCP
+    end_address: TEST_END_DHCP
+  static:
+    start_address: TEST_START_STATIC
+    end_address: TEST_END_STATIC
+
+# Details for creating this resources during test setup and same are used related tests
+vpc_name: TEST_VPC_NAME
+vm_name: TEST_VM_NAME
+static_subnet_name: TEST_STATIC_SUBNET
+overlay_subnet:
+  name: TEST_OVERLAY_NAME
+  network_ip: TEST_OVERLAY_NETWORK_IP
+  network_prefix: TEST_OVERLAY_PREFIX
+  gateway_ip: TEST_OVERLAY_GATEWAY_IP
+  private_ip: TEST_OVERLAY_PRIVATE_IP
+
+# security rule related tests
+quarantine_rule_uuid: TEST_QUARANTINE_UUID
+categories:
+  apptiers:
+    - Default
+    - sub_app_1
+
+# name of images in setup for vms test
+centos: "TEST_CENTOS"
+ubuntu: "TEST_UBUNTU"
+
+# virtual switch reference primarily for vms test
+virtual_switch:
+  name: TEST_SWITCH_NAME
+  uuid: TEST_SWITCH_UUID
+
+# storage reference primarily for vms test
+storage_container:
+  name: TEST_CONTAINER_NAME
+  uuid: TEST_CONTAINER_UUID
+
+# user and user groups from AD for user and user groups tests
+users:
+  - TEST_USER_UUID_1
+  - TEST_USER_UUID_2
+user_groups:
+  - TEST_GROUP_UUID
+
+# project reference for vms test
+project:
+  name: TEST_PROJECT_NAME
+  uuid: TEST_PROJECT_UUID
+
+# list of roles for advanced projects tests
+roles:
+  - "TEST_ROLES_NAME_1"
+  - "TEST_ROLES_NAME_2"
+  - "TEST_ROLES_NAME_3"
+  - "TEST_ROLES_NAME_4"
+
+# account reference for advanced projects related tests
+accounts:
+  - name: "NTNX_LOCAL_AZ"
+    uuid: "TEST_ACCOUNT_UUID"
+
+# user and user groups for projects tests when new users are to be added
+new_user: "TEST_NEW_USER_EMAIL"
+new_user_group: "TEST_NEW_USER_GROUP_DN"
+
+# acp tests related vars
+acp:
+  role:
+    name: "Project Admin"
+    uuid: TEST_ROLE_UUID
+  user_uuid: TEST_USER_UUID
+  user_group_uuid: TEST_GROUP_UUID
+
+# auth details for projects, acps, user and user groups related tests
+distinguished_name: "TEST_DISTINGUISHED_NAME"
+principal_name: "TEST_PRINCIPAL_NAME"
+directory_service_uuid: "TEST_DIRECTORY_UUID"
+identity_provider_uuid: "TEST_IDENTITY_UUID"
+
+# vm created during test setup for dr tests
+dr_vm_name: TEST_VM_NAME
+
+# dr related tests vars
+dr:
+  primary_az_url: TEST_PRIMARY_URL
+  recovery_az_url: TEST_RECOVERY_URL
+  recovery_site_network: "TEST_RECOVERY_NETWORK"
+  recovery_ip1: TEST_RECOVERY_IP1
+  recovery_ip2: TEST_RECOVERY_IP2
+  gateway_ip: TEST_GATEWAY_IP
+  prefix: TEST_PREFIX
diff --git a/tests/integration/targets/prepare_foundation_env/vars/main.yml b/tests/integration/targets/prepare_foundation_env/vars/main.yml
new file mode 100644
index 000000000..268a046dc
--- /dev/null
+++ b/tests/integration/targets/prepare_foundation_env/vars/main.yml
@@ -0,0 +1,95 @@
+# foundation host to be ued in tests
+foundation_host: "TEST_FOUNDATION_HOST"
+
+# the dir in local machine where test setup will install nos image and pick during image upload tests
+source: 'TEST_SOURCE_PATH'
+
+# nos image url for images tests
+image_url: "TEST_IMAGE_URL"
+
+# nos package name
+nos_package: "TEST_NOS_PACKAGE"
+
+# common details for all nodes used under test
+cvm_gateway: "TEST_CVM_GATEWAY"
+cvm_netmask: "TEST_CVM_NETMASK"
+hypervisor_gateway: "TEST_HYPERVISOR_GATEWAY"
+hypervisor_netmask: "TEST_HYPERVISOR_NETMASK"
+default_ipmi_user: "TEST_IPMI_USER"
+
+# IBIS_node is just a random name we used for our tests
+# this nodes where used for tests related to bare metal, dos and aos installed nodes.
+IBIS_node:
+  block_id: "TEST_BLOCK_ID"
+  node1:
+    node_serial: "TEST_NODE_SERIAL_1"
+    hypervisor_hostname: "TEST_HYPERVISOR_HOSTNAME_1"
+    cvm_ip: TEST_CVM_IP_1
+    hypervisor_ip: TEST_HYPERVISOR_IP_1
+    node_position: "TEST_NODE_POSITION_1"
+    hypervisor: "TEST_HYPERVISOR_1"
+    ipmi_password: "TEST_IPMI_PASSWORD_1"
+    ipmi_ip: TEST_IPMI_IP_1
+    ipmi_netmask: "TEST_IPMI_NETMASK_1"
+    ipmi_gateway: TEST_IPMI_GATEWAY_1
+  node2:
+    node_serial: "TEST_NODE_SERIAL_2"
+    hypervisor_hostname: "TEST_HYPERVISOR_HOSTNAME_2"
+    cvm_ip: TEST_CVM_IP_2
+    hypervisor_ip: TEST_HYPERVISOR_IP_2
+    node_position: "TEST_NODE_POSITION_2"
+    hypervisor: "TEST_HYPERVISOR_2"
+    ipmi_password: "TEST_IPMI_PASSWORD_2"
+    ipmi_ip: TEST_IPMI_IP_2
+  node3:
+    node_serial: "TEST_NODE_SERIAL_3"
+    hypervisor_hostname: "TEST_HYPERVISOR_HOSTNAME_3"
+    cvm_ip: TEST_CVM_IP_3
+    hypervisor_ip: TEST_HYPERVISOR_IP_3
+    node_position: "TEST_NODE_POSITION_3"
+    hypervisor: "TEST_HYPERVISOR_3"
+    ipmi_password: "TEST_IPMI_PASSWORD_3"
+    ipmi_ip: TEST_IPMI_IP_3
+  node4:
+    node_serial: "TEST_NODE_SERIAL_4"
+    hypervisor_hostname: "TEST_HYPERVISOR_HOSTNAME_4"
+    cvm_ip: TEST_CVM_IP_4
+    hypervisor_ip: TEST_HYPERVISOR_IP_4
+    node_position: "TEST_NODE_POSITION_4"
+    hypervisor: "TEST_HYPERVISOR_4"
+    ipmi_password: "TEST_IPMI_PASSWORD_4"
+    ipmi_ip: TEST_IPMI_IP_4
+
+# we used this nodes for our sanity tests.
+nodes:
+  current_cvm_vlan_tag: "TEST_CVM_VLAN_TAG"
+  block_id: "TEST_BLOCK_ID_NODES"
+  node1:
+    cvm_ip: TEST_CVM_IP_NODE1
+    hypervisor: "TEST_HYPERVISOR_NODE1"
+    hypervisor_ip: TEST_HYPERVISOR_IP_NODE1
+    node_position: "TEST_NODE_POSITION_NODE1"
+    hypervisor_hostname: "TEST_HYPERVISOR_HOSTNAME_NODE1"
+    node_serial: "TEST_NODE_SERIAL_NODE1"
+    ipmi_password: "TEST_IPMI_PASSWORD_NODE1"
+    ipmi_ip: TEST_IPMI_IP_NODE1
+    ipmi_netmask: "TEST_IPMI_NETMASK_NODE1"
+    ipmi_gateway: TEST_IPMI_GATEWAY_NODE1
+  ntp_servers:
+        - "TEST_NTP_SERVER_1"
+        - "TEST_NTP_SERVER_2"
+  dns_servers:
+        - "TEST_DNS_SERVER_1"
+        - "TEST_DNS_SERVER_2"
+  backplane_vlan: "TEST_BACKPLANE_VLAN"
+  backplane_subnet: "TEST_BACKPLANE_SUBNET"
+  backplane_netmask: "TEST_BACKPLANE_NETMASK"
+
+# this is for bmc ipmi config related tests
+bmc:
+  ipmi_user: "TEST_IPMI_USER_BMC"
+  ipmi_password: "TEST_IPMI_PASSWORD_BMC"
+  ipmi_netmask: "TEST_IPMI_NETMASK_BMC"
+  ipmi_gateway: TEST_IPMI_GATEWAY_BMC
+  ipmi_mac: "TEST_IPMI_MAC"
+  ipmi_ip: TEST_IPMI_IP_BMC
diff --git a/tests/integration/targets/prepare_ndb_env/vars/main.yml b/tests/integration/targets/prepare_ndb_env/vars/main.yml
index e69de29bb..bc3e181b2 100644
--- a/tests/integration/targets/prepare_ndb_env/vars/main.yml
+++ b/tests/integration/targets/prepare_ndb_env/vars/main.yml
@@ -0,0 +1,184 @@
+# details for setup to be used in tests
+ndb_ip: "NDB_HOST_IP"
+ndb_username: "NDB_USERNAME"
+ndb_password: "NDB_PASSWORD"
+
+# network profile for various ndb tests. All vars are related to NDB setup.
+network_profile:
+  name: "TEST_NETWORK_PROFILE_NAME"
+  uuid: "TEST_NETWORK_PROFILE_UUID"
+  single:
+    cluster:
+      name: "TEST_CLUSTER_NAME"
+    vlan_name: "TEST_VLAN_NAME"
+  HA:
+    cluster1:
+      name: "TEST_CLUSTER1_NAME"
+      vlan_name: "TEST_VLAN_NAME"
+      vlan_name2: "TEST_VLAN_NAME"
+    cluster2:
+      name: "TEST_CLUSTER2_NAME"
+      vlan_name: "TEST_VLAN_NAME"
+      vlan_name2: "TEST_VLAN_NAME"
+
+# profiles for single node postgres database instances
+software_profile:
+  name: "TEST_SOFTWARE_PROFILE_NAME"
+  uuid: "TEST_SOFTWARE_PROFILE_UUID"
+  latest_version_id: "TEST_LATEST_VERSION_ID"
+
+compute_profile:
+  name: "TEST_COMPUTE_PROFILE_NAME"
+  uuid: "TEST_COMPUTE_PROFILE_UUID"
+
+db_params_profile:
+  name: "TEST_DB_PARAMS_PROFILE_NAME"
+  uuid: "TEST_DB_PARAMS_PROFILE_UUID"
+
+static_network_profile:
+  name: "TEST_STATIC_NETWORK_PROFILE_NAME"
+  uuid: "TEST_STATIC_NETWORK_PROFILE_UUID"
+
+# for postgres HA related tests, requires different profiles then single node ones.
+postgres_ha_profiles:
+  static_network_profile:
+    name: "TEST_STATIC_HA_STATIC_NAME"
+    uuid: "TEST_STATIC_HA_STATIC_UUID"
+
+  multicluster_network_profile:
+    name: "TEST_HA_MULTICLUSTER_NAME"
+    uuid: "TEST_HA_MULTICLUSTER_UUID"
+
+  software_profile:
+    name: "TEST_POSTGRES_SOFTWARE_PROFILE_NAME"
+    uuid: "TEST_POSTGRES_SOFTWARE_PROFILE_UUID"
+    latest_version_id: "TEST_LATEST_VERSION_ID"
+
+  compute_profile:
+    name: "TEST_COMPUTE_PROFILE_NAME"
+    uuid: "TEST_COMPUTE_PROFILE_UUID"
+
+  db_params_profile:
+    name: "TEST_POSTGRES_HA_PARAMS_NAME"
+    uuid: "TEST_POSTGRES_HA_PARAMS_UUID"
+
+public_ssh_key: "TEST_PUBLIC_SSH_KEY"
+
+# reference for existing maintenance window to be added in certain entities like database instance, etc.
+maintenance:
+  window_name: "TEST_MAINTENANCE_WINDOW_NAME"
+  window_uuid: "TEST_MAINTENANCE_WINDOW_UUID"
+
+# reference for existing sla to be used in certain entities like database instance, etc.
+sla:
+  name: "TEST_SLA_NAME"
+  uuid: "TEST_SLA_UUID"
+
+# reference for existing sla to be used in certain entities like database instance, etc.
+sla2:
+  name: "TEST_SLA2_NAME"
+  uuid: "TEST_SLA2_UUID"
+
+# reference for clusters for various tests
+# cluster3 here is used for clusters crud tests
+cluster:
+  cluster1:
+    name: "TEST_CLUSTER1_NAME"
+    uuid: "TEST_CLUSTER1_UUID"
+  cluster2:
+    name: "TEST_CLUSTER2_NAME"
+    uuid: "TEST_CLUSTER2_UUID"
+  cluster3:
+    name: "TEST_CLUSTER3_NAME"
+    uuid: ""
+    desc: "TEST_CLUSTER3_DESC"
+    name_prefix: "TEST_CLUSTER3_NAME_PREFIX"
+    cluster_ip: "TEST_CLUSTER3_IP"
+    update_cluster_ip: "TEST_UPDATE_CLUSTER_IP"
+    cluster_credentials:
+      username: "TEST_CLUSTER_CREDENTIALS_USERNAME"
+      password: "TEST_CLUSTER_CREDENTIALS_PASSWORD"
+    agent_network:
+      dns_servers:
+        - "TEST_DNS_SERVER_1"
+        - "TEST_DNS_SERVER_2"
+      ntp_servers:
+        - "TEST_NTP_SERVER_1"
+        - "TEST_NTP_SERVER_2"
+        - "TEST_NTP_SERVER_3"
+        - "TEST_NTP_SERVER_4"
+      vlan_access:
+        prism_vlan:
+          vlan_name: "TEST_PRISM_VLAN_NAME"
+          vlan_type: "TEST_VLAN_TYPE"
+          static_ip: "TEST_STATIC_IP"
+          gateway: "TEST_GATEWAY"
+          subnet_mask: "TEST_SUBNET_MASK"
+    storage_container: "TEST_STORAGE_CONTAINER"
+
+# free IPs from cluster.cluster1 for HA related tests
+cluster_ips:
+  ip1: "TEST_IP_1"
+  ip2: "TEST_IP_2"
+  ip3: "TEST_IP_3"
+  ip4: "TEST_IP_4"
+  ip5: "TEST_IP_5"
+  vip: "TEST_VIP"
+
+# for new db server vms
+vm_password: "TEST_VM_PASSWORD"
+vm_username: "TEST_VM_USERNAME"
+
+# exitsing db server VM reference for software profile tests
+db_server_vm:
+  name: "TEST_DB_SERVER_VM_NAME"
+  uuid: "TEST_DB_SERVER_VM_UUID"
+
+# existing tags for various entities
+tags:
+  db_server_vm:
+    name: "TEST_DB_SERVER_VM_TAGS_NAME"
+    uuid: "TEST_DB_SERVER_VM_TAGS_UUID"
+  databases:
+    name: "TEST_DATABASES_NAME"
+    uuid: "TEST_DATABASES_UUID"
+  clones:
+    name: "TEST_CLONES_NAME"
+    uuid: "TEST_CLONES_UUID"
+
+# existing time machine info for data access management and snapshot related tests
+time_machine:
+  name: "TEST_TIME_MACHINE_NAME"
+  uuid: "TEST_TIME_MACHINE_UUID"
+  snapshot_uuid: ""
+
+# for brownfield import of vms
+postgres:
+  software_home: "/usr/pgsql-10.4"
+
+# ip for creating database vm using static network
+vm_ip: "TEST_VM_IP"
+
+# info for vlan related tests
+ndb_vlan:
+  name: "TEST_VLAN_IN_CLUSTER"
+  ip_pools:
+    - start_ip: "TEST_START_IP_1"
+      end_ip: "TEST_END_IP_1"
+    - start_ip: "TEST_START_IP_2"
+      end_ip: "TEST_END_IP_2"
+    - start_ip: "TEST_START_IP_3"
+      end_ip: "TEST_END_IP_3"
+    - start_ip: "TEST_START_IP_4"
+      end_ip: "TEST_END_IP_4"
+  gateway: "TEST_GATEWAY"
+  subnet_mask: "TEST_SUBNET_MASK"
+  primary_dns: "TEST_PRIMARY_DNS"
+  secondary_dns: "TEST_SECONDARY_DNS"
+  dns_domain: "TEST_DNS_DOMAIN"
+  updated_gateway: "TEST_UPDATED_GATEWAY"
+  updated_subnet_mask: "TEST_UPDATED_SUBNET_MASK"
+  updated_primary_dns: "TEST_UPDATED_PRIMARY_DNS"
+  updated_secondary_dns: "TEST_UPDATED_SECONDARY_DNS"
+
+todelete: []
\ No newline at end of file