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 30.30303% with 23 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.56%. Comparing base (6089c16) to head (c3d5fec).
⚠️ Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
...rg/apache/cloudstack/backup/BackupManagerImpl.java	55.55%	4 Missing and 4 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.56%   +0.02%     
- Complexity    15469    15498      +29     
============================================
  Files          5897     5898       +1     
  Lines        527426   527802     +376     
  Branches      64412    64482      +70     
============================================
+ Hits          92522    92706     +184     
- Misses       424507   424668     +161     
- Partials      10397    10428      +31

Flag	Coverage Δ
uitests	`3.59% <ø> (-0.01%)`	⬇️
unittests	`18.62% <30.30%> (+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

…different

sureshanaparti · 2025-10-09T09:16:25Z

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

    @Param(description = "The backup offering corresponding to this backup was removed from the VM", since = "4.21.0")
    private Boolean vmOfferingRemoved;

+    @SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)


Suggested change

@SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)

@SerializedName(ApiConstants.IS_BACKUP_VM_EXPUNGED)

sureshanaparti · 2025-10-09T09:17:37Z

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

    private Boolean vmOfferingRemoved;

+    @SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)
+    @Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")


Suggested change

@Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")

@Param(description = "Indicates whether the VM from which the backup was taken is expunged or not", since = "4.22.0")

sureshanaparti · 2025-10-09T09:17:51Z

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


+    @SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)
+    @Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")
+    private Boolean vmExpunged;


Suggested change

private Boolean vmExpunged;

private Boolean isVmExpunged;

sureshanaparti · 2025-10-09T09:34:50Z

ui/src/views/storage/CreateVMFromBackup.vue

          <a-input v-model:value="form.name" />
        </a-form-item>
-        <a-form-item v-if="!resource.virtualmachineid" name="preserveIpAddresses" style="margin-top: 8px">
+        <a-form-item v-if="resource.backupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">


Suggested change

<a-form-item v-if="resource.backupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">

<a-form-item v-if="resource.isbackupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">

sureshanaparti · 2025-10-09T09:35:02Z

ui/src/views/storage/CreateVMFromBackup.vue

      this.dataPreFill.allowtemplateisoselection = true
      this.dataPreFill.isoid = this.vmdetails.templateid
-      this.dataPreFill.allowIpAddressesFetch = !this.resource.virtualmachineid
+      this.dataPreFill.allowIpAddressesFetch = this.resource.backupvmexpunged


Suggested change

this.dataPreFill.allowIpAddressesFetch = this.resource.backupvmexpunged

this.dataPreFill.allowIpAddressesFetch = this.resource.isbackupvmexpunged

sureshanaparti · 2025-10-09T09:35:18Z

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

    public static final String BACKUP_STORAGE_LIMIT = "backupstoragelimit";
    public static final String BACKUP_STORAGE_TOTAL = "backupstoragetotal";
    public static final String BACKUP_VM_OFFERING_REMOVED = "vmbackupofferingremoved";
+    public static final String BACKUP_VM_EXPUNGED = "backupvmexpunged";


Suggested change

public static final String BACKUP_VM_EXPUNGED = "backupvmexpunged";

public static final String IS_BACKUP_VM_EXPUNGED = "isbackupvmexpunged";

…different

sureshanaparti · 2025-10-09T12:13:24Z

@blueorangutan package

blueorangutan · 2025-10-09T12: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.

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

show warning in create instance from backup form if guest os type is …

ee4ae2c

…different

sureshanaparti reviewed Oct 9, 2025

View reviewed changes

abh1sar added 2 commits October 9, 2025 17:30

show warning in create instance from backup form if guest os type is …

da3be68

…different

backupvmexpunged -> isbackupvmexpunged

c3d5fec

	@SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)
	@SerializedName(ApiConstants.IS_BACKUP_VM_EXPUNGED)

	@Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")
	@Param(description = "Indicates whether the VM from which the backup was taken is expunged or not", since = "4.22.0")

	<a-form-item v-if="resource.backupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">
	<a-form-item v-if="resource.isbackupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">

	this.dataPreFill.allowIpAddressesFetch = this.resource.backupvmexpunged
	this.dataPreFill.allowIpAddressesFetch = this.resource.isbackupvmexpunged

	public static final String BACKUP_VM_EXPUNGED = "backupvmexpunged";
	public static final String IS_BACKUP_VM_EXPUNGED = "isbackupvmexpunged";

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

Uh oh!

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!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Oct 9, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

Uh oh!

abh1sar commented Sep 29, 2025 •

edited

Loading

codecov bot commented Sep 29, 2025 •

edited

Loading