NAS BnR: Create Instance from Backup issues #11754

abh1sar · 2025-09-29T13:20:09Z

Description

Fixes Issues

#11631 : Handle create instance from backup if the template was deleted (273920b)

Added Guest OS Type in the backup metadata and giving a warning while creating instance if a template / iso with a different guest OS is selected while creating an instance from backup.

#11746 : Create Instance from Backup on another Zone not showing Zone options for normal Users (35ea878)

#11747 : Reuse IP Address button not showing in Create Instance from Backup (77e9125)

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?

codecov · 2025-09-29T13:28:48Z

Codecov Report

❌ Patch coverage is 32.35294% with 23 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.55%. Comparing base (6089c16) to head (bfaacfa).
⚠️ Report is 20 commits behind head on main.

Files with missing lines	Patch %	Lines
...rg/apache/cloudstack/backup/BackupManagerImpl.java	57.89%	3 Missing and 5 partials ⚠️
server/src/main/java/com/cloud/api/ApiDBUtils.java	0.00%	5 Missing ⚠️
...loudstack/api/response/BackupOfferingResponse.java	0.00%	3 Missing ⚠️
...apache/cloudstack/api/response/BackupResponse.java	0.00%	3 Missing ⚠️
...e/cloudstack/backup/dao/BackupOfferingDaoImpl.java	0.00%	3 Missing ⚠️
...src/main/java/com/cloud/api/ApiResponseHelper.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #11754      +/-   ##
============================================
+ Coverage     17.54%   17.55%   +0.01%     
- Complexity    15469    15517      +48     
============================================
  Files          5897     5906       +9     
  Lines        527426   528487    +1061     
  Branches      64412    64548     +136     
============================================
+ Hits          92522    92786     +264     
- Misses       424507   425265     +758     
- Partials      10397    10436      +39

Flag	Coverage Δ
uitests	`3.59% <ø> (-0.02%)`	⬇️
unittests	`18.62% <32.35%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

abh1sar · 2025-09-29T13:35:49Z

@blueorangutan package

blueorangutan · 2025-09-29T13:38:04Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-29T15:11:55Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15223

abh1sar · 2025-09-29T15:13:42Z

@blueorangutan package

blueorangutan · 2025-09-29T15:16:05Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-29T16:37:26Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15224

api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

sureshanaparti · 2025-10-07T12:06:35Z

@blueorangutan package

blueorangutan · 2025-10-07T12:08:07Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-07T13:54:21Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15321

abh1sar · 2025-10-08T03:31:27Z

@blueorangutan package

blueorangutan · 2025-10-08T03:32:04Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-08T05:10:51Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15330

harikrishna-patnala

code LGTM

blueorangutan · 2025-10-09T15:34:17Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✖️ debian ✔️ suse15. SL-JID 15365

abh1sar · 2025-10-09T16:31:39Z

@blueorangutan package

blueorangutan · 2025-10-09T16:34:03Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-09T17:56:17Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15374

shwstppr

some comments

shwstppr · 2025-10-10T08:17:54Z

ui/src/components/view/DeployVMFromBackup.vue

        this.tabKey = 'isoid'
        this.form.isoid = value
        this.form.templateid = null
+        for (const key in this.options.isos) {


Using showOsTypeWarning as computed variable may have made things easier

I tried using computed variable at first. I found it better this way for templates as the code is already walking through the selected template and reading its properties, so don't need to go through options.templates again in the computed method. I applied the same logic to iso. But I am open to suggestions.

shwstppr · 2025-10-10T08:22:33Z

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

+            details.put(ApiConstants.TEMPLATE_ID, template.getUuid());
+            GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
+            if (guestOS != null) {
+                details.put(ApiConstants.OS_TYPE_ID, guestOS.getUuid());


why not add displayname here itself?

shwstppr · 2025-10-10T08:22:56Z

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

+            GuestOSVO guestOS = _guestOSDao.findByUuid(details.get(ApiConstants.OS_TYPE_ID));
+            if (guestOS != null) {
+                details.put(ApiConstants.OS_NAME, guestOS.getDisplayName());
+            }


get from details?

I followed the same pattern as Template and ServiceOffering as I didn't want to store too many derived properties in the details table. But I guess it is ok for guestOS as it does simplify the code a bit.

shwstppr · 2025-10-10T08:23:57Z

ui/src/components/view/DeployVMFromBackup.vue

+                          </div>
+                        </template>
+                      </a-alert>
+                      <br v-if="showOsTypeWarning"/>


use margin for a-alert?

abh1sar · 2025-10-10T11:57:44Z

@blueorangutan package

blueorangutan · 2025-10-10T11:58:03Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-10T14:10:55Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15399

abh1sar · 2025-10-10T14:33:57Z

@blueorangutan package

blueorangutan · 2025-10-10T14:36:04Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-10T17:00:35Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15405

sureshanaparti · 2025-10-10T17:14:51Z

@blueorangutan package

blueorangutan · 2025-10-10T17:16:03Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-10T18:33:54Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15410

abh1sar · 2025-10-11T02:08:55Z

@blueorangutan test

blueorangutan · 2025-10-11T02:10:04Z

@abh1sar a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-10-11T19:19:17Z

[SF] Trillian test result (tid-14633)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 57856 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11754-t14633-kvm-ol8.zip
Smoke tests completed. 145 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestNASBackupAndRecovery>:setup	`Error`	0.00	test_backup_recovery_nas.py
test_02_enableHumanReadableLogs	`Error`	0.31	test_human_readable_logs.py
test_01_deployVMInSharedNetwork	`Failure`	477.21	test_network.py
test_01_redundant_vpc_site2site_vpn	`Failure`	407.52	test_vpc_vpn.py

abh1sar · 2025-10-13T10:17:29Z

@blueorangutan package

blueorangutan · 2025-10-13T10:18:04Z

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-13T12:05:57Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 15434

sureshanaparti · 2025-10-13T12:13:35Z

@blueorangutan package

blueorangutan · 2025-10-13T12:14:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-10-13T13:47:03Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15438

abh1sar · 2025-10-13T16:13:38Z

@blueorangutan test keepEnv

blueorangutan · 2025-10-13T16:14:04Z

@abh1sar a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

abh1sar added 3 commits September 29, 2025 18:39

add createCrossZoneInstnaceEnabled to BackupOfferingResponse

35ea878

show use IP Address from Backup button when orignal instance is expunged

77e9125

Fix NPE in takeBackup if the vm template is deleted.

273920b

boring-cyborg bot added component:api component:backup component:UI labels Sep 29, 2025

abh1sar added this to the 4.22.0 milestone Sep 30, 2025

abh1sar requested a review from harikrishna-patnala October 1, 2025 05:40

DaanHoogland linked an issue Oct 1, 2025 that may be closed by this pull request

cloudstack 4.21 NAS backup and recovery issue. #11631

Open

sureshanaparti reviewed Oct 7, 2025

View reviewed changes

api/src/main/java/org/apache/cloudstack/api/response/BackupOfferingResponse.java Outdated Show resolved Hide resolved

abh1sar and others added 2 commits October 7, 2025 17:04

Add since to Cross zone instance creation in BackupOfferingResponse.java

bf07a0b

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

Merge branch 'main' into nasbnr

81d6631

sureshanaparti self-assigned this Oct 7, 2025

harikrishna-patnala approved these changes Oct 9, 2025

View reviewed changes

harikrishna-patnala added this to Apache CloudStack 4.22.0 Oct 9, 2025

abh1sar added 2 commits October 9, 2025 12:47

Merge remote-tracking branch 'upstream/main' into nasbnr

3b1e91b

Store and show Guest os type in the backup metadata

fca409e

abh1sar requested a review from sureshanaparti October 10, 2025 07:38

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.0 Oct 10, 2025

shwstppr reviewed Oct 10, 2025

View reviewed changes

review comments

5b5d078

abh1sar requested a review from shwstppr October 10, 2025 11:57

fix npe

bfaacfa

NAS BnR: Create Instance from Backup issues #11754

Are you sure you want to change the base?

NAS BnR: Create Instance from Backup issues #11754

Conversation

abh1sar commented Sep 29, 2025 • 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!

codecov bot commented Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

abh1sar commented Sep 29, 2025

Uh oh!

blueorangutan commented Sep 29, 2025

Uh oh!

blueorangutan commented Sep 29, 2025

Uh oh!

abh1sar commented Sep 29, 2025

Uh oh!

blueorangutan commented Sep 29, 2025

Uh oh!

blueorangutan commented Sep 29, 2025

Uh oh!

Uh oh!

sureshanaparti commented Oct 7, 2025

Uh oh!

blueorangutan commented Oct 7, 2025

Uh oh!

blueorangutan commented Oct 7, 2025

Uh oh!

abh1sar commented Oct 8, 2025

Uh oh!

blueorangutan commented Oct 8, 2025

Uh oh!

blueorangutan commented Oct 8, 2025

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

abh1sar commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

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

abh1sar commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

abh1sar commented Sep 29, 2025 •

edited

Loading

codecov bot commented Sep 29, 2025 •

edited

Loading