From 8215510c19fc0cff6d8938fa50480b05bbb68958 Mon Sep 17 00:00:00 2001 From: nit Date: Mon, 8 Nov 2010 13:42:34 +0530 Subject: [PATCH] bug 6055: createDiskOffering: remove domainId parameter. status 6055: resolved fixed --- .../cloud/configuration/ConfigurationManagerImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) mode change 100644 => 100755 server/src/com/cloud/configuration/ConfigurationManagerImpl.java diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java old mode 100644 new mode 100755 index 5f05493b3da..0d8e123893c --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1198,17 +1198,13 @@ public class ConfigurationManagerImpl implements ConfigurationManager { } @Override - public DiskOfferingVO createDiskOffering(CreateDiskOfferingCmd cmd) throws InvalidParameterValueException { - Long domainId = cmd.getDomainId(); + public DiskOfferingVO createDiskOffering(CreateDiskOfferingCmd cmd) throws InvalidParameterValueException { String name = cmd.getOfferingName(); String description = cmd.getDisplayText(); Long numGibibytes = cmd.getDiskSize(); Boolean isCustomized = cmd.isCustomized() != null ? cmd.isCustomized() : false; //false by default - String tags = cmd.getTags(); - - if (domainId == null) { - domainId = Long.valueOf(DomainVO.ROOT_DOMAIN); - } + String tags = cmd.getTags(); + Long domainId = Long.valueOf(DomainVO.ROOT_DOMAIN); // disk offering always gets created under the root domain.Bug # 6055 return createDiskOffering(domainId, name, description, numGibibytes, tags, isCustomized); }