GutoVeronezi commented on a change in pull request #5017:
URL: https://github.com/apache/cloudstack/pull/5017#discussion_r633596212
##########
File path:
plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
##########
@@ -86,13 +86,19 @@ public boolean restoreVMFromBackup(VirtualMachine vm,
Backup backup) {
@Override
public Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId,
List<VirtualMachine> vms) {
final Map<VirtualMachine, Backup.Metric> metrics = new HashMap<>();
- final Backup.Metric metric = new Backup.Metric(1000L, 100L);
if (vms == null || vms.isEmpty()) {
return metrics;
}
for (VirtualMachine vm : vms) {
+ Backup.Metric metric = new Backup.Metric(1000L, 100L);
Review comment:
Could we extract these values to variables? In my point of view, they
seem like random numbers.
##########
File path:
plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
##########
@@ -86,13 +86,19 @@ public boolean restoreVMFromBackup(VirtualMachine vm,
Backup backup) {
@Override
public Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId,
List<VirtualMachine> vms) {
final Map<VirtualMachine, Backup.Metric> metrics = new HashMap<>();
- final Backup.Metric metric = new Backup.Metric(1000L, 100L);
if (vms == null || vms.isEmpty()) {
return metrics;
}
for (VirtualMachine vm : vms) {
+ Backup.Metric metric = new Backup.Metric(1000L, 100L);
if (vm != null) {
- metrics.put(vm, metric);
+ List<Backup> backups =
backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
+ if (backups != null && !backups.isEmpty()) {
Review comment:
We can use `CollectionUtils` to do the validation:
```java
import org.apache.commons.collections.CollectionUtils;
```
```java
if (CollectionUtils.isNotEmpty(backups)) {
```
##########
File path: usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
##########
@@ -83,6 +90,12 @@ public static boolean parse(AccountVO account, Date
startDate, Date endDate) {
for (final BackupInfo backupInfo : vmUsageMap.values()) {
final Long vmId = backupInfo.getVmId();
+
+ List<UsageEventVO> backupUsageEvents =
s_usageEventDao.listEventsInTimeRange(EventTypes.EVENT_VM_BACKUP_USAGE_METRIC,
vmId, startDate, endDate);
+ if (backupUsageEvents == null || backupUsageEvents.isEmpty()) {
Review comment:
We can use `CollectionUtils` to do the validation:
```java
import org.apache.commons.collections.CollectionUtils;
```
```java
if (CollectionUtils.isEmpty(backupUsageEvents)) {
```
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]
