From f9c1f12778e8f2107b9d101dd256b3238cac937c Mon Sep 17 00:00:00 2001
From: Kris McQueen <kris@cloud.com>
Date: Mon, 25 Oct 2010 17:07:49 -0700
Subject: [PATCH] bug 6725: use serviceOfferingName rather than the API command
 name when updating the service offering; set memory in the response for
 UpdateServiceOffering

status 6725: resolved fixed
---
 server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java | 1 +
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java
index 83d2454781a..101a3073bae 100644
--- a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java
+++ b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java
@@ -101,6 +101,7 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
         response.setDisplayText(offering.getDisplayText());
         response.setCpuNumber(offering.getCpu());
         response.setCpuSpeed(offering.getSpeed());
+        response.setMemory(offering.getRamSize());
         response.setCreated(offering.getCreated());
         String storageType = offering.getUseLocalStorage() ? "local" : "shared";
         response.setStorageType(storageType);
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 3aac91cac2c..d441dd512f5 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1099,7 +1099,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
     public ServiceOfferingVO updateServiceOffering(UpdateServiceOfferingCmd cmd) {
     	String displayText = cmd.getDisplayText();
     	Long id = cmd.getId();
-    	String name = cmd.getName();
+    	String name = cmd.getServiceOfferingName();
     	Boolean ha = cmd.getOfferHa();
     	String tags = cmd.getTags();
     	Boolean useVirtualNetwork = cmd.getUseVirtualNetwork();