Skip to content

Commit fe8976b

Browse files
committed
Merge remote-tracking branch 'apache/4.22'
2 parents b9b5436 + 56306ab commit fe8976b

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

‎server/src/main/java/com/cloud/api/query/dao/VolumeJoinDaoImpl.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ protected VolumeJoinDaoImpl() {
9191
_count = "select count(distinct id) from volume_view WHERE ";
9292
}
9393

94+
protected void setThrottleRates(VolumeResponse volResponse, VolumeJoinVO volume) {
95+
volResponse.setBytesReadRate(volume.getBytesReadRate());
96+
volResponse.setBytesWriteRate(volume.getBytesWriteRate());
97+
volResponse.setIopsReadRate(volume.getIopsReadRate());
98+
volResponse.setIopsWriteRate(volume.getIopsWriteRate());
99+
}
100+
94101
@Override
95102
public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume) {
96103
VolumeResponse volResponse = new VolumeResponse();
@@ -224,10 +231,7 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
224231
if (view == ResponseView.Full) {
225232
volResponse.setStorageType(volume.isUseLocalStorage() ? ServiceOffering.StorageType.local.toString() : ServiceOffering.StorageType.shared.toString());
226233
}
227-
volResponse.setBytesReadRate(volume.getBytesReadRate());
228-
volResponse.setBytesWriteRate(volume.getBytesReadRate());
229-
volResponse.setIopsReadRate(volume.getIopsWriteRate());
230-
volResponse.setIopsWriteRate(volume.getIopsWriteRate());
234+
setThrottleRates(volResponse, volume);
231235

232236
}
233237

‎server/src/test/java/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818

1919
import com.cloud.api.query.vo.VolumeJoinVO;
2020
import org.apache.cloudstack.api.response.VolumeResponse;
21+
import org.junit.Assert;
2122
import org.junit.Before;
2223
import org.junit.Test;
2324
import org.junit.runner.RunWith;
2425
import org.mockito.InjectMocks;
26+
import org.mockito.Mockito;
2527
import org.mockito.junit.MockitoJUnitRunner;
2628

2729
@RunWith(MockitoJUnitRunner.class)
@@ -43,4 +45,21 @@ public void testUpdateVolumeTagInfo(){
4345
testUpdateTagInformation(_volumeJoinDaoImpl, volume, volumeResponse);
4446
}
4547

48+
@Test
49+
public void testSetThrottleRatesMapsReadAndWriteDistinctly() {
50+
VolumeJoinVO vol = Mockito.mock(VolumeJoinVO.class);
51+
Mockito.when(vol.getBytesReadRate()).thenReturn(100L);
52+
Mockito.when(vol.getBytesWriteRate()).thenReturn(200L);
53+
Mockito.when(vol.getIopsReadRate()).thenReturn(300L);
54+
Mockito.when(vol.getIopsWriteRate()).thenReturn(400L);
55+
56+
VolumeResponse response = new VolumeResponse();
57+
_volumeJoinDaoImpl.setThrottleRates(response, vol);
58+
59+
Assert.assertEquals(Long.valueOf(100L), response.getBytesReadRate());
60+
Assert.assertEquals(Long.valueOf(200L), response.getBytesWriteRate());
61+
Assert.assertEquals(Long.valueOf(300L), response.getIopsReadRate());
62+
Assert.assertEquals(Long.valueOf(400L), response.getIopsWriteRate());
63+
}
64+
4665
}

0 commit comments

Comments
 (0)