abh1sar commented on code in PR #10140:
URL: https://github.com/apache/cloudstack/pull/10140#discussion_r2227283797
##########
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java:
##########
@@ -193,27 +260,61 @@ public List<BackupVO> listBackupsByVMandIntervalType(Long
vmId, Backup.Type back
}
@Override
- public BackupResponse newBackupResponse(Backup backup) {
+ public void loadDetails(BackupVO backup) {
+ Map<String, String> details =
backupDetailsDao.listDetailsKeyPairs(backup.getId());
+ backup.setDetails(details);
+ }
+
+ @Override
+ public void saveDetails(BackupVO backup) {
+ Map<String, String> detailsStr = backup.getDetails();
+ if (detailsStr == null) {
+ return;
+ }
+ List<BackupDetailVO> details = new ArrayList<BackupDetailVO>();
+ for (String key : detailsStr.keySet()) {
+ BackupDetailVO detail = new BackupDetailVO(backup.getId(), key,
detailsStr.get(key), true);
+ details.add(detail);
+ }
+ backupDetailsDao.saveDetails(details);
+ }
+
+ @Override
+ public List<Long> listVmIdsWithBackupsInZone(Long zoneId) {
+ SearchCriteria<Long> sc = backupVmSearchInZone.create();
+ sc.setParameters("zone_id", zoneId);
+ return customSearchIncludingRemoved(sc, null);
+ }
+
+ @Override
+ public BackupResponse newBackupResponse(Backup backup, Boolean
listVmDetails) {
VMInstanceVO vm =
vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
- AccountVO account =
accountDao.findByIdIncludingRemoved(vm.getAccountId());
- DomainVO domain = domainDao.findByIdIncludingRemoved(vm.getDomainId());
- DataCenterVO zone =
dataCenterDao.findByIdIncludingRemoved(vm.getDataCenterId());
+ AccountVO account =
accountDao.findByIdIncludingRemoved(backup.getAccountId());
+ DomainVO domain =
domainDao.findByIdIncludingRemoved(backup.getDomainId());
+ DataCenterVO zone =
dataCenterDao.findByIdIncludingRemoved(backup.getZoneId());
Long offeringId = backup.getBackupOfferingId();
- if (offeringId == null) {
- offeringId = vm.getBackupOfferingId();
- }
BackupOffering offering =
backupOfferingDao.findByIdIncludingRemoved(offeringId);
BackupResponse response = new BackupResponse();
response.setId(backup.getUuid());
- response.setVmId(vm.getUuid());
+ response.setName(backup.getName());
+ response.setDescription(backup.getDescription());
response.setVmName(vm.getHostName());
+ if (vm.getState() != VirtualMachine.State.Expunging) {
Review Comment:
not required. have reverted this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
