From f0911817edba0d555269e94480b7acf7e3ba57ff Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Fri, 20 Apr 2012 17:59:46 +0530 Subject: [PATCH] bug CS-10789: Make the custome disk offering as system so that its not availble to the regular user. Reviewed By: Kishan --- .../com/cloud/server/ConfigurationServerImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 352289e9779..15ef408a4ce 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -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; }