diff --git a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java index 81f3e5329ef..e5a1c903f96 100644 --- a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java @@ -25,6 +25,7 @@ import com.cloud.api.BaseCmd.Manager; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.response.ServiceOfferingResponse; +import com.cloud.offering.NetworkOffering.GuestIpType; import com.cloud.service.ServiceOfferingVO; @Implementation(method="createServiceOffering", manager=Manager.ConfigManager, description="Creates a service offering.") @@ -127,6 +128,7 @@ public class CreateServiceOfferingCmd extends BaseCmd { response.setOfferHa(offering.getOfferHA()); response.setStorageType(offering.getUseLocalStorage() ? "local" : "shared"); response.setTags(offering.getTags()); + response.setUseVirtualNetwork(offering.getGuestIpType().equals(GuestIpType.Virtualized)); response.setResponseName(getName()); return response; diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java index 13f443a0f2e..372242b3c11 100755 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -145,7 +145,7 @@ public class RegisterIsoCmd extends BaseCmd { templateResponse.setFeatured(template.isFeatured()); templateResponse.setBootable(template.isBootable()); templateResponse.setOsTypeId(template.getGuestOSId()); - templateResponse.setOsTypeName(ApiDBUtils.findGuestOSById(template.getGuestOSId()).getName()); + templateResponse.setOsTypeName(ApiDBUtils.findGuestOSById(template.getGuestOSId()).getDisplayName()); Account owner = ApiDBUtils.findAccountById(template.getAccountId()); if (owner != null) { 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();