diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 1f71c0f2691f..3bc3680173a2 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -37,6 +37,8 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; + import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.affinity.AffinityGroup; import org.apache.cloudstack.affinity.AffinityGroupService; @@ -84,7 +86,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.log4j.Logger; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; @@ -2353,6 +2354,10 @@ public DiskOffering createDiskOffering(CreateDiskOfferingCmd cmd) { throw new InvalidParameterValueException("Disksize is required for a non-customized disk offering"); } + if (isCustomized && numGibibytes != null) { + throw new InvalidParameterValueException("Disksize is not allowed for a customized disk offering"); + } + boolean localStorageRequired = false; String storageType = cmd.getStorageType(); if (storageType != null) {