From 762a4c97c9d3cfeaeb2cef1f0853204fd1bc02b6 Mon Sep 17 00:00:00 2001
From: Sathvika <sr73318@netapp.com>
Date: Fri, 25 Sep 2026 14:56:42 +0530
Subject: [PATCH 1/2] =?UTF-8?q?CSTACKEX-321:=20when=20nothing=20is=20chang?=
 =?UTF-8?q?ed=20in=20volume=20resize=20wizard=20directl=E2=80=A6=20(#110)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Calling resizeVolume with the existing volume size still invoked the
storage driver, causing an unnecessary driver resize request for
volumes.
### Description

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 -->
<!---
*******************************************************************************
-->

### 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
- [ ] Major
- [X] Minor
- [ ] Trivial

### Screenshots (if appropriate):
Before Patch API is still called in case of no changes in the wizard:
<img width="1423" height="1034" alt="Screenshot 2026-09-24 at 4 33
33 PM"
src="https://github.com/user-attachments/assets/5480986e-bc79-4bc7-b05c-62077c2cc93e"
/>

actually resizes (IN UI)
<img width="1441" height="638" alt="Screenshot 2026-09-24 at 4 36 00 PM"
src="https://github.com/user-attachments/assets/8430eaa3-947e-41d4-8573-518f7831d7f0"
/>


after the fix Patch api is not called :
<img width="1393" height="1035" alt="Screenshot 2026-09-24 at 4 17
52 PM"
src="https://github.com/user-attachments/assets/b53e1146-560a-437a-9b0c-501be9ec4d76"
/>

Shows success immediately:
<img width="1471" height="728" alt="Screenshot 2026-09-24 at 4 28 37 PM"
src="https://github.com/user-attachments/assets/9cdd57b0-2b1f-4550-9830-46f87c439061"
/>



### How Has This Been Tested?

<!-- 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 -->
---
 .../java/com/cloud/storage/VolumeApiServiceImpl.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 8674014addd7..faee433583cc 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1446,11 +1446,12 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
             if (currentSize != newSize || !compareEqualsIncludingNullOrZero(newMaxIops, volume.getMaxIops()) || !compareEqualsIncludingNullOrZero(newMinIops, volume.getMinIops())) {
                 volumeResizeRequired = true;
             }
-            if (!volumeMigrateRequired && !volumeResizeRequired && newDiskOffering != null) {
-                _volsDao.updateDiskOffering(volume.getId(), newDiskOffering.getId());
+            if (!volumeMigrateRequired && !volumeResizeRequired) {
                 volume = _volsDao.findById(volume.getId());
-                updateStorageWithTheNewDiskOffering(volume, newDiskOffering);
-
+                if (newDiskOffering != null) {
+                    _volsDao.updateDiskOffering(volume.getId(), newDiskOffering.getId());
+                    updateStorageWithTheNewDiskOffering(volume, newDiskOffering);
+                }
                 return volume;
             }
 

From 43f463bffd6ab64441e1410fd1701fb1678cff26 Mon Sep 17 00:00:00 2001
From: Sathvika <sr73318@netapp.com>
Date: Tue, 13 Oct 2026 16:08:19 +0530
Subject: [PATCH 2/2] =?UTF-8?q?CSTACKEX-341:=20when=20disk=20offering=20pa?=
 =?UTF-8?q?rameter=20is=20same=20as=20the=20existing=20in=E2=80=A6=20(#120?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… volume resize return early

### Description

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 -->
<!---
*******************************************************************************
-->

### 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
- [X] Minor

#### Bug Severity

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

### Screenshots (if appropriate):

### How Has This Been Tested?

In case a newerdiskofferingID is mentioned in API then it updates the
DB.
<img width="1394" height="814" alt="Screenshot 2026-10-13 at 11 53
33 AM"
src="https://github.com/user-attachments/assets/9b4e8249-c639-4d29-8ca4-9431b4f1b6cd"
/>

when same ID is given then it immediately returns.
<img width="1404" height="522" alt="Screenshot 2026-10-13 at 11 53
44 AM"
src="https://github.com/user-attachments/assets/d6d0350c-464b-4644-9470-b8879ebdb48c"
/>


<!-- 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 -->
---
 .../main/java/com/cloud/storage/VolumeApiServiceImpl.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index faee433583cc..37fe2c7dee11 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1447,9 +1447,10 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep
                 volumeResizeRequired = true;
             }
             if (!volumeMigrateRequired && !volumeResizeRequired) {
-                volume = _volsDao.findById(volume.getId());
-                if (newDiskOffering != null) {
+
+                if (newDiskOffering != null && newDiskOffering.getId()!=diskOffering.getId()) {
                     _volsDao.updateDiskOffering(volume.getId(), newDiskOffering.getId());
+                    volume = _volsDao.findById(volume.getId());
                     updateStorageWithTheNewDiskOffering(volume, newDiskOffering);
                 }
                 return volume;