Skip to content

Add offering preset variables for Network and VPC Quota tariffs #11810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsato03 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add offering preset variables for Network and VPC Quota tariffs #11810

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e443959
Add offering preset variable to Network and VPC tariffs
hsato03 Oct 8, 2025
30aab35
Resolve conflicts
hsato03 Jan 19, 2026
6df5728
Merge branch 'main' into add-offering-to-network-and-vpc-presets
hsato03 Mar 11, 2026
d09628c
Apply suggestions from code review
hsato03 Mar 30, 2026
d3907fe
Merge branch 'main' into add-offering-to-network-and-vpc-presets
hsato03 Mar 30, 2026
61715c4
Add tests
hsato03 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add tests
  • Loading branch information
@hsato03
hsato03 committed Mar 30, 2026
commit 61715c42b39ef2ff919bf9311174fe90507ad0f9
96 changes: 94 additions & 2 deletions .../org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
import com.cloud.dc.ClusterDetailsVO;
import com.cloud.host.HostTagVO;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.vpc.VpcOfferingVO;
import com.cloud.network.vpc.VpcVO;
import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.storage.StoragePoolTagVO;
import org.apache.cloudstack.acl.RoleType;
Expand All @@ -40,7 +42,9 @@
import org.apache.cloudstack.backup.BackupOfferingVO;
import org.apache.cloudstack.backup.dao.BackupOfferingDao;
import org.apache.cloudstack.quota.constant.QuotaTypes;
import org.apache.cloudstack.quota.dao.NetworkDao;
import org.apache.cloudstack.quota.dao.VmTemplateDao;
import org.apache.cloudstack.quota.dao.VpcDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
Expand Down Expand Up @@ -191,7 +195,13 @@ public class PresetVariableHelperTest {
BackupOfferingDao backupOfferingDaoMock;

@Mock
VpcOfferingDao vpcOfferingDao;
NetworkDao networkDaoMock;

@Mock
VpcDao vpcDaoMock;

@Mock
VpcOfferingDao vpcOfferingDaoMock;

List<Integer> runningAndAllocatedVmUsageTypes = Arrays.asList(UsageTypes.RUNNING_VM, UsageTypes.ALLOCATED_VM);
List<Integer> templateAndIsoUsageTypes = Arrays.asList(UsageTypes.TEMPLATE, UsageTypes.ISO);
Expand Down Expand Up @@ -228,6 +238,8 @@ private Value getValueForTests() {
value.setVmSnapshotType(VMSnapshot.Type.Disk.toString());
value.setComputingResources(getComputingResourcesForTests());
value.setVolumeType(Volume.Type.DATADISK.toString());
value.setNetworkOffering(getNetworkOfferingForTests());
value.setVpcOffering(getVpcOfferingForTests());
return value;
}

Expand Down Expand Up @@ -329,6 +341,20 @@ private DiskOfferingPresetVariables getDiskOfferingForTests() {
return diskOffering;
}

private GenericPresetVariable getNetworkOfferingForTests() {
GenericPresetVariable networkOffering = new GenericPresetVariable();
networkOffering.setId("network_offering_id");
networkOffering.setName("network_offering_name");
return networkOffering;
}

private GenericPresetVariable getVpcOfferingForTests() {
GenericPresetVariable vpcOffering = new GenericPresetVariable();
vpcOffering.setId("vpc_offering_id");
vpcOffering.setName("vpc_offering_name");
return vpcOffering;
}

private void mockMethodValidateIfObjectIsNull() {
Mockito.doNothing().when(presetVariableHelperSpy).validateIfObjectIsNull(Mockito.any(), Mockito.anyLong(), Mockito.anyString());
}
Expand Down Expand Up @@ -1295,6 +1321,72 @@ public void testGetSnapshotImageStoreRefNotNull() {
Assert.assertNotNull(presetVariableHelperSpy.getSnapshotImageStoreRef(1L, 1L));
}

@Test
public void loadPresetVariableValueForNetworkTestRecordIsNotANetworkDoNothing() {
getQuotaTypesForTests(UsageTypes.NETWORK).forEach(type -> {
Mockito.doReturn(type.getKey()).when(usageVoMock).getUsageType();
presetVariableHelperSpy.loadPresetVariableValueForNetwork(usageVoMock, null);
});

Mockito.verifyNoInteractions(networkDaoMock);
}

@Test
public void loadPresetVariableValueForNetworkTestRecordIsNetworkSetFields() {
Value expected = getValueForTests();

NetworkVO networkVoMock = Mockito.mock(NetworkVO.class);
Mockito.doReturn(networkVoMock).when(networkDaoMock).findByIdIncludingRemoved(Mockito.anyLong());

mockMethodValidateIfObjectIsNull();

Mockito.doReturn(expected.getId()).when(networkVoMock).getUuid();
Mockito.doReturn(expected.getName()).when(networkVoMock).getName();
Mockito.doReturn(expected.getState()).when(usageVoMock).getState();
Mockito.doReturn(expected.getNetworkOffering()).when(presetVariableHelperSpy).getPresetVariableValueNetworkOffering(Mockito.anyLong());

Mockito.doReturn(UsageTypes.NETWORK).when(usageVoMock).getUsageType();

Value result = new Value();
presetVariableHelperSpy.loadPresetVariableValueForNetwork(usageVoMock, result);

assertPresetVariableIdAndName(expected, result);
Assert.assertEquals(expected.getState(), result.getState());
Assert.assertEquals(expected.getNetworkOffering(), result.getNetworkOffering());
}

@Test
public void loadPresetVariableValueForVpcTestRecordIsNotAVpcDoNothing() {
getQuotaTypesForTests(UsageTypes.VPC).forEach(type -> {
Mockito.doReturn(type.getKey()).when(usageVoMock).getUsageType();
presetVariableHelperSpy.loadPresetVariableValueForVpc(usageVoMock, null);
});

Mockito.verifyNoInteractions(networkDaoMock);
}

@Test
public void loadPresetVariableValueForVpcTestRecordIsVpcSetFields() {
Value expected = getValueForTests();

VpcVO networkVoMock = Mockito.mock(VpcVO.class);
Mockito.doReturn(networkVoMock).when(vpcDaoMock).findByIdIncludingRemoved(Mockito.anyLong());

mockMethodValidateIfObjectIsNull();

Mockito.doReturn(expected.getId()).when(networkVoMock).getUuid();
Mockito.doReturn(expected.getName()).when(networkVoMock).getName();
Mockito.doReturn(expected.getVpcOffering()).when(presetVariableHelperSpy).getPresetVariableValueVpcOffering(Mockito.anyLong());

Mockito.doReturn(UsageTypes.VPC).when(usageVoMock).getUsageType();

Value result = new Value();
presetVariableHelperSpy.loadPresetVariableValueForVpc(usageVoMock, result);

assertPresetVariableIdAndName(expected, result);
Assert.assertEquals(expected.getVpcOffering(), result.getVpcOffering());
}

@Test
public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject() {
NetworkOfferingVO networkOfferingVoMock = Mockito.mock(NetworkOfferingVO.class);
Expand All @@ -1313,7 +1405,7 @@ public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject()
@Test
public void getPresetVariableValueVpcOfferingTestSetValuesAndReturnObject() {
VpcOfferingVO vpcOfferingVoMock = Mockito.mock(VpcOfferingVO.class);
Mockito.doReturn(vpcOfferingVoMock).when(vpcOfferingDao).findByIdIncludingRemoved(Mockito.anyLong());
Mockito.doReturn(vpcOfferingVoMock).when(vpcOfferingDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
mockMethodValidateIfObjectIsNull();

GenericPresetVariable expected = getGenericPresetVariableForTests();
Expand Down
Loading