Rebase from Apache/main by rajiv-jain-netapp · Pull Request #83 · NetApp/cloudstack

rajiv-jain-netapp · 2026-07-28T12:37:58Z

Description

Fork sync / integration

This PR...

Merges upstream/main (apache/cloudstack) into NetApp fork line
Merges latest NetApp/main (CSTACKEX-158: if ontap snapshot are already delete from ontap side, d… #82 CSTACKEX-158, Multi-Host support for NFS3 and iSCSI #64 multi-host)
Merge of overlapping files with the ONTAP plugin
OntapPrimaryDatastoreDriver.java
StorageStrategy.java
OntapStorageUtils.java (+ CSTACKEX-158 from later NetApp main merge)
OntapVMSnapshotStrategy.java
UnifiedNASStrategy.java / OntapHostListener.java (Multi-Host support for NFS3 and iSCSI #64 multi-host)
SnapshotManagerImpl.java
LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java

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?

…for upload operations

…storage

…revent duplicate volume and primary storage increment on import

apache#12833) Fixes an issue in NsxResource.executeRequest where Network.Service comparison failed when DeleteNsxNatRuleCommand was executed in a different process. Due to serialization/deserialization, the deserialized Network.Service instance was not equal to the static instances Network.Service.StaticNat and Network.Service.PortForwarding, causing the comparison to always return false. Co-authored-by: Andrey Volchkov <avolchkov@playtika.com> (cherry picked from commit 30dd234)

…ations (apache#12883) * Move logs for values of the migration settings out of the loop * Apply suggestions from code review Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com> --------- Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

…pache#12884) * Fix NPE on external/unmanaged instance import using custom offerings

…12885) * Fix revertVM with custom svc offering

* merge conflict fixes * fix pre-commit issue Co-authored-by: Daan Hoogland <dahn@apache.org> Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

… -> 4.23.0 path (apache#13617)

apache#578) (apache#13551) * ConfigureStorageAccessCmd: Allow storage access configuration on empty clusters/pods/zones * update as per comments * update as per review comments * update as per comments --------- (cherry picked from commit 32736b9e262522912cf8755acabfb7400006252f) Co-authored-by: Sachin R <32716246+sachindoddaguni@users.noreply.github.com> Co-authored-by: Sachin R Doddaguni <s_rudrappadoddagu@apple.com> Co-authored-by: mprokopchuk <mprokopchuk@gmail.com>

…he#13642)

…apache#13615) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…ut (apache#13652)

)

…pache#13620)

…upsResponse for non-kboss providers (apache#13661)

* 4.22: UI: fix blank page when list Other OSes in VNF appliance deployment (apache#13620) ConfigureStorageAccessCmd: Allow storage access configuration on empt… (apache#578) (apache#13551)

Integrate upstream/main while preserving NetApp fork commit history. Conflict resolution keeps NetApp ONTAP plugin enhancements, adopts upstream KVM disk-only VM snapshot refactor, and combines ONTAP managed primary snapshot logic with upstream async backup handling in SnapshotManagerImpl. Co-authored-by: Cursor <cursoragent@cursor.com>

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

Bring in CSTACKEX-158 (idempotent ONTAP snapshot delete) and multi-host NFS/iSCSI support (#64) on top of the apache/main sync.

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

Co-authored-by: rajiv-jain-netapp <209083001+rajiv-jain-netapp@users.noreply.github.com>

Copilot

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

DaanHooglandand others added 30 commits February 20, 2026 16:20

[20.3] resource allocation
99e34dd

[20.3] resource instance limits
2671026

[20.3] Implement/fix limit validation for projects
171ff32

[20.3] resource allocation vpc
c9e644a

Check resource reservation on volume creation
d8bdc8b

Fix: KVM Direct Download URL injection
ae177a1

[20.3] handle user's canned policy when a bucket is deleted
d75140b

Check resource reservation on volume snapshot creation
9a4f341

Implement/fix limit validation for secondary storage
b07831b

Fix resource limit reservation and check during StartVirtualMachine
822696c

secondary storage resource limit for download
ca7b08a

volume download fix
ced3629

secondary storage resource limit for upload
021a18d

Consider infinite resources when calculating secondary storage limit …
c522e96
…for upload operations

[20.3] Address limit checks for VM, CPU, memory, volume, and primary …
2377dc5
…storage

Cleanup imported VM from disk on failure due to volume allocation + p…
08bb37a
…revent duplicate volume and primary storage increment on import

Fix failing tests
928dc7d

Address public IP limit validations
3f4f574

review comments
a09835b

fix identation
4a691f4

Fix copy snapshot resource limit
f6cad87

Merge branch '4.20' into 20.3.0-sec
ce52b9d

Fix snapshot copy resource limit concurrency
639ceee

fix end of file schema-42200to42210.sql
6c1437b

Fix NPE on external/unmanaged instance import using custom offerings (a…
89d9154
…pache#12884) * Fix NPE on external/unmanaged instance import using custom offerings

Fix Revert Instance to Snapshot with custom service offering (apache#…
a127a26
…12885) * Fix revertVM with custom svc offering

Flexibilize public IP selection (apache#11076)
9f96c9d

merge conflict fixes (apache#13046)
64ac082
* merge conflict fixes * fix pre-commit issue Co-authored-by: Daan Hoogland <dahn@apache.org> Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

winterhazeland others added 13 commits July 14, 2026 19:01

upgrade: Include the database changes fromapache#13019in the 4.22.1…
75748a5
… -> 4.23.0 path (apache#13617)

fix(ui): restore Account column hyperlink routing in list views (apac…
cddd383
…he#13642)

server: fix clone network offerings with detail internetProtocol=IPv4 (…
7900b27
…apache#13615) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Use correct ID to get value of backup.validation.script.default.timeo…
fc83241
…ut (apache#13652)

nasbackup: fix backup stopped vm on Ubuntu 26.04 (apache#13643)
0da3740

nasbackup: fix agent.log is cleaned when backup stopped vm (apache#13641
424f0df
)

UI: fix blank page when list Other OSes in VNF appliance deployment (a…
0339f31
…pache#13620)

Ignore projectid=-1 on Quota summary (apache#13658)
8148c53

Don't set compressionstatus and validationstatus in backupVO and back…
3b53e8c
…upsResponse for non-kboss providers (apache#13661)

Merge branch 4.22 to main
e1cf0f3
* 4.22: UI: fix blank page when list Other OSes in VNF appliance deployment (apache#13620) ConfigureStorageAccessCmd: Allow storage access configuration on empt… (apache#578) (apache#13551)

KBOSS - Remove backup chain separation (apache#13680)
4f11707

CopilotAI lite review requested due to automatic review settings July 28, 2026 12:37

CopilotAI reviewed Jul 28, 2026

rajiv-jain-netapp requested review from piyush5netapp and suryag1201 July 28, 2026 13:02

Merge NetApp main into feature/CSTACKEX-228
bb40df1
Bring in CSTACKEX-158 (idempotent ONTAP snapshot delete) and multi-host NFS/iSCSI support (#64) on top of the apache/main sync.

CopilotAI review requested due to automatic review settings July 29, 2026 13:43

CopilotAI reviewed Jul 29, 2026

rajiv-jain-netapp changed the title ~~Feature/cstackex 228~~Rebase from Apache/mainJul 30, 2026

merge conflict resolution
430dc8d

CopilotAI review requested due to automatic review settings August 5, 2026 05:46

CopilotAI reviewed Aug 5, 2026

Copilotstarted work on behalf of rajiv-jain-netapp August 6, 2026 05:10 View session

ci: skip codecov upload for fork PRs
7c0ae5e
Co-authored-by: rajiv-jain-netapp <209083001+rajiv-jain-netapp@users.noreply.github.com>

CopilotAI review requested due to automatic review settings August 6, 2026 05:12

CopilotAI reviewed Aug 6, 2026

Copilot stopped work on behalf of rajiv-jain-netapp due to an error August 6, 2026 05:15
The session was cancelled by the user.

rajiv-jain-netapp closed this Aug 6, 2026

Navigation Menu

Uh oh!

Rebase from Apache/main - #83

Rebase from Apache/main#83
rajiv-jain-netapp wants to merge 225 commits into
mainfrom
feature/CSTACKEX-228

rajiv-jain-netapp commented Jul 28, 2026•
edited
Loading

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAI left a comment

Uh oh!

CopilotAI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

rajiv-jain-netapp commented Jul 28, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

rajiv-jain-netapp commented Jul 28, 2026•
edited
Loading