Sync/apache main apr 2026 by piyush5netapp · Pull Request #44 · NetApp/cloudstack

piyush5netapp · 2026-04-14T06:17:54Z

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

Screenshots (if appropriate):

How Has This Been Tested?

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

* noVNC: support Spanish Latin American keyboard * Update server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

…#12559) * Fix template details deletion while updating template from UI * update the latest template details before submit

…ffering (apache#12555)

…riptions (apache#12502)

…quest apache#11497) (apache#12380)

…iders configured (apache#12550)

* 4.22: Fixes issue with loading Capacity dashboard when mulitple backup providers configured (apache#12550)

…e#12562)

…e#12626)

…running (apache#12616)

…/domain) (apache#12294) * API modifications for passwordchangerequired * ui login flow for passwordchangerequired * add passwordchangerequired in listUsers API response, it will be used in UI to render reset password form * cleanup redundant LOGIN_SOURCE and limiting apis for first time login * address copilot comments * allow enforcing password change for all role types and update reset pwd flow for passwordchangerequired * address review comments * add unit tests * cleanup ispasswordchangerequired from user_view * address review comments * 1. Allow enforcing password change while creating user 2. Admin can enforce password change on next login with out resetting password * address review comment, add unit test * improve code coverage * fix pre-commit license issue * 1. allow enter key to submit change password form 2. hide force password reset for disabled/locked user in ui * 1. throw exception when force reset password is done for locked/disabled user/account 2. ui validation on current and new password being same 3. allow enforce change password for add user until saml is not enabled * allow oauth login to skip force password change

* 4.22: Fix issue when restoring backup after migration of volume (apache#12549) Usage: Heartbeat should not schedule usage job when a job is already running (apache#12616) Allow limit queries without random ordering (apache#12598) engine/schema: fix cluster/zone settings with encrypted values (apache#12626) Fix injection of preset variables into the JS interpreter (apache#12515) Fix issue with multiple KVM Host entries in host table (apache#12589) Add a Prometheus metric to track host certificate expiry (apache#12613) ssvm: delete temp directory while deleting entity download url (apache#12562)

…he#12653)

…PCI class (apache#12981) * Fix domain parsing for GPU * Add Display controller to GPU class check this adds support for the amd instinct mi2xx accelorator crards in the discovery script. Co-authored-by: Piet Braat <piet@phiea.nl>

…as cut by GROUP_CONCAT (apache#12777)

…he#12964) * Introduce configurable timeout to Create NAS backup * use timeout set via "commands.timeout"

…pache#12945)

* Unhide setting 'js.interpretation.enabled' * Fix grammar mistake

… StoragePool with ONTAP storage (apache#12563) * Create & Delete, Enable & Disable, Enter & Cancel maintenance of Primary StoragePool with ONTAP storage Co-authored-by: Rajiv Jain <Rajiv.Jain@netapp.com> Create & Delete, Enable & Disable, Enter & Cancel maintenance of Primary StoragePool with ONTAP storage Co-authored-by: Rajiv Jain<rajiv1@netapp.com> Edited readme file Fixed license check issue Removed dependency that's not conforming with ACF guidelines * Fixed the initial review comments * Fixed some rebase issues --------- Co-authored-by: Locharla, Sandeep <Sandeep.Locharla@netapp.com>

* New config.json variable to set the ACS default language * Address review

github-actions · 2026-04-16T06:13:52Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

…main-apr-2026

sandeeplocharla

There was a comment on public PR requesting the following modularisation in HostListener:
Logic in public boolean hostDisconnected(Host host, StoragePool pool) should be refactored to * public boolean hostDisconnected(long hostId, long poolId)* and public boolean hostDisconnected(long hostId, long poolId) should be called from public boolean hostDisconnected(Host host, StoragePool pool)

sandeeplocharla · 2026-04-20T15:10:54Z

@@ -343,11 +341,12 @@ private void deleteOntapSnapshot(SnapshotInfo snapshotInfo, CommandResult comman

    @Override
    public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
+        throw new UnsupportedOperationException("Copy operation is not supported for ONTAP primary storage.");


This might cause an issue while creating instances, please keep an eye on this while testing

can you share the reason for this suspect ?

I was suspecting this method to be called during instance creation, but I went back and checked the code. Since, we're returning canCopy as false, there shouldn't be an issue

sandeeplocharla · 2026-04-20T15:15:07Z

-        ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
-        // Connect to ONTAP and create volume
-        long volumeSize = Long.parseLong(details.get(Constants.SIZE));
+//        long volumeSize = Long.parseLong(details.get(OntapStorageConstants.SIZE));


This could be deleted

sandeeplocharla · 2026-04-20T15:17:55Z

-            s_logger.info("Validating SVM state and protocol settings...");
-            if (!Objects.equals(svm.getState(), Constants.RUNNING)) {
-                s_logger.error("SVM " + svmName + " is not in running state.");
+            logger.info("Validating SVM state and protocol settings...");


Received a comment on the community PR to modularize the validations and choosing aggregates. Please see if it would be possible to take it up

refer my previous response on similar comment earlier

Sure, will create a jira

sandeeplocharla · 2026-04-20T15:20:22Z

-                        s_logger.error("assignExportPolicyToVolume: Job to update volume " + volumeUuid + " did not complete within expected time.");
+                while(createVolumeJob == null || !createVolumeJob.getState().equals(OntapStorageConstants.JOB_SUCCESS)) {
+                    if(jobRetryCount >= OntapStorageConstants.JOB_MAX_RETRIES) {
+                        logger.error("Job to update volume " + volumeUuid + " did not complete within expected time.");


Please add method name here and other places like in warn & trace logs also (wherever missing)

sandeeplocharla · 2026-04-20T15:24:08Z

            throw new CloudRuntimeException("Failed to assign export policy: " + e.getMessage());
        } catch (Exception e) {
-            s_logger.error("assignExportPolicyToVolume: Exception while assigning export policy to volume: {}", volumeUuid, e);
+            logger.error("assignExportPolicyToVolume: Exception while assigning export policy to volume: {}", volumeUuid, e);
            throw new CloudRuntimeException("Failed to assign export policy: " + e.getMessage());
        }
    }

    private boolean createFile(String volumeUuid, String filePath, FileInfo fileInfo) {


Please check if we are using "createFile", "deleteFile" and "updateFile". If not make sure to not include these while raising community PR

sandeeplocharla · 2026-04-20T15:25:18Z

           return volumeUuid;
       }catch (Exception e){
-           s_logger.error("updateCloudStackVolumeMetadata: Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
+           logger.error("updateCloudStackVolumeMetadata: Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
           throw new CloudRuntimeException("Exception while updating volumeInfo: " + e.getMessage());
       }
    }

    private Answer createVolumeOnKVMHost(DataObject volumeInfo) {


Btw, just an observation, probably these methods should've been *FileOnKVMHost

It varies from the developer's perception. I am fine with both the conventions. One is from CloudStack perception, where we refer to them as CS-volume, aka volume, and from the storage side, file for NAS.

Sure, just a thought as the name has KVMHost reference, felt it would be more appropriate to have File instead of Volume

sandeeplocharla · 2026-04-20T15:27:52Z

            }
        } catch (Exception e) {
-            s_logger.warn("getLogicalAccess: LunMap not found for Lun: {} and igroup: {} ({}).", lunName, igroupName, e.getMessage());
+            logger.warn("getLogicalAccess: LunMap not found for Lun: {} and igroup: {} ({}).", lunName, igroupName, e.getMessage());
        }
        return null;
    }

    @Override
    public String ensureLunMapped(String svmName, String lunName, String accessGroupName) {


Reminder: To be refactored

sandeeplocharla · 2026-04-20T15:34:09Z

@@ -98,43 +97,15 @@ public DataStore initialize(Map<String, Object> dsInfos) {
        String tags = (String) dsInfos.get("tags");
        Boolean isTagARule = (Boolean) dsInfos.get("isTagARule");


There was a suggestion on community PR to introduce StorageAccessGroups here
String storageAccessGroups = (String)dsInfos.get(ApiConstants.STORAGE_ACCESS_GROUPS); ... parameters.setStorageAccessGroups(storageAccessGroups);

Can you create a Jira ticket consolidating all these community pending comments? we will pick them together.

piyush5netapp · 2026-04-21T05:44:51Z

Changes looks good. Please add some tesing details.

rajiv-jain-netapp · 2026-04-21T05:47:29Z

@@ -343,11 +341,12 @@ private void deleteOntapSnapshot(SnapshotInfo snapshotInfo, CommandResult comman

    @Override
    public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
+        throw new UnsupportedOperationException("Copy operation is not supported for ONTAP primary storage.");


can you share the reason for this suspect ?

rajiv-jain-netapp · 2026-04-21T05:49:56Z

@@ -98,43 +97,15 @@ public DataStore initialize(Map<String, Object> dsInfos) {
        String tags = (String) dsInfos.get("tags");
        Boolean isTagARule = (Boolean) dsInfos.get("isTagARule");


Can you create a Jira ticket consolidating all these community pending comments? we will pick them together.

rajiv-jain-netapp · 2026-04-21T05:53:58Z

-            s_logger.info("Validating SVM state and protocol settings...");
-            if (!Objects.equals(svm.getState(), Constants.RUNNING)) {
-                s_logger.error("SVM " + svmName + " is not in running state.");
+            logger.info("Validating SVM state and protocol settings...");


refer my previous response on similar comment earlier

rajiv-jain-netapp · 2026-04-21T05:56:56Z

@@ -237,49 +257,61 @@ public Volume createStorageVolume(String volumeName, Long size) {
            }
            String jobUUID = jobResponse.getJob().getUuid();

-            //Create URI for GET Job API
-            Boolean jobSucceeded = jobPollForSuccess(jobUUID, 10, 1);
+            Boolean jobSucceeded = jobPollForSuccess(jobUUID,OntapStorageConstants.JOB_MAX_RETRIES, OntapStorageConstants.CREATE_VOLUME_CHECK_SLEEP_TIME);


this needs to check since constants have more values for retries and sleep-time as 10 and 1

rajiv-jain-netapp · 2026-04-21T06:04:44Z

           return volumeUuid;
       }catch (Exception e){
-           s_logger.error("updateCloudStackVolumeMetadata: Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
+           logger.error("updateCloudStackVolumeMetadata: Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
           throw new CloudRuntimeException("Exception while updating volumeInfo: " + e.getMessage());
       }
    }

    private Answer createVolumeOnKVMHost(DataObject volumeInfo) {


It varies from the developer's perception. I am fine with both the conventions. One is from CloudStack perception, where we refer to them as CS-volume, aka volume, and from the storage side, file for NAS.

suryag1201

1-volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ OntapStorage.java This file, i have also modified for storageIP and disaggregated flag

suryag1201 · 2026-04-21T07:21:09Z

-            throw new CloudRuntimeException("ONTAP primary storage creation failed, missing detail(s): " + missing);
-        }
+        details.put(OntapStorageConstants.SIZE, capacityBytes.toString());
+        details.putIfAbsent(OntapStorageConstants.IS_DISAGGREGATED, "false");


this field check we have removed it

suryag1201 · 2026-04-21T07:23:52Z

-        if (providerName == null || providerName.isEmpty()) {
-            throw new CloudRuntimeException("Provider name is null or empty, cannot create primary storage");
-        }
+        capacityBytes = validateInitializeInputs(capacityBytes, podId, clusterId, zoneId, storagePoolName, providerName, managed, details);


why to return capacityBytes, can we set inside the validateInitializeInputs methods.
Also, method name is not aligning with the operation is is doing as it is also setting the values

We can take this as part of a refactor separately, pls add a task in the existing Jira or add a new jira.
This PR is focused on rebasing the available changes.

suryag1201

please check the changes for ui/src/views/infra/AddPrimaryStorage.vue this file also

rajiv-jain-netapp · 2026-04-21T08:09:17Z

please check the changes for ui/src/views/infra/AddPrimaryStorage.vue this file also

Could you please specify what to check?

weizhouapache and others added 30 commits February 2, 2026 15:16

noVNC: support Spanish Latin American keyboard on VMware (apache#12484)

b869913

* noVNC: support Spanish Latin American keyboard * Update server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

Fix template details deletion while updating template from UI (apache…

ce42ce5

…#12559) * Fix template details deletion while updating template from UI * update the latest template details before submit

Preserve VM settings on Instance Snapshot revert for Custom Service O…

9ae696d

…ffering (apache#12555)

Mvn updates (apache#12575)

349eea5

Create new generic method for resource UUID obtention in event's desc…

e32d08e

…riptions (apache#12502)

UI: Add comprehensive domain deletion confirmation dialog (Feature Re…

3d7d412

…quest apache#11497) (apache#12380)

Merge branch '4.20' into 4.22

cd6a8f6

ui build fixes (after merge)

53c98c3

Merge branch '4.22'

e929f20

Merge branch '4.22'

408e8c0

Fixes issue with loading Capacity dashboard when mulitple backup prov…

a0f35a1

…iders configured (apache#12550)

Merge branch '4.20' into 4.22

7324ef4

Merge release branch 4.22 to main

d3e1976

* 4.22: Fixes issue with loading Capacity dashboard when mulitple backup providers configured (apache#12550)

ssvm: delete temp directory while deleting entity download url (apach…

b45726f

…e#12562)

Add a Prometheus metric to track host certificate expiry (apache#12613)

4de8c2b

Fix issue with multiple KVM Host entries in host table (apache#12589)

b7c970f

Fix injection of preset variables into the JS interpreter (apache#12515)

34f6f41

Remove and Update collaborators list in .asf.yaml (apache#12627)

b1edfb8

engine/schema: fix cluster/zone settings with encrypted values (apach…

18d6659

…e#12626)

Allow limit queries without random ordering (apache#12598)

e22f842

Usage: Heartbeat should not schedule usage job when a job is already …

d8230c9

…running (apache#12616)

Fix issue when restoring backup after migration of volume (apache#12549)

ae5308b

Merge branch '4.20' into '4.22'

11df71e

constructing the expiry Prometheus Item according to new format (apac…

22cda0c

…he#12653)

Remove acs-robot from collaborators list

62eb4b7

Agentic workflow experiment (apache#12652)

a1bcae9

agentic workflow daily report

c0db75b

Fix NPE during reset password (apache#12585)

8c12a13

vishesh92 and others added 9 commits April 10, 2026 09:23

replace GROUP_CONCAT with JSON_ARRAYAGG to avoid errors like Row 19 w…

4ba4bd3

…as cut by GROUP_CONCAT (apache#12777)

Support timeout configuration for Create and Restore NAS backup (apac…

68bd056

…he#12964) * Introduce configurable timeout to Create NAS backup * use timeout set via "commands.timeout"

Do not include snapshots with Group type in snapshots resource count (a…

7b46749

…pache#12945)

Fix snapshot chaining on Xen (apache#12597)

2a60305

Merge branch '4.22'

11538df

Unhide setting js.interpretation.enabled (apache#12605)

9f57a4d

* Unhide setting 'js.interpretation.enabled' * Fix grammar mistake

New config.json variable to set the ACS default language (apache#12863)

ed575cc

* New config.json variable to set the ACS default language * Address review

github-actions Bot added the status:has-conflicts label Apr 16, 2026

rajiv-jain-netapp added 2 commits April 20, 2026 09:33

Merge branch 'main' of github.com:netapp/cloudstack into sync/apache-…

b58fd24

…main-apr-2026

Resolving conflicts from rebase

0f5370a

github-actions Bot removed the status:has-conflicts label Apr 20, 2026

conflicts are resolvd which are originated from rebase

ddb119f

sandeeplocharla reviewed Apr 20, 2026

View reviewed changes

piyush5netapp commented Apr 21, 2026

View reviewed changes

Comment thread ...ap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

Comment thread ...ap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

sandeeplocharla approved these changes Apr 21, 2026

View reviewed changes

rajiv-jain-netapp reviewed Apr 21, 2026

View reviewed changes

suryag1201 reviewed Apr 21, 2026

View reviewed changes

Comment thread ...ap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

suryag1201 reviewed Apr 21, 2026

View reviewed changes

Correction on conflict resolution

929d30f

suryag1201 approved these changes Apr 21, 2026

View reviewed changes

Correction on merge conflicts for constants

a20b6cc

piyush5netapp merged commit 5da4a98 into main Apr 21, 2026
20 of 21 checks passed

		@@ -98,43 +97,15 @@ public DataStore initialize(Map<String, Object> dsInfos) {
		String tags = (String) dsInfos.get("tags");
		Boolean isTagARule = (Boolean) dsInfos.get("isTagARule");

Conversation

piyush5netapp commented Apr 14, 2026

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

sandeeplocharla left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

piyush5netapp commented Apr 21, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

suryag1201 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

suryag1201 left a comment

Choose a reason for hiding this comment

Uh oh!

rajiv-jain-netapp commented Apr 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects