Skip to content

Commit 756ea85

Browse files
committed
add InternalBackupServiceImplTest
1 parent 184a45f commit 756ea85

File tree

2 files changed

+560
-4
lines changed

2 files changed

+560
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void cleanupBackupMetadata(long volumeId) {
159159

160160
@Override
161161
public void prepareVolumeForDetach(Volume volume, VirtualMachine virtualMachine) {
162-
if (!backupManager.BackupFrameworkEnabled.valueIn(virtualMachine.getDataCenterId())) {
162+
if (isBackupFrameworkDisabled(virtualMachine)) {
163163
return;
164164
}
165165

@@ -176,7 +176,7 @@ public void prepareVolumeForMigration(Volume volume) {
176176
return;
177177
}
178178
VirtualMachine virtualMachine = virtualMachineManager.findById(volume.getInstanceId());
179-
if (!backupManager.BackupFrameworkEnabled.valueIn(virtualMachine.getDataCenterId())) {
179+
if (isBackupFrameworkDisabled(virtualMachine)) {
180180
return;
181181
}
182182
InternalBackupProvider internalBackupProvider = getInternalBackupProviderForZone(volume.getDataCenterId());
@@ -193,7 +193,7 @@ public void updateVolumeId(long oldVolumeId, long newVolumeId) {
193193
return;
194194
}
195195
VirtualMachine virtualMachine = virtualMachineManager.findById(volumeVO.getInstanceId());
196-
if (!backupManager.BackupFrameworkEnabled.valueIn(virtualMachine.getDataCenterId())) {
196+
if (isBackupFrameworkDisabled(virtualMachine)) {
197197
return;
198198
}
199199

@@ -207,7 +207,7 @@ public void updateVolumeId(long oldVolumeId, long newVolumeId) {
207207
@Override
208208
public void prepareVmForSnapshotRevert(VMSnapshot vmSnapshot) {
209209
VirtualMachine virtualMachine = virtualMachineManager.findById(vmSnapshot.getVmId());
210-
if (!backupManager.BackupFrameworkEnabled.valueIn(virtualMachine.getDataCenterId())) {
210+
if (isBackupFrameworkDisabled(virtualMachine)) {
211211
return;
212212
}
213213

@@ -350,4 +350,8 @@ protected InternalBackupProvider getInternalBackupProviderForZone(long zoneId) {
350350
return internalBackupProviderMap.get(backupProvider.getName());
351351
});
352352
}
353+
354+
protected boolean isBackupFrameworkDisabled(VirtualMachine virtualMachine) {
355+
return !BackupManager.BackupFrameworkEnabled.valueIn(virtualMachine.getDataCenterId());
356+
}
353357
}

0 commit comments

Comments
 (0)