Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,10 @@

public BackupVO() {
this.uuid = UUID.randomUUID().toString();
this.compressionStatus = CompressionStatus.Uncompressed;
this.validationStatus = ValidationStatus.NotValidated;
}

public BackupVO(String name, long vmId, long backupOfferingId, long accountId, long domainId, long zoneId, long virtualSize, Status status, Long backupScheduleId) {
public BackupVO(String name, long vmId, long backupOfferingId, long accountId, long domainId, long zoneId, long virtualSize,

Check warning on line 133 in engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Constructor has 11 parameters, which is greater than 7 authorized.

See more on https://sonarcloud.io/project/issues?id=apache_cloudstack&issues=AZ-F4z7QzRB5sW_AElNX&open=AZ-F4z7QzRB5sW_AElNX&pullRequest=13661
Status status, Long backupScheduleId, CompressionStatus compressionStatus, ValidationStatus validationStatus) {
this.name = name;
this.vmId = vmId;
this.backupOfferingId = backupOfferingId;
Expand All @@ -144,8 +143,8 @@
this.setType("FULL");
this.uuid = UUID.randomUUID().toString();
this.backupScheduleId = backupScheduleId;
this.compressionStatus = CompressionStatus.Uncompressed;
this.validationStatus = ValidationStatus.NotValidated;
this.compressionStatus = compressionStatus;
this.validationStatus = validationStatus;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,8 @@ protected Outcome<?> createBackupThroughJobQueue(VirtualMachine vm, boolean quie
long vmId = vm.getId();

BackupVO backup = new BackupVO(String.format("%s-%s", vm.getHostName(), DateUtil.getDateInSystemTimeZone()), vmId, vm.getBackupOfferingId(), accountId,
vm.getDomainId(), vm.getDataCenterId(), 0, Backup.Status.Queued, backupScheduleId);
vm.getDomainId(), vm.getDataCenterId(), 0, Backup.Status.Queued, backupScheduleId,
Backup.CompressionStatus.Uncompressed, Backup.ValidationStatus.NotValidated);

VmWorkJobVO workJob = new VmWorkJobVO(AsyncJobExecutionContext.getOriginJobId(), userId, accountId, VmWorkTakeBackup.class.getName(), vmId, VirtualMachine.Type.Instance,
VmWorkJobVO.Step.Starting);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2653,11 +2653,15 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails)
response.setProtectedSize(backup.getProtectedSize());
response.setStatus(backup.getStatus());
response.setIntervalType("MANUAL");
response.setCompressionStatus(backup.getCompressionStatus());
if (backup.getUncompressedSize() != null && backup.getUncompressedSize() > 0) {
response.setUncompressedSize(backup.getUncompressedSize());
if (backup.getCompressionStatus() != null) {
response.setCompressionStatus(backup.getCompressionStatus());
if (backup.getUncompressedSize() != null && backup.getUncompressedSize() > 0) {
response.setUncompressedSize(backup.getUncompressedSize());
}
}
if (backup.getValidationStatus() != null) {
Comment thread
abh1sar marked this conversation as resolved.
response.setValidationStatus(backup.getValidationStatus());
}
response.setValidationStatus(backup.getValidationStatus());
if (backup.getBackupScheduleId() != null) {
BackupScheduleVO scheduleVO = backupScheduleDao.findById(backup.getBackupScheduleId());
if (scheduleVO != null) {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/view/ListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -484,10 +484,10 @@
/>
</template>
<template v-if="column.key === 'compressionstatus'">
<status :text="text ? text : ''" displayText />
<status :text="text ? text : $t('label.unknown')" displayText />
</template>
<template v-if="column.key === 'validationstatus'">
<status :text="text ? text : ''" displayText />
<status :text="text ? text : $t('label.unknown')" displayText />
</template>
<template v-if="column.key === 'allocationstate'">
<status
Expand Down
10 changes: 10 additions & 0 deletions ui/src/views/AutogenView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,16 @@ export default {
})
}

if (this.apiName === 'listBackups') {
const kbossFields = ['compressionstatus', 'validationstatus']
const hasKbossData = this.items.some(backup => kbossFields.some(field => backup[field]))
if (!hasKbossData) {
this.columns = this.columns.filter(col => !kbossFields.includes(col.dataIndex))
this.allColumns = this.allColumns.filter(col => !kbossFields.includes(col.dataIndex))
this.selectedColumns = this.selectedColumns.filter(key => !kbossFields.includes(key))
}
}

for (let idx = 0; idx < this.items.length; idx++) {
this.items[idx].key = idx
for (const key in customRender) {
Expand Down
4 changes: 3 additions & 1 deletion ui/src/views/compute/InstanceTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@
apiName="listBackups"
:resource="resource"
:params="{virtualmachineid: dataResource.id}"
:columns="['name', 'status', 'compressionstatus', 'validationstatus', 'size', 'virtualsize', 'type', 'intervaltype', 'created']"
:columns="dataResource.backupprovider === 'kboss'
? ['name', 'status', 'compressionstatus', 'validationstatus', 'size', 'virtualsize', 'type', 'intervaltype', 'created']
: ['name', 'status', 'size', 'virtualsize', 'type', 'intervaltype', 'created']"
:routerlinks="(record) => { return { name: '/backup/' + record.id } }"
:showSearch="false"/>
</a-tab-pane>
Expand Down
Loading