etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-25 17:28:22 -07:00
parent 3eb7bee1f9 ef131bbc18
commit 0d9ad0c737
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java
View File

@ -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;

2
server/src/com/cloud/api/commands/RegisterIsoCmd.java
View File

@ -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) {

1
server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java
View File

@ -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);

2
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -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();