feature/CSTACKEX-220: null check for volumeToAttach

[piyush5netapp]

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?

[Copilot]

Pull request overview

This PR aims to prevent a NullPointerException during volume attach by adding a null-check around ONTAP-specific logic in VolumeApiServiceImpl, plus a minor formatting cleanup in the ONTAP primary datastore lifecycle implementation.

Changes:

• Guard ONTAP-specific volume reload (grantAccess → DB reload) with a volumeToAttachStoragePool != null check.
• Apply a small brace/whitespace formatting correction in OntapPrimaryDatastoreLifecycle.attachZone.

Reviewed changes

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

File	Description
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java	Adds a null-check before using the storage pool provider name during attach flow.
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java	Minor formatting fix for an if statement in attachZone.

Comments suppressed due to low confidence (1)

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java:4862

• The new null-check prevents an NPE in the ONTAP-specific reload, but volumeToAttachStoragePool is still dereferenced multiple times in the sendCommand path (e.g. isManaged(), getHostAddress(), getId()). If _storagePoolDao.findById(volumeToAttach.getPoolId()) returns null for a running VM, the method will still throw a NullPointerException later. Consider failing fast when sendCommand is true and the storage pool cannot be resolved.

                if (volumeToAttachStoragePool != null && DataStoreProvider.ONTAP_PLUGIN_NAME.equals(volumeToAttachStoragePool.getStorageProviderName())) {
                    volumeToAttach = _volsDao.findById(volumeToAttach.getId());
                }
            }

            if (sendCommand) {
                if (host != null && host.getHypervisorType() == HypervisorType.KVM && volumeToAttachStoragePool.isManaged() && volumeToAttach.getPath() == null) {
                    volumeToAttach.setPath(volumeToAttach.get_iScsiName());

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.