winterhazel commented on code in PR #12644:
URL: https://github.com/apache/cloudstack/pull/12644#discussion_r2811926474
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -811,8 +785,8 @@ public void
loadPresetVariableValueForVolumeTestRecordIsVolumeAndDoesNotHaveStor
Mockito.doReturn(expected.getId()).when(volumeVoMock).getUuid();
Mockito.doReturn(expected.getName()).when(volumeVoMock).getName();
Mockito.doReturn(expected.getDiskOffering()).when(presetVariableHelperSpy).getPresetVariableValueDiskOffering(Mockito.anyLong());
-
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
Mockito.doReturn(expected.getVolumeType()).when(volumeVoMock).getVolumeType();
+
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
Review Comment:
```suggestion
Mockito.doReturn(ProvisioningType.getProvisioningType(expected.getProvisioningType())).when(volumeVoMock).getProvisioningType();
```
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -218,9 +218,9 @@ private Value getValueForTests() {
value.setProvisioningType(ProvisioningType.THIN);
Review Comment:
```suggestion
value.setProvisioningType(ProvisioningType.THIN.toString());
```
##########
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java:
##########
@@ -20,10 +20,8 @@
import java.util.List;
import java.util.Map;
-import com.cloud.storage.Snapshot;
import com.cloud.storage.Storage.ProvisioningType;
import com.cloud.storage.Volume;
-import com.cloud.vm.snapshot.VMSnapshot;
import org.apache.cloudstack.quota.constant.QuotaTypes;
public class Value extends GenericPresetVariable {
Review Comment:
`provisioningType` and `volumeType` need to be converted to `String`s in
this class
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -760,15 +736,15 @@ public void
loadPresetVariableValueForVolumeTestRecordIsVolumeAndHasStorageSetFi
VolumeVO volumeVoMock = Mockito.mock(VolumeVO.class);
Mockito.doReturn(volumeVoMock).when(volumeDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
- Mockito.doReturn(1l).when(volumeVoMock).getPoolId();
+ Mockito.doReturn(1L).when(volumeVoMock).getPoolId();
mockMethodValidateIfObjectIsNull();
Mockito.doReturn(expected.getId()).when(volumeVoMock).getUuid();
Mockito.doReturn(expected.getName()).when(volumeVoMock).getName();
Mockito.doReturn(expected.getDiskOffering()).when(presetVariableHelperSpy).getPresetVariableValueDiskOffering(Mockito.anyLong());
-
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
Mockito.doReturn(expected.getVolumeType()).when(volumeVoMock).getVolumeType();
+
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
Review Comment:
```suggestion
Mockito.doReturn(Volume.Type.valueOf(expected.getVolumeType())).when(volumeVoMock).getVolumeType();
Mockito.doReturn(ProvisioningType.getProvisioningType(expected.getProvisioningType())).when(volumeVoMock).getProvisioningType();
```
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -811,8 +785,8 @@ public void
loadPresetVariableValueForVolumeTestRecordIsVolumeAndDoesNotHaveStor
Mockito.doReturn(expected.getId()).when(volumeVoMock).getUuid();
Mockito.doReturn(expected.getName()).when(volumeVoMock).getName();
Mockito.doReturn(expected.getDiskOffering()).when(presetVariableHelperSpy).getPresetVariableValueDiskOffering(Mockito.anyLong());
-
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
Mockito.doReturn(expected.getVolumeType()).when(volumeVoMock).getVolumeType();
Review Comment:
```suggestion
Mockito.doReturn(Volume.Type.valueOf(expected.getVolumeType())).when(volumeVoMock).getVolumeType();
```
##########
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java:
##########
@@ -218,9 +218,9 @@ private Value getValueForTests() {
value.setProvisioningType(ProvisioningType.THIN);
value.setStorage(getStorageForTests());
value.setSize(ByteScaleUtils.GiB);
- value.setSnapshotType(Snapshot.Type.HOURLY);
+ value.setSnapshotType(Snapshot.Type.HOURLY.toString());
value.setTag("tag_test");
- value.setVmSnapshotType(VMSnapshot.Type.Disk);
+ value.setVmSnapshotType(VMSnapshot.Type.Disk.toString());
value.setComputingResources(getComputingResourcesForTests());
value.setVolumeType(Volume.Type.DATADISK);
Review Comment:
```suggestion
value.setVolumeType(Volume.Type.DATADISK.toString());
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
