diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
index d308a9e5aaf9..15fd9c76b61c 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
@@ -73,4 +73,6 @@
+
+
diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 7e9d6c3b54f0..82c10496a6a4 100644
--- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -236,13 +236,11 @@
-
-
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
index 2a6ad132f63e..b6ca54a0cea1 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
@@ -28,11 +28,12 @@
import com.cloud.dc.ClusterDetailsDao;
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 javax.inject.Inject;
-import com.cloud.hypervisor.Hypervisor;
import com.cloud.storage.StoragePoolTagVO;
import org.apache.cloudstack.acl.RoleVO;
import org.apache.cloudstack.acl.dao.RoleDao;
@@ -66,6 +67,7 @@
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
import com.cloud.host.dao.HostTagsDao;
+import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.server.ResourceTag;
@@ -191,6 +193,9 @@ public class PresetVariableHelper {
@Inject
ClusterDetailsDao clusterDetailsDao;
+ @Inject
+ VpcOfferingDao vpcOfferingDao;
+
protected boolean backupSnapshotAfterTakingSnapshot = SnapshotInfo.BackupSnapshotAfterTakingSnapshot.value();
private List runningAndAllocatedVmUsageTypes = Arrays.asList(UsageTypes.RUNNING_VM, UsageTypes.ALLOCATED_VM);
@@ -778,6 +783,19 @@ protected void loadPresetVariableValueForNetwork(UsageVO usageRecord, Value valu
value.setId(network.getUuid());
value.setName(network.getName());
value.setState(usageRecord.getState());
+
+ value.setNetworkOffering(getPresetVariableValueNetworkOffering(network.getNetworkOfferingId()));
+ }
+
+ protected GenericPresetVariable getPresetVariableValueNetworkOffering(Long networkOfferingId) {
+ NetworkOfferingVO networkOfferingVo = networkOfferingDao.findByIdIncludingRemoved(networkOfferingId);
+ validateIfObjectIsNull(networkOfferingVo, networkOfferingId, "network offering");
+
+ GenericPresetVariable networkOffering = new GenericPresetVariable();
+ networkOffering.setId(networkOfferingVo.getUuid());
+ networkOffering.setName(networkOfferingVo.getName());
+
+ return networkOffering;
}
protected void loadPresetVariableValueForVpc(UsageVO usageRecord, Value value) {
@@ -793,6 +811,18 @@ protected void loadPresetVariableValueForVpc(UsageVO usageRecord, Value value) {
value.setId(vpc.getUuid());
value.setName(vpc.getName());
+ value.setVpcOffering(getPresetVariableValueVpcOffering(vpc.getVpcOfferingId()));
+ }
+
+ protected GenericPresetVariable getPresetVariableValueVpcOffering(long vpcOfferingId) {
+ VpcOfferingVO vpcOfferingVo = vpcOfferingDao.findByIdIncludingRemoved(vpcOfferingId);
+ validateIfObjectIsNull(vpcOfferingVo, vpcOfferingId, "vpc offering");
+
+ GenericPresetVariable vpcOffering = new GenericPresetVariable();
+ vpcOffering.setId(vpcOfferingVo.getUuid());
+ vpcOffering.setName(vpcOfferingVo.getName());
+
+ return vpcOffering;
}
/**
diff --git a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java
index 77e539db0f3d..c76cbe137e61 100644
--- a/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java
+++ b/framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java
@@ -100,6 +100,12 @@ public class Value extends GenericPresetVariable {
private String state;
+ @PresetVariableDefinition(description = "Network offering of the network.", supportedTypes = {QuotaTypes.NETWORK})
+ private GenericPresetVariable networkOffering;
+
+ @PresetVariableDefinition(description = "VPC offering of the VPC.", supportedTypes = {QuotaTypes.VPC})
+ private GenericPresetVariable vpcOffering;
+
public Host getHost() {
return host;
}
@@ -279,4 +285,22 @@ public void setState(String state) {
this.state = state;
fieldNamesToIncludeInToString.add("state");
}
+
+ public GenericPresetVariable getNetworkOffering() {
+ return networkOffering;
+ }
+
+ public void setNetworkOffering(GenericPresetVariable networkOffering) {
+ this.networkOffering = networkOffering;
+ fieldNamesToIncludeInToString.add("networkOffering");
+ }
+
+ public GenericPresetVariable getVpcOffering() {
+ return vpcOffering;
+ }
+
+ public void setVpcOffering(GenericPresetVariable vpcOffering) {
+ this.vpcOffering = vpcOffering;
+ fieldNamesToIncludeInToString.add("vpcOffering");
+ }
}
diff --git a/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java b/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
index c692cb7c1e73..c86fad2c7c62 100644
--- a/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
+++ b/framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
@@ -31,6 +31,8 @@
import com.cloud.dc.ClusterDetailsVO;
import com.cloud.host.HostTagVO;
import com.cloud.hypervisor.Hypervisor;
+import com.cloud.network.vpc.VpcOfferingVO;
+import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.storage.StoragePoolTagVO;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.acl.RoleVO;
@@ -188,6 +190,9 @@ public class PresetVariableHelperTest {
@Mock
BackupOfferingDao backupOfferingDaoMock;
+ @Mock
+ VpcOfferingDao vpcOfferingDao;
+
List runningAndAllocatedVmUsageTypes = Arrays.asList(UsageTypes.RUNNING_VM, UsageTypes.ALLOCATED_VM);
List templateAndIsoUsageTypes = Arrays.asList(UsageTypes.TEMPLATE, UsageTypes.ISO);
@@ -1339,4 +1344,36 @@ public void testGetSnapshotImageStoreRefNotNull() {
Mockito.when(imageStoreDaoMock.findById(1L)).thenReturn(store);
Assert.assertNotNull(presetVariableHelperSpy.getSnapshotImageStoreRef(1L, 1L));
}
+
+ @Test
+ public void getPresetVariableValueNetworkOfferingTestSetValuesAndReturnObject() {
+ NetworkOfferingVO networkOfferingVoMock = Mockito.mock(NetworkOfferingVO.class);
+ Mockito.doReturn(networkOfferingVoMock).when(networkOfferingDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
+ mockMethodValidateIfObjectIsNull();
+
+ GenericPresetVariable expected = getGenericPresetVariableForTests();
+ Mockito.doReturn(expected.getId()).when(networkOfferingVoMock).getUuid();
+ Mockito.doReturn(expected.getName()).when(networkOfferingVoMock).getName();
+
+ GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueNetworkOffering(1L);
+
+ assertPresetVariableIdAndName(expected, result);
+ validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
+ }
+
+ @Test
+ public void getPresetVariableValueVpcOfferingTestSetValuesAndReturnObject() {
+ VpcOfferingVO vpcOfferingVoMock = Mockito.mock(VpcOfferingVO.class);
+ Mockito.doReturn(vpcOfferingVoMock).when(vpcOfferingDao).findByIdIncludingRemoved(Mockito.anyLong());
+ mockMethodValidateIfObjectIsNull();
+
+ GenericPresetVariable expected = getGenericPresetVariableForTests();
+ Mockito.doReturn(expected.getId()).when(vpcOfferingVoMock).getUuid();
+ Mockito.doReturn(expected.getName()).when(vpcOfferingVoMock).getName();
+
+ GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueVpcOffering(1L);
+
+ assertPresetVariableIdAndName(expected, result);
+ validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
+ }
}