You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/08/01 10:06:58 UTC
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6269: Improve error message on storage tags update
DaanHoogland commented on code in PR #6269:
URL: https://github.com/apache/cloudstack/pull/6269#discussion_r934360296
##########
server/src/test/java/com/cloud/configuration/ConfigurationManagerTest.java:
##########
@@ -1023,6 +1037,51 @@ public void updateDiskOfferingTagsIfIsNotNullTestWhenTagsIsNotNull(){
Mockito.verify(configurationMgr, Mockito.times(1)).updateOfferingTagsIfIsNotNull(tags, diskOfferingVOMock);
}
+ @Test (expected = InvalidParameterValueException.class)
+ public void updateDiskOfferingTagsWithPrimaryStorageTagsEqualNullTestThrowException(){
+ String tags = "tags";
+ List<String> storageTagsNull = new ArrayList<>();
+ List<StoragePoolVO> pools = new ArrayList<>(Arrays.asList(storagePoolVO));
+ List<VolumeVO> volumes = new ArrayList<>(Arrays.asList(volumeVO));
+
+ Mockito.when(primaryDataStoreDao.listStoragePoolsWithActiveVolumesByOfferingId(anyLong())).thenReturn(pools);
+ Mockito.when(storagePoolTagsDao.getStoragePoolTags(anyLong())).thenReturn(storageTagsNull);
+ Mockito.when(diskOfferingDao.findById(anyLong())).thenReturn(diskOfferingVOMock);
+ Mockito.when(_volumeDao.findByDiskOfferingId(anyLong())).thenReturn(volumes);
+
+ this.configurationMgr.updateOfferingTagsIfIsNotNull(tags, diskOfferingVOMock);
+ }
+
+ @Test (expected = InvalidParameterValueException.class)
+ public void updateDiskOfferingTagsWithPrimaryStorageMissingTagsTestThrowException(){
+ String tags = "tag1,tag2";
+ List<String> storageTagsWithMissingTag = new ArrayList<>(Arrays.asList("tag1"));
+ List<StoragePoolVO> pools = new ArrayList<>(Arrays.asList(storagePoolVO));
+ List<VolumeVO> volumes = new ArrayList<>(Arrays.asList(volumeVO));
+
+ Mockito.when(primaryDataStoreDao.listStoragePoolsWithActiveVolumesByOfferingId(anyLong())).thenReturn(pools);
+ Mockito.when(storagePoolTagsDao.getStoragePoolTags(anyLong())).thenReturn(storageTagsWithMissingTag);
+ Mockito.when(diskOfferingDao.findById(anyLong())).thenReturn(diskOfferingVOMock);
+ Mockito.when(_volumeDao.findByDiskOfferingId(anyLong())).thenReturn(volumes);
+
+ this.configurationMgr.updateOfferingTagsIfIsNotNull(tags, diskOfferingVOMock);
+ }
+
+ @Test
+ public void updateDiskOfferingTagsWithPrimaryStorageWithCorrectTagsTestSuccess(){
+ String tags = "tag1,tag2";
+ List<String> storageTagsWithCorrectTags = new ArrayList<>(Arrays.asList("tag1","tag2"));
+ List<StoragePoolVO> pools = new ArrayList<>(Arrays.asList(storagePoolVO));
+ List<VolumeVO> volumes = new ArrayList<>(Arrays.asList(volumeVO));
+
+ Mockito.when(primaryDataStoreDao.listStoragePoolsWithActiveVolumesByOfferingId(anyLong())).thenReturn(pools);
+ Mockito.when(storagePoolTagsDao.getStoragePoolTags(anyLong())).thenReturn(storageTagsWithCorrectTags);
+ Mockito.when(diskOfferingDao.findById(anyLong())).thenReturn(diskOfferingVOMock);
+ Mockito.when(_volumeDao.findByDiskOfferingId(anyLong())).thenReturn(volumes);
+
+ this.configurationMgr.updateOfferingTagsIfIsNotNull(tags, diskOfferingVOMock);
+ Mockito.verify(diskOfferingVOMock, Mockito.times(1)).setTags(tags);
+
Review Comment:
```suggestion
@Test
public void updateDiskOfferingTagsWithPrimaryStorageWithCorrectTagsTestSuccess(){
String tags = "tag1,tag2";
List<String> storageTagsWithCorrectTags = new ArrayList<>(Arrays.asList("tag1","tag2"));
List<StoragePoolVO> pools = new ArrayList<>(Arrays.asList(storagePoolVO));
List<VolumeVO> volumes = new ArrayList<>(Arrays.asList(volumeVO));
Mockito.when(primaryDataStoreDao.listStoragePoolsWithActiveVolumesByOfferingId(anyLong())).thenReturn(pools);
Mockito.when(storagePoolTagsDao.getStoragePoolTags(anyLong())).thenReturn(storageTagsWithCorrectTags);
Mockito.when(diskOfferingDao.findById(anyLong())).thenReturn(diskOfferingVOMock);
Mockito.when(_volumeDao.findByDiskOfferingId(anyLong())).thenReturn(volumes);
this.configurationMgr.updateOfferingTagsIfIsNotNull(tags, diskOfferingVOMock);
Mockito.verify(diskOfferingVOMock, Mockito.times(1)).setTags(tags);
}
```
--
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-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org