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

Author: abh1sar

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

@@ -63,6 +63,7 @@ public class ApiConstants {
     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";
     public static final String BACKUP_TOTAL = "backuptotal";
     public static final String BASE64_IMAGE = "base64image";
     public static final String BGP_PEERS = "bgppeers";

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

@@ -123,6 +123,10 @@ public class BackupResponse extends BaseResponse {
     @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)
+    @Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")
+    private Boolean vmExpunged;
+
     public String getId() {
         return id;
     }
@@ -306,4 +310,8 @@ public Boolean getVmOfferingRemoved() {
     public void setVmOfferingRemoved(Boolean vmOfferingRemoved) {
         this.vmOfferingRemoved = vmOfferingRemoved;
     }
+
+    public void setVmExpunged(Boolean vmExpunged) {
+        this.vmExpunged = vmExpunged;
+    }
 }

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

@@ -2136,10 +2136,15 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails)
         response.setId(backup.getUuid());
         response.setName(backup.getName());
         response.setDescription(backup.getDescription());
-        response.setVmName(vm.getHostName());
-        response.setVmId(vm.getUuid());
-        if (vm.getBackupOfferingId() == null || vm.getBackupOfferingId() != backup.getBackupOfferingId()) {
-            response.setVmOfferingRemoved(true);
+        if (vm != null) {
+            response.setVmName(vm.getHostName());
+            response.setVmId(vm.getUuid());
+            if (vm.getBackupOfferingId() == null || vm.getBackupOfferingId() != backup.getBackupOfferingId()) {
+                response.setVmOfferingRemoved(true);
+            }
+        }
+        if (vm == null || VirtualMachine.State.Expunging.equals(vm.getState())) {
+            response.setVmExpunged(true);
         }
         response.setExternalId(backup.getExternalId());
         response.setType(backup.getType());
@@ -2155,9 +2160,11 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails)
             }
         }
         // ACS 4.20: For backups taken prior this release the backup.backed_volumes column would be empty hence use vm_instance.backup_volumes
-        String backedUpVolumes;
+        String backedUpVolumes = "";
         if (Objects.isNull(backup.getBackedUpVolumes())) {
-            backedUpVolumes = new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class);
+            if (vm != null) {
+                backedUpVolumes = new Gson().toJson(vm.getBackupVolumeList().toArray(), Backup.VolumeInfo[].class);
+            }
         } else {
             backedUpVolumes = new Gson().toJson(backup.getBackedUpVolumes().toArray(), Backup.VolumeInfo[].class);
         }

ui/src/views/storage/CreateVMFromBackup.vue

@@ -29,7 +29,7 @@
         <a-form-item :label="$t('label.name.optional')" name="name">
           <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">
           <a-switch v-model:checked="form.preserveIpAddresses" />
           <template #label>
             <tooltip-label :title="$t('label.use.backup.ip.address')" :tooltip="$t('label.use.backup.ip.address.tooltip')"/>
@@ -128,7 +128,7 @@ export default {
       this.dataPreFill.templateid = this.vmdetails.templateid
       this.dataPreFill.allowtemplateisoselection = true
       this.dataPreFill.isoid = this.vmdetails.templateid
-      this.dataPreFill.allowIpAddressesFetch = !this.resource.virtualmachineid
+      this.dataPreFill.allowIpAddressesFetch = this.resource.backupvmexpunged
       if (this.vmdetails.nics) {
         const nics = JSON.parse(this.vmdetails.nics)
         this.dataPreFill.networkids = nics.map(nic => nic.networkid)