Skip to content

CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize #28

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

Closed
wants to merge 1 commit into from
Closed

CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down