Skip to content

Commit c3d5fec

Browse files
committed
backupvmexpunged -> isbackupvmexpunged
1 parent da3be68 commit c3d5fec

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class ApiConstants {
6464
public static final String BACKUP_STORAGE_LIMIT = "backupstoragelimit";
6565
public static final String BACKUP_STORAGE_TOTAL = "backupstoragetotal";
6666
public static final String BACKUP_VM_OFFERING_REMOVED = "vmbackupofferingremoved";
67-
public static final String BACKUP_VM_EXPUNGED = "backupvmexpunged";
67+
public static final String IS_BACKUP_VM_EXPUNGED = "isbackupvmexpunged";
6868
public static final String BACKUP_TOTAL = "backuptotal";
6969
public static final String BASE64_IMAGE = "base64image";
7070
public static final String BGP_PEERS = "bgppeers";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ public class BackupResponse extends BaseResponse {
123123
@Param(description = "The backup offering corresponding to this backup was removed from the VM", since = "4.21.0")
124124
private Boolean vmOfferingRemoved;
125125

126-
@SerializedName(ApiConstants.BACKUP_VM_EXPUNGED)
127-
@Param(description = "The VM from which the backup was taken is expunged", since = "4.22.0")
128-
private Boolean vmExpunged;
126+
@SerializedName(ApiConstants.IS_BACKUP_VM_EXPUNGED)
127+
@Param(description = "Indicates whether the VM from which the backup was taken is expunged or not", since = "4.22.0")
128+
private Boolean isVmExpunged;
129129

130130
public String getId() {
131131
return id;
@@ -311,7 +311,7 @@ public void setVmOfferingRemoved(Boolean vmOfferingRemoved) {
311311
this.vmOfferingRemoved = vmOfferingRemoved;
312312
}
313313

314-
public void setVmExpunged(Boolean vmExpunged) {
315-
this.vmExpunged = vmExpunged;
314+
public void setVmExpunged(Boolean isVmExpunged) {
315+
this.isVmExpunged = isVmExpunged;
316316
}
317317
}

ui/src/views/storage/CreateVMFromBackup.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<a-form-item :label="$t('label.name.optional')" name="name">
3030
<a-input v-model:value="form.name" />
3131
</a-form-item>
32-
<a-form-item v-if="resource.backupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">
32+
<a-form-item v-if="resource.isbackupvmexpunged" name="preserveIpAddresses" style="margin-top: 8px">
3333
<a-switch v-model:checked="form.preserveIpAddresses" />
3434
<template #label>
3535
<tooltip-label :title="$t('label.use.backup.ip.address')" :tooltip="$t('label.use.backup.ip.address.tooltip')"/>
@@ -130,7 +130,7 @@ export default {
130130
this.dataPreFill.templateid = this.vmdetails.templateid
131131
this.dataPreFill.allowtemplateisoselection = true
132132
this.dataPreFill.isoid = this.vmdetails.templateid
133-
this.dataPreFill.allowIpAddressesFetch = this.resource.backupvmexpunged
133+
this.dataPreFill.allowIpAddressesFetch = this.resource.isbackupvmexpunged
134134
if (this.vmdetails.nics) {
135135
const nics = JSON.parse(this.vmdetails.nics)
136136
this.dataPreFill.networkids = nics.map(nic => nic.networkid)

0 commit comments

Comments
 (0)