3131import com .cloud .dc .ClusterDetailsVO ;
3232import com .cloud .host .HostTagVO ;
3333import com .cloud .hypervisor .Hypervisor ;
34+ import com .cloud .network .dao .NetworkVO ;
3435import com .cloud .network .vpc .VpcOfferingVO ;
36+ import com .cloud .network .vpc .VpcVO ;
3537import com .cloud .network .vpc .dao .VpcOfferingDao ;
3638import com .cloud .storage .StoragePoolTagVO ;
3739import org .apache .cloudstack .acl .RoleType ;
4042import org .apache .cloudstack .backup .BackupOfferingVO ;
4143import org .apache .cloudstack .backup .dao .BackupOfferingDao ;
4244import org .apache .cloudstack .quota .constant .QuotaTypes ;
45+ import org .apache .cloudstack .quota .dao .NetworkDao ;
4346import org .apache .cloudstack .quota .dao .VmTemplateDao ;
47+ import org .apache .cloudstack .quota .dao .VpcDao ;
4448import org .apache .cloudstack .storage .datastore .db .ImageStoreDao ;
4549import org .apache .cloudstack .storage .datastore .db .ImageStoreVO ;
4650import org .apache .cloudstack .storage .datastore .db .PrimaryDataStoreDao ;
@@ -191,7 +195,13 @@ public class PresetVariableHelperTest {
191195 BackupOfferingDao backupOfferingDaoMock ;
192196
193197 @ Mock
194- VpcOfferingDao vpcOfferingDao ;
198+ NetworkDao networkDaoMock ;
199+
200+ @ Mock
201+ VpcDao vpcDaoMock ;
202+
203+ @ Mock
204+ VpcOfferingDao vpcOfferingDaoMock ;
195205
196206 List <Integer > runningAndAllocatedVmUsageTypes = Arrays .asList (UsageTypes .RUNNING_VM , UsageTypes .ALLOCATED_VM );
197207 List <Integer > templateAndIsoUsageTypes = Arrays .asList (UsageTypes .TEMPLATE , UsageTypes .ISO );
@@ -228,6 +238,8 @@ private Value getValueForTests() {
228238 value .setVmSnapshotType (VMSnapshot .Type .Disk .toString ());
229239 value .setComputingResources (getComputingResourcesForTests ());
230240 value .setVolumeType (Volume .Type .DATADISK .toString ());
241+ value .setNetworkOffering (getNetworkOfferingForTests ());
242+ value .setVpcOffering (getVpcOfferingForTests ());
231243 return value ;
232244 }
233245
@@ -329,6 +341,20 @@ private DiskOfferingPresetVariables getDiskOfferingForTests() {
329341 return diskOffering ;
330342 }
331343
344+ private GenericPresetVariable getNetworkOfferingForTests () {
345+ GenericPresetVariable networkOffering = new GenericPresetVariable ();
346+ networkOffering .setId ("network_offering_id" );
347+ networkOffering .setName ("network_offering_name" );
348+ return networkOffering ;
349+ }
350+
351+ private GenericPresetVariable getVpcOfferingForTests () {
352+ GenericPresetVariable vpcOffering = new GenericPresetVariable ();
353+ vpcOffering .setId ("vpc_offering_id" );
354+ vpcOffering .setName ("vpc_offering_name" );
355+ return vpcOffering ;
356+ }
357+
332358 private void mockMethodValidateIfObjectIsNull () {
333359 Mockito .doNothing ().when (presetVariableHelperSpy ).validateIfObjectIsNull (Mockito .any (), Mockito .anyLong (), Mockito .anyString ());
334360 }
@@ -1295,6 +1321,72 @@ public void testGetSnapshotImageStoreRefNotNull() {
12951321 Assert .assertNotNull (presetVariableHelperSpy .getSnapshotImageStoreRef (1L , 1L ));
12961322 }
12971323
1324+ @ Test
1325+ public void loadPresetVariableValueForNetworkTestRecordIsNotANetworkDoNothing () {
1326+ getQuotaTypesForTests (UsageTypes .NETWORK ).forEach (type -> {
1327+ Mockito .doReturn (type .getKey ()).when (usageVoMock ).getUsageType ();
1328+ presetVariableHelperSpy .loadPresetVariableValueForNetwork (usageVoMock , null );
1329+ });
1330+
1331+ Mockito .verifyNoInteractions (networkDaoMock );
1332+ }
1333+
1334+ @ Test
1335+ public void loadPresetVariableValueForNetworkTestRecordIsNetworkSetFields () {
1336+ Value expected = getValueForTests ();
1337+
1338+ NetworkVO networkVoMock = Mockito .mock (NetworkVO .class );
1339+ Mockito .doReturn (networkVoMock ).when (networkDaoMock ).findByIdIncludingRemoved (Mockito .anyLong ());
1340+
1341+ mockMethodValidateIfObjectIsNull ();
1342+
1343+ Mockito .doReturn (expected .getId ()).when (networkVoMock ).getUuid ();
1344+ Mockito .doReturn (expected .getName ()).when (networkVoMock ).getName ();
1345+ Mockito .doReturn (expected .getState ()).when (usageVoMock ).getState ();
1346+ Mockito .doReturn (expected .getNetworkOffering ()).when (presetVariableHelperSpy ).getPresetVariableValueNetworkOffering (Mockito .anyLong ());
1347+
1348+ Mockito .doReturn (UsageTypes .NETWORK ).when (usageVoMock ).getUsageType ();
1349+
1350+ Value result = new Value ();
1351+ presetVariableHelperSpy .loadPresetVariableValueForNetwork (usageVoMock , result );
1352+
1353+ assertPresetVariableIdAndName (expected , result );
1354+ Assert .assertEquals (expected .getState (), result .getState ());
1355+ Assert .assertEquals (expected .getNetworkOffering (), result .getNetworkOffering ());
1356+ }
1357+
1358+ @ Test
1359+ public void loadPresetVariableValueForVpcTestRecordIsNotAVpcDoNothing () {
1360+ getQuotaTypesForTests (UsageTypes .VPC ).forEach (type -> {
1361+ Mockito .doReturn (type .getKey ()).when (usageVoMock ).getUsageType ();
1362+ presetVariableHelperSpy .loadPresetVariableValueForVpc (usageVoMock , null );
1363+ });
1364+
1365+ Mockito .verifyNoInteractions (networkDaoMock );
1366+ }
1367+
1368+ @ Test
1369+ public void loadPresetVariableValueForVpcTestRecordIsVpcSetFields () {
1370+ Value expected = getValueForTests ();
1371+
1372+ VpcVO networkVoMock = Mockito .mock (VpcVO .class );
1373+ Mockito .doReturn (networkVoMock ).when (vpcDaoMock ).findByIdIncludingRemoved (Mockito .anyLong ());
1374+
1375+ mockMethodValidateIfObjectIsNull ();
1376+
1377+ Mockito .doReturn (expected .getId ()).when (networkVoMock ).getUuid ();
1378+ Mockito .doReturn (expected .getName ()).when (networkVoMock ).getName ();
1379+ Mockito .doReturn (expected .getVpcOffering ()).when (presetVariableHelperSpy ).getPresetVariableValueVpcOffering (Mockito .anyLong ());
1380+
1381+ Mockito .doReturn (UsageTypes .VPC ).when (usageVoMock ).getUsageType ();
1382+
1383+ Value result = new Value ();
1384+ presetVariableHelperSpy .loadPresetVariableValueForVpc (usageVoMock , result );
1385+
1386+ assertPresetVariableIdAndName (expected , result );
1387+ Assert .assertEquals (expected .getVpcOffering (), result .getVpcOffering ());
1388+ }
1389+
12981390 @ Test
12991391 public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject () {
13001392 NetworkOfferingVO networkOfferingVoMock = Mockito .mock (NetworkOfferingVO .class );
@@ -1313,7 +1405,7 @@ public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject()
13131405 @ Test
13141406 public void getPresetVariableValueVpcOfferingTestSetValuesAndReturnObject () {
13151407 VpcOfferingVO vpcOfferingVoMock = Mockito .mock (VpcOfferingVO .class );
1316- Mockito .doReturn (vpcOfferingVoMock ).when (vpcOfferingDao ).findByIdIncludingRemoved (Mockito .anyLong ());
1408+ Mockito .doReturn (vpcOfferingVoMock ).when (vpcOfferingDaoMock ).findByIdIncludingRemoved (Mockito .anyLong ());
13171409 mockMethodValidateIfObjectIsNull ();
13181410
13191411 GenericPresetVariable expected = getGenericPresetVariableForTests ();
0 commit comments