From 1a30ffbdc0ea9c84fcb9e8af393614742326e366 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Sun, 19 Sep 2010 16:13:13 +0530
Subject: [PATCH] bug 6055: createDiskOffering API - removed isMirrored and
 domainId parameters. status 6055: resolved fixed

---
 .../api/commands/CreateDiskOfferingCmd.java   | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java
index 64a458e78a1..b621a05eba3 100644
--- a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java
+++ b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java
@@ -27,7 +27,6 @@ import org.apache.log4j.Logger;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.ServerApiException;
 import com.cloud.domain.DomainVO;
-import com.cloud.exception.InternalErrorException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.user.User;
@@ -43,7 +42,6 @@ public class CreateDiskOfferingCmd extends BaseCmd {
     	s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.NAME, Boolean.TRUE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DISPLAY_TEXT, Boolean.TRUE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DISK_SIZE, Boolean.TRUE));
-//        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.IS_MIRRORED, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.USER_ID, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE));
@@ -62,34 +60,23 @@ public class CreateDiskOfferingCmd extends BaseCmd {
     @Override
     public List<Pair<String, Object>> execute(Map<String, Object> params) {
         // FIXME: add domain-private disk offerings
-//        Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName());
+
         Long userId = (Long)params.get(BaseCmd.Properties.USER_ID.getName());
-        Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName());
         String name = (String)params.get(BaseCmd.Properties.NAME.getName());
         String displayText = (String)params.get(BaseCmd.Properties.DISPLAY_TEXT.getName());
-        Long numGB = (Long) params.get(BaseCmd.Properties.DISK_SIZE.getName());
-//        Boolean isMirrored = (Boolean)params.get(BaseCmd.Properties.IS_MIRRORED.getName());
+        Long numGB = (Long) params.get(BaseCmd.Properties.DISK_SIZE.getName());
         String tags = (String)params.get(BaseCmd.Properties.TAGS.getName());
-
-//        if (isMirrored == null) {
-//            isMirrored = Boolean.FALSE;
-//        }
-        if (domainId == null) {
-            domainId = DomainVO.ROOT_DOMAIN;
-        }
-        
+       
         if (userId == null) {
             userId = Long.valueOf(User.UID_SYSTEM);
         }
 
         DiskOfferingVO diskOffering = null;
         try {
-        	diskOffering = getManagementServer().createDiskOffering(userId, domainId.longValue(), name, displayText, numGB.intValue(),tags);
+        	diskOffering = getManagementServer().createDiskOffering(userId, DomainVO.ROOT_DOMAIN, name, displayText, numGB.intValue(),tags);
         } catch (InvalidParameterValueException ex) {
         	throw new ServerApiException (BaseCmd.VM_INVALID_PARAM_ERROR, ex.getMessage());
-        } catch (InternalErrorException e) {
-        	throw new ServerApiException (BaseCmd.INTERNAL_ERROR, e.getMessage());
-		}
+        }
         
         if (diskOffering == null) {
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create disk offering");
@@ -102,7 +89,6 @@ public class CreateDiskOfferingCmd extends BaseCmd {
         returnValues.add(new Pair<String, Object>(BaseCmd.Properties.NAME.getName(), diskOffering.getName()));
         returnValues.add(new Pair<String, Object>(BaseCmd.Properties.DISPLAY_TEXT.getName(), diskOffering.getDisplayText()));
         returnValues.add(new Pair<String, Object>(BaseCmd.Properties.DISK_SIZE.getName(), diskOffering.getDiskSizeInBytes()));
-//        returnValues.add(new Pair<String, Object>(BaseCmd.Properties.IS_MIRRORED.getName(), diskOffering.isMirrored()));
         returnValues.add(new Pair<String, Object>(BaseCmd.Properties.CREATED.getName(), diskOffering.getCreated()));
         returnValues.add(new Pair<String, Object>(BaseCmd.Properties.TAGS.getName(), diskOffering.getTags()));
         return returnValues;