apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug CS-10789: Make the custome disk offering as system so that its not availble to the regular user.

Browse Source 
Reviewed By: Kishan
This commit is contained in:
Nitin Mehta 2012-04-20 17:59:46 +05:30
parent 14adf23700
commit f0911817ed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -193,11 +193,11 @@ public class ConfigurationServerImpl implements ConfigurationServer {
createServiceOffering(User.UID_SYSTEM, "Small Instance", 1, 512, 500, "Small Instance", false, false, null);
createServiceOffering(User.UID_SYSTEM, "Medium Instance", 1, 1024, 1000, "Medium Instance", false, false, null);
// Save default disk offerings
createdefaultDiskOffering(null, "Small", "Small Disk, 5 GB", 5, null, false);
createdefaultDiskOffering(null, "Medium", "Medium Disk, 20 GB", 20, null, false);
createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false);
createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false);
createdefaultDiskOffering(null, "Custom", "Custom Disk", 0, null, true);
createdefaultDiskOffering(null, "Small", "Small Disk, 5 GB", 5, null, false, false);
createdefaultDiskOffering(null, "Medium", "Medium Disk, 20 GB", 20, null, false, false);
createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false, false);
createdefaultDiskOffering(null, "Large", "Large Disk, 100 GB", 100, null, false, false);
createdefaultDiskOffering(null, "Custom", "Custom Disk", 0, null, true, true);
// Save the mount parent to the configuration table
String mountParent = getMountParent();
@ -820,13 +820,14 @@ public class ConfigurationServerImpl implements ConfigurationServer {
return pod;
}
private DiskOfferingVO createdefaultDiskOffering(Long domainId, String name, String description, int numGibibytes, String tags, boolean isCustomized) {
private DiskOfferingVO createdefaultDiskOffering(Long domainId, String name, String description, int numGibibytes, String tags, boolean isCustomized, boolean isSystemUse) {
long diskSize = numGibibytes;
diskSize = diskSize * 1024 * 1024 * 1024;
tags = cleanupTags(tags);
DiskOfferingVO newDiskOffering = new DiskOfferingVO(domainId, name, description, diskSize, tags, isCustomized);
newDiskOffering.setUniqueName("Cloud.Com-" + name);
newDiskOffering.setSystemUse(isSystemUse);
newDiskOffering = _diskOfferingDao.persistDeafultDiskOffering(newDiskOffering);
return newDiskOffering;
}