Skip to content

Enhancing storagepool operations and snapshot related fixes in NetApp ONTAP storage plugin - #13897

Draft
sandeeplocharla wants to merge 7 commits into
apache:mainfrom
NetApp:netapp-ontap-fixes
Draft

Enhancing storagepool operations and snapshot related fixes in NetApp ONTAP storage plugin#13897
sandeeplocharla wants to merge 7 commits into
apache:mainfrom
NetApp:netapp-ontap-fixes

Conversation

@sandeeplocharla

@sandeeplocharla sandeeplocharla commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Description

This PR...

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

sandeeplocharla and others added 7 commits August 17, 2026 10:53
@sandeeplocharla
Multi-Host support for NFS3 and iSCSI(Addition/Removal of host) (#64)
b842ff6 
This PR provides support to addition and removal of multiple hosts to NFS3 and iSCSI type storage pools

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [X] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

- [X] Major
- [ ] Minor

- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [ ] Minor
- [ ] Trivial

**Only 1 Host present in the Cluster**
<img width="1049" height="340" alt="Screenshot 2026-07-14 at 9 19 49 AM"
src="https://github.com/user-attachments/assets/8d639c94-6686-40de-a362-341d41ff48fe"
/>

**Created an NFS3 StoragePool with Cluster scope**
<img width="1049" height="340" alt="Screenshot 2026-07-14 at 9 20 58 AM"
src="https://github.com/user-attachments/assets/f14cc903-bd60-47d4-8a7c-5a2ec4d2e0d0"
/>

**ONTAP volume created for the SP**
<img width="1101" height="305" alt="Screenshot 2026-07-14 at 9 21 30 AM"
src="https://github.com/user-attachments/assets/7823e398-782d-472d-948d-25153d5c372a"
/>

**Export Policy rule and client**
<img width="1077" height="407" alt="Screenshot 2026-07-14 at 9 34 00 AM"
src="https://github.com/user-attachments/assets/5426f9d4-cc96-45dc-9857-0312227867c8"
/>

**Added a new host**
<img width="1048" height="314" alt="Screenshot 2026-07-14 at 9 24 42 AM"
src="https://github.com/user-attachments/assets/5acd2a38-6b54-4393-a4f9-86790f1c81de"
/>

**Updated client in the Export Policy**
<img width="1077" height="407" alt="Screenshot 2026-07-14 at 9 35 24 AM"
src="https://github.com/user-attachments/assets/7d0e8470-3391-4909-9de9-a3f22fead439"
/>

**Removed the host from the cluster**
<img width="1042" height="342" alt="Screenshot 2026-07-14 at 9 32 16 AM"
src="https://github.com/user-attachments/assets/24fea619-4c8b-4805-ad53-49fc2fb6aa13"
/>

**The respective client has been removed from the Export Policy**
<img width="1077" height="423" alt="Screenshot 2026-07-14 at 9 36 07 AM"
src="https://github.com/user-attachments/assets/76e62a97-a034-4c75-8642-41bd116938e1"
/>

Test Done | Result | Comments
-- | -- | --
Create an instance by specifying the host and disk offering pointed to
NFS3 Primary Storage Pool (Cluster scoped with min of 2 hosts) | PASS |
 
Create an instance specifying host and disk offering pointed to iSCSI
Primary Storage Pool (Cluster scoped with min of 2 hosts) | PASS |  
Create an instance in a cluster with atleast 2 hosts in the cluster by
not specifying the host and disk offering pointed to NFS3 Primary
Storage Pool (Cluster scoped with min of 2 hosts) | PASS |  
Create an instance in a cluster with atleast 2 hosts in the cluster by
not specifying the host and disk offering pointed to iSCSI Primary
Storage Pool (Cluster scoped with min of 2 hosts) | PASS |  
Create an instance by specifying the host and disk offering pointed to 2
NFS3 Primary Storage Pools (Cluster scoped + Zone scoped) | FAIL |
StoragePoolAllocator is coming as empty and the random strategy to
allocate was failing.
Create an instance by specifying the host and disk offering pointed to 2
iSCSI Primary Storage Pools (Cluster scoped + Zone scoped) | FAIL |
StoragePoolAllocator is coming as empty and the random strategy to
allocate was failing.
Create an instance by specifying the host and disk offering pointed to
NFS3 Primary Storage Pool (Zone scoped with min of 2 hosts) | FAIL |
Zone scoped instance creation failing (CSTACKEX-188)
Create an instance specifying host and disk offering pointed to iSCSI
Primary Storage Pool (Zone scoped with min of 2 hosts) | FAIL | Zone
scoped instance creation failing (CSTACKEX-188)
Create an instance in a cluster with atleast 2 hosts in the cluster by
not specifying the host and disk offering pointed to NFS3 Primary
Storage Pool (Zone scoped with min of 2 hosts) | FAIL | Zone scoped
instance creation failing (CSTACKEX-188)
Create an instance in a cluster with atleast 2 hosts in the cluster by
not specifying the host and disk offering pointed to iSCSI Primary
Storage Pool (Zone scoped with min of 2 hosts) | FAIL | Zone scoped
instance creation failing (CSTACKEX-188)
Power off VM on Host-1 and start it on Host-2 (same cluster) with disk
offering pointed to NFS3 primary storage pool (cluster scoped) | PASS |
 
Power off and on a VM with 'last known host' selected. Create the
instance in a cluster, without specifying a host. | PASS | Last known
host was selected
Power off and on a VM with 'last known host' NOT selected. Create the
instance in a cluster, without specifying a host. | PASS | VM got hosted
on the chosen host.
Power off and on a VM with 'last known host' selected but choose a
different host. Create the instance in a cluster, without specifying a
host. | PASS | VM got hosted on the chosen host.
Insufficient resources in the storage pool. Instance creation should
fail. | PASS | Generic error is being displayed instead of proper error
regarding Insufficient resources.
One host in the cluster (min. 2 hosts) loaded, resulting in insufficient
CPU. Disk Offering pointed to Cluster scoped primary storage pool. |
PASS |  
Both host in the cluster (min. 2 hosts) loaded, resulting in
insufficient CPU. Disk Offering pointed to Cluster scoped primary
storage pool. Instance creation should fail but disks should first get
created and then destroyed.
@sandeeplocharla
Fix for NFS3 primary storage pool is failing to come out of maintenan… (
2dae652 
#71)

Fix for NFS3 primary storage pool is failing to come out of maintenance
mode

### Description

This PR has the following:

1. For NetworkFileSystem type, libvirtd handles mounting and unmounting
of nfs mount [Ref: https://libvirt.org/storage.html]
2. KVM adaptor hasn't overridden `deleteStoragePool` method leading to
only just the change in the DB. This was leading to error in case of
`Cancel Maintenance` as the pool already exists with the host.
3. Also, when `Enable Maintenance` call comes, it was first removing the
nfs mount, which was causing the libvirtd to error out during `Destroy
Pool` call as the mount wasn't available.

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

### Types of changes

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

### Feature/Enhancement Scale or Bug Severity

#### Feature/Enhancement Scale

- [] Major
- [ ] Minor

#### Bug Severity

- [ ] BLOCKER
- [ ] Critical
- [X] Major
- [ ] Minor
- [ ] Trivial

### Screenshots (if appropriate):

### How Has This Been Tested?

`Previously:`

<img width="1035" height="362" alt="Screenshot 2026-07-08 at 8 00 05 AM"
src="https://github.com/user-attachments/assets/91a3bcd7-cb6f-4b53-81f5-0851abd337ee"
/>
<img width="1301" height="365" alt="Screenshot 2026-07-08 at 7 58 31 AM"
src="https://github.com/user-attachments/assets/5444b1ae-5cfa-4709-a48f-107b8a257e29"
/>
<img width="1035" height="362" alt="Screenshot 2026-07-08 at 8 00 29 AM"
src="https://github.com/user-attachments/assets/bbeaece1-8795-46ef-b1c7-9a9b24910b21"
/>
<img width="1301" height="327" alt="Screenshot 2026-07-08 at 8 01 37 AM"
src="https://github.com/user-attachments/assets/c9086ef2-066c-4661-a684-c4788e471fdc"
/>

So, clearly though the nfs mount was removed, the libvirtd still has the
pool details with it.

`Now:`

<img width="1042" height="351" alt="Screenshot 2026-07-08 at 8 30 46 AM"
src="https://github.com/user-attachments/assets/59d2c629-41bd-4991-9988-3989dd3497aa"
/>
<img width="1300" height="382" alt="Screenshot 2026-07-08 at 8 31 18 AM"
src="https://github.com/user-attachments/assets/9b774243-8329-4fb8-babb-a0891d20fc6a"
/>
<img width="1043" height="355" alt="Screenshot 2026-07-08 at 8 32 41 AM"
src="https://github.com/user-attachments/assets/5207517a-c2d0-4935-adf0-db70877b79fa"
/>
<img width="1299" height="312" alt="Screenshot 2026-07-08 at 8 33 02 AM"
src="https://github.com/user-attachments/assets/fd5014bb-8d46-423b-8039-b2caa391b885"
/>
<img width="1049" height="340" alt="Screenshot 2026-07-08 at 8 34 32 AM"
src="https://github.com/user-attachments/assets/ec951783-a90e-4118-89d2-8d62b28f138e"
/>
<img width="1299" height="365" alt="Screenshot 2026-07-08 at 8 33 46 AM"
src="https://github.com/user-attachments/assets/a64a2c86-9089-4f67-a345-90a0dbfa88fc"
/>
@sandeeplocharla
Fixes to handle 404 exceptions when export policy and ontap volume ar… (
cf8bc41 
#73)

Fixes to handle 404 exceptions when export policy and ontap volume are
missing during storagepool delete workflow

This PR...
Has fixes to handle 404 Not found exceptions in case of 'ExportPolicy'
and 'Volume' deletion.

**latest**
<img width="1301" height="503" alt="Screenshot 2026-08-02 at 2 13 22 PM"
src="https://github.com/user-attachments/assets/53e48052-c833-4758-acff-b6ee753113cf"
/>

<img width="1293" height="674" alt="Screenshot 2026-07-01 at 3 13 00 PM"
src="https://github.com/user-attachments/assets/46190b26-500c-448b-b65e-4b989e8dca28"
/>

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

- [ ] Major
- [] Minor

- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [X] Minor
- [ ] Trivial

<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran
to -->

change?

<!-- see how your change affects other areas of the code, etc. -->

<!-- Please read the
[CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
document -->
@rajiv-jain-netapp @sandeeplocharla
create temp CG for consistent VM snapshot for the VM which is span ac…
e4f2e74 
…ross multiple flexvolumes (#74)

This PR...
<!--- Describe your changes in DETAIL - And how has behaviour
functionally changed. -->

<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to
reproduce. -->

<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically
be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

- [x] Major
- [ ] Minor

- [ ] BLOCKER
- [ ] Critical
- [x] Major
- [ ] Minor
- [ ] Trivial

<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran
to -->

change?

<!-- see how your change affects other areas of the code, etc. -->

<!-- Please read the
[CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
document -->
@sandeeplocharla
CSTACKEX-127: Primary storage-pool is getting created even if desired…
70ae35a 
… data LIFs are not reachable (#76)

Choosing IpInterface based on its status and affinity to the chosen
aggregate

This PR...
1. Fixed an issue in picking an unavailable IP while creating the
storage pool.
2. When CloudStack creates an ONTAP primary storage pool, it now picks
the best available network interface (LIF) using a priority-based
selection:
- Best case: Uses a LIF homed on the same node as the storage aggregate
— optimal I/O, no warning
- Degraded case: All home-node LIFs are down but a failover LIF is
running on that node — pool is created, admin is warned
- Fallback case: No LIF at all on the aggregate's node, pool is created
using a LIF from a different node, admin is warned with a latency note
- Failure case: No usable LIF anywhere, pool creation fails with a clear
error

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

- [X] Major
- [ ] Minor

- [ ] BLOCKER
- [ ] Critical
- [X] Major
- [ ] Minor
- [ ] Trivial

Note: The following images have been captured for NFS3, the same would
be the case for iSCSI.

<img width="487" height="661" alt="Screenshot 2026-07-08 at 6 55 32 AM"
src="https://github.com/user-attachments/assets/e48a42c7-9914-4563-bc27-f1ad6501629c"
/>

Clearly, by the virtue of free space available, the plugin would choose
`sti246_vsim_ocvs040d_aggr1` by default.

**Scenario-1 [pool_P1]: Happy path; No LIFs were down.**
<img width="1122" height="742" alt="Screenshot 2026-07-07 at 10 26
34 PM"
src="https://github.com/user-attachments/assets/8b748425-c548-4d03-8265-2b86a568f45b"
/>
<img width="1122" height="419" alt="Screenshot 2026-07-07 at 10 26
49 PM"
src="https://github.com/user-attachments/assets/45177fc2-4e87-4ead-928e-659e50504d9d"
/>
<img width="1032" height="432" alt="Screenshot 2026-07-07 at 10 27
48 PM"
src="https://github.com/user-attachments/assets/6bbe3533-2081-429d-ba1f-fa1a8731dd3f"
/>
The first best available LIF with current node and home node matching
with the chosen node has been picked.

**Scenario-2 [pool_P2_1]: LIFs on `040d` node were down; with one LIF
whose current node: `040d`, while its home node: `040c`**
<img width="1032" height="765" alt="Screenshot 2026-07-07 at 10 28
38 PM"
src="https://github.com/user-attachments/assets/adb8e4ff-670b-49d2-b8ca-1d7558f34643"
/>
<img width="1032" height="415" alt="Screenshot 2026-07-07 at 10 28
50 PM"
src="https://github.com/user-attachments/assets/6d982076-adba-4458-960b-dc0066d1c5a6"
/>
<img width="1032" height="380" alt="Screenshot 2026-07-07 at 11 05
22 PM"
src="https://github.com/user-attachments/assets/c73957ec-a82b-4093-bf88-43da515d8663"
/>
<img width="1032" height="220" alt="Screenshot 2026-07-07 at 11 05
43 PM"
src="https://github.com/user-attachments/assets/f179e0b7-808f-4643-9d89-7ebb52fa1d33"
/>

**Scenario-3 [pool_P3]: None of the `040d` node LIFs are UP. First best
available LIF is picked from `040c`.**
<img width="867" height="764" alt="Screenshot 2026-07-07 at 11 07 00 PM"
src="https://github.com/user-attachments/assets/59a05c54-e4f7-468a-9682-9fc392ba45c9"
/>
<img width="867" height="420" alt="Screenshot 2026-07-07 at 11 07 22 PM"
src="https://github.com/user-attachments/assets/87c4a008-17d8-4bff-9335-14e0707f9ddd"
/>
<img width="1029" height="425" alt="Screenshot 2026-07-07 at 11 08
30 PM"
src="https://github.com/user-attachments/assets/2f2888d0-0a7a-4e29-91d4-d03f1bf4440e"
/>
<img width="1029" height="228" alt="Screenshot 2026-07-07 at 11 08
54 PM"
src="https://github.com/user-attachments/assets/5cf00e5f-0a46-4010-899d-14c605b676d2"
/>
@sathvikaragi @sandeeplocharla
CSTACKEX-212: fix for snapshot failure for attached cs volumes nfs an… (
e41b4bc 
#77)

### Description
Fix snapshot failure for CloudStack volumes attached to running VMs on
ONTAP primary storage (both NFS3 and iSCSI protocols).

This PR...
<!--- Describe your changes in DETAIL - And how has behaviour
functionally changed. -->
When a volume was created and attached to a running VM in a single
step,by enabling create on storage and choose the storage pool tag the
volume format was not being set correctly. The format is now determined
by the hypervisor type (KVM → QCOW2) in ontapdriver via
[getImageFormatByHypervisor(HypervisorType] mirroring the
[getSupportedImageFormatForCluster] in VolumeOrchestrator file.


<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to
reproduce. -->

<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically
be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

### Types of changes

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [X] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

### Feature/Enhancement Scale or Bug Severity

#### Feature/Enhancement Scale

- [ ] Major
- [ ] Minor

#### Bug Severity

- [ ] BLOCKER
- [ ] Critical
- [X] Major
- [ ] Minor
- [ ] Trivial

### How Has This Been Tested?

Tested on a dev setup  against these scenarios:

Scenario A — Attach data disk to running VM, then snapshot

- Create ONTAP primary storage pool (NFS3 or iSCSI)
- Deploy VM with data disk using pool-tagged disk offering → VM reaches
Running state
- Create volume attached to the running VM by enabling create on storage
and choose the storage pool tag
- Take snapshot of attached volume — ✅ succeeds (was failing before fix)

Scenario B — Attach volume to root-disk-only VM, then snapshot

- Create ONTAP primary storage pool (NFS3 or iSCSI)
- Deploy VM without data disk → VM reaches Running state
- Create and attach volume to the running VM by enabling create on
storage and choose the storage pool tag
- Take snapshot of attached volume — ✅ succeeds (was failing before fix)

scenarios-C-create a volume on storage pool but not attach to any vm

- Create ONTAP primary storage pool (NFS3 or iSCSI)
- Create volume by enabling create on storage and choose the storage
pool tag
- Take snapshot- — ✅ succeeds (was failing before fix)

### Screenshots (if appropriate):
snapshots for when cs volume is attached to NFS and ISCSI instance that
has both root and data disk and create on storage enabled:
<img width="1464" height="436" alt="Screenshot 2026-07-15 at 12 28
32 AM"
src="https://github.com/user-attachments/assets/69827e56-ac5d-4746-a2e9-f32ac8e95433"
/>
<img width="1472" height="414" alt="Screenshot 2026-07-15 at 12 28
38 AM"
src="https://github.com/user-attachments/assets/799c8485-7023-4b1f-9eeb-3d0c4a745a57"
/>

verifying on ontap and db:
<img width="1549" height="343" alt="Screenshot 2026-07-15 at 12 28
58 AM"
src="https://github.com/user-attachments/assets/ee62e8b1-81a9-41b9-b5fb-639133a1cfff"
/>
<img width="1548" height="397" alt="Screenshot 2026-07-15 at 12 29
10 AM"
src="https://github.com/user-attachments/assets/8f74ae08-437e-4ac6-aa24-49ef4675cd30"
/>
<img width="1720" height="175" alt="Screenshot 2026-07-15 at 12 30
43 AM"
src="https://github.com/user-attachments/assets/088fbc14-581e-4ac9-85df-77bced054e3f"
/>

snapshots for when cs volume is attached to NFS and ISCSI instance that
has only root and also case when they are not attached to any instance
and create on storage enabled:
<img width="1458" height="320" alt="Screenshot 2026-07-15 at 12 52
30 AM"
src="https://github.com/user-attachments/assets/8150b81c-bc07-48e7-91ca-c93ef53b6e8a"
/>
<img width="1454" height="256" alt="Screenshot 2026-07-15 at 12 52
39 AM"
src="https://github.com/user-attachments/assets/0408156a-6374-4026-b5aa-b51b070fd44f"
/>


<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran
to -->

#### How did you try to break this feature and the system with this
change?

<!-- see how your change affects other areas of the code, etc. -->

<!-- Please read the
[CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
document -->
@rajiv-jain-netapp @sandeeplocharla
CSTACKEX-158: if ontap snapshot are already delete from ontap side, d… (
5260d5f 
#82)

…Deletion of CS side of snapshot should not fail on not finding ontap
snapshot.

This PR...
<!--- Describe your changes in DETAIL - And how has behaviour
functionally changed. -->

<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to
reproduce. -->

<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically
be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->

<!---
*******************************************************************************
-->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE
DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!---
*******************************************************************************
-->

- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)

- [ ] Major
- [x] Minor

- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [x] Minor
- [ ] Trivial

Test -1: Ran VM snapshot delete operation when the respective snapshot
is not available at ONTAP, it passed.
Test -2: Ran VM snapshot delete operation when the respective snapshot
is available at ONTAP; it passed
Test -3: Ran cloudstack volume snapshot delete workflow when the
respective snapshot is not available at ONTAP, it passed.
Test -4: Ran cloudstack volume snapshot delete workflow when the
respective snapshot is available at ONTAP, it passed.

<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran
to -->

change?

<!-- see how your change affects other areas of the code, etc. -->

<!-- Please read the
[CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
document -->
Copilot AI lite review requested due to automatic review settings August 17, 2026 06:26
Copilot AI reviewed Aug 17, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR enhances the NetApp ONTAP primary storage plugin’s snapshot, VM snapshot, and storage pool operations. It refines how CloudStack interacts with ONTAP for snapshot lifecycle (take/delete/revert), improves data LIF selection behavior, and adds consistency-group orchestration to support VM snapshots spanning multiple FlexVols.

Changes:

  • Adjusts snapshot handling so ONTAP managed-primary volume snapshots remain on primary storage (skipping secondary-archive flows) and delegates ONTAP snapshot deletion to the strategy layer.
  • Implements ONTAP VM snapshots using a temporary consistency group (two-phase start/commit) when VM volumes span multiple FlexVols; uses direct FlexVol snapshots for the single-FlexVol case.
  • Improves operational robustness: idempotent “not found” handling for deletes, ONTAP-safe snapshot naming helpers, and node-affinity-aware data LIF selection with optional alerting.

Reviewed changes

Copilot reviewed 27 out of 27 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java Skips secondary archiving for ONTAP managed-primary snapshots based on payload location.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java Delegates ONTAP snapshot delete/revert orchestration to strategy and normalizes snapshot naming/metadata usage.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java Adds temporary CG two-phase flow for multi-FlexVol VM snapshots; direct snapshot flow for single FlexVol; improves testability.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java Adds connect(ops-only) mode, node-affinity-aware data LIF selection (returns Pair), job polling helpers, and FlexVol snapshot delete helper.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java Makes export-policy delete idempotent on 404 and implements updateAccessGroup for export-policy client maintenance.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java Updates NFS export policy rules on host connect and host removal for NFS pools.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java Persists SVM UUID and processes data-LIF selection warnings (optionally sends alerts).
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java Adds ops-only strategy connect, ONTAP-safe snapshot naming helpers, and “object not found” detection.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java Adds constants for SVM UUID, LIF/node-affinity fields, CG flows, and job polling.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/AccessGroup.java Adds HostRuleAction (ADD/REMOVE) to drive export policy updates.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SnapshotFeignClient.java Adds ONTAP consistency-group and CG snapshot REST endpoints.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/AggregateFeignClient.java Adds query-map support for requesting specific aggregate fields.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IpInterface.java Adds state/enabled/location fields for LIF selection and node affinity.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java Improves enum JSON serialization/deserialization robustness.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Aggregate.java Adds node/space setters and node model for aggregate node affinity.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ConsistencyGroup.java Adds model for CG create/list requests.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ConsistencyGroupSnapshot.java Adds model for CG snapshot start/commit and list responses.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ConsistencyGroupVolume.java Adds model for CG volume members.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ConsistencyGroupVolumeProvisioningOptions.java Adds model for CG volume provisioning options.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java Expands VM snapshot unit tests to cover single-FlexVol and temporary-CG flows.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java Adds tests for “object not found” error matching.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/UnifiedNASStrategyTest.java Adds coverage for updateAccessGroup behavior and 404 delete behavior.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/StorageStrategyTest.java Updates tests for new connect(false), LIF selection Pair, and new job/snapshot helpers.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java Adds tests for data LIF warnings, failures, and alert integration.
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java Extends capabilities assertions and validates KVM format selection behavior.
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java Adds deleteStoragePool(uuid, details) override delegating to uuid-only delete.
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java Adjusts deleteStoragePool ordering and details-aware delete call.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread ...torage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
Comment on lines +211 to +215
int maxLength = OntapStorageConstants.MAX_SNAPSHOT_NAME_LENGTH;
int maxBaseLength = maxLength - suffix.length();
if (maxBaseLength <= 0) {
return normalizedBase.substring(0, maxLength);
}
Comment thread server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
Comment on lines 1635 to 1639
boolean isKvmAndFileBasedStorage = isHypervisorKvmAndFileBasedStorage(volume, storagePool);
boolean backupSnapToSecondary = isBackupSnapshotToSecondaryForZone(volume.getDataCenterId());

StoragePoolType poolType = volume.getStoragePoolType();
updateSnapshotPayload(volume.getPoolId(), payload, isKvmAndFileBasedStorage, clusterId);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

No one assigned

Labels

component:kvm component:primary-storage component:storage

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sandeeplocharla @rajiv-jain-netapp @sathvikaragi