From 2d3b6cc3100a6fdcc488710265b60d153ce07ecc Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 8 Feb 2011 15:43:22 -0800 Subject: [PATCH] changing the disk offering response object, to always return the disk size in gb --- api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java index 9356f45de78..eb3015c7b55 100755 --- a/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java +++ b/api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java @@ -38,7 +38,7 @@ public class CreateDiskOfferingCmd extends BaseCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.DISK_SIZE, type=CommandType.LONG, required=false, description="disk size of the disk offering in GB") + @Parameter(name=ApiConstants.DISK_SIZE, type=CommandType.LONG, required=false, description="size of the disk offering in GB") private Long diskSize; @Parameter(name=ApiConstants.DISPLAY_TEXT, type=CommandType.STRING, required=true, description="alternate display text of the disk offering") diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index cff3164c95c..e186d9a96d3 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -362,7 +362,7 @@ public class ApiResponseHelper implements ResponseGenerator { diskOfferingResponse.setName(offering.getName()); diskOfferingResponse.setDisplayText(offering.getDisplayText()); diskOfferingResponse.setCreated(offering.getCreated()); - diskOfferingResponse.setDiskSize(offering.getDiskSize()); + diskOfferingResponse.setDiskSize(offering.getDiskSize()/1024); if (offering.getDomainId() != null) { diskOfferingResponse.setDomain(ApiDBUtils.findDomainById(offering.getDomainId()).getName()); diskOfferingResponse.setDomainId(offering.getDomainId());