Skip to content

Commit 4e6cacd

Browse files
João JandreJoaoJandre
authored andcommitted
fix bitmap removal
1 parent 7373a5c commit 4e6cacd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ protected EndPoint getEndPointForBitmapRemoval(DataObject object, boolean encryp
515515
return getEndPointFromHostId(attachedVM.getLastHostId());
516516
}
517517
}
518-
return select(object, encryptionRequired);
518+
return select(volumeInfo, encryptionRequired);
519519
}
520520

521521
protected EndPoint getEndPointForSnapshotOperationsInKvm(SnapshotInfo snapshotInfo, boolean encryptionRequired) {

engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public void setup() {
5757
@Test
5858
public void getEndPointForBitmapRemovalTestVolumeIsNotAttached() {
5959
Mockito.doReturn(false).when(volumeInfoMock).isAttachedVM();
60-
Mockito.doReturn(null).when(defaultEndPointSelectorSpy).select(snapshotInfoMock, false);
60+
Mockito.doReturn(null).when(defaultEndPointSelectorSpy).select(volumeInfoMock, false);
6161

6262
defaultEndPointSelectorSpy.getEndPointForBitmapRemoval(snapshotInfoMock, false);
6363

64-
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false);
64+
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(volumeInfoMock, false);
6565
}
6666

6767
@Test
@@ -102,11 +102,11 @@ public void getEndPointForBitmapRemovalTestVolumeIsAttachedNoHostIsSet() {
102102
Mockito.doReturn(null).when(virtualMachineMock).getHostId();
103103
Mockito.doReturn(null).when(virtualMachineMock).getLastHostId();
104104

105-
Mockito.doReturn(null).when(defaultEndPointSelectorSpy).select(snapshotInfoMock, false);
105+
Mockito.doReturn(null).when(defaultEndPointSelectorSpy).select(volumeInfoMock, false);
106106

107107
defaultEndPointSelectorSpy.getEndPointForBitmapRemoval(snapshotInfoMock, false);
108108

109-
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false);
109+
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(volumeInfoMock, false);
110110
}
111111

112112
@Test

0 commit comments

Comments
 (0)