apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-14894: listTemplates - return hypervisor type to everybody

Browse Source
This commit is contained in:
Alena Prokharchyk 2012-05-18 12:46:32 -07:00
parent 07fd2cab6d
commit 51eeb62f9f
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -114,7 +114,6 @@ import com.cloud.dc.VlanVO;
import com.cloud.domain.Domain;
import com.cloud.event.Event;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.host.Host;
import com.cloud.host.HostStats;
import com.cloud.host.HostVO;
@ -156,10 +155,10 @@ import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.GuestOS;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.Storage;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
@ -1805,7 +1804,7 @@ public class ApiResponseHelper implements ResponseGenerator {
if (result.getFormat() == ImageFormat.ISO) { // Templates are always bootable
response.setBootable(result.isBootable());
} else if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) {
} else {
response.setHypervisor(result.getHypervisorType().toString());// hypervisors are associated with templates
}
@ -1863,10 +1862,7 @@ public class ApiResponseHelper implements ResponseGenerator {
templateResponse.setTemplateType(template.getTemplateType().toString());
}
Account caller = UserContext.current().getCaller();
if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) {
templateResponse.setHypervisor(template.getHypervisorType().toString());
}
templateResponse.setHypervisor(template.getHypervisorType().toString());
GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId());
if (os != null) {
@ -1881,6 +1877,7 @@ public class ApiResponseHelper implements ResponseGenerator {
populateAccount(templateResponse, account.getId());
populateDomain(templateResponse, account.getDomainId());
Account caller = UserContext.current().getCaller();
boolean isAdmin = false;
if (BaseCmd.isAdmin(caller.getType())) {
isAdmin = true;
@ -1940,11 +1937,7 @@ public class ApiResponseHelper implements ResponseGenerator {
templateResponse.setTemplateType(template.getTemplateType().toString());
}
Account caller = UserContext.current().getCaller();
if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) {
templateResponse.setHypervisor(template.getHypervisorType().toString());
}
templateResponse.setHypervisor(template.getHypervisorType().toString());
templateResponse.setDetails(template.getDetails());
GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId());
@ -1967,6 +1960,7 @@ public class ApiResponseHelper implements ResponseGenerator {
templateResponse.setZoneName(datacenter.getName());
boolean isAdmin = false;
Account caller = UserContext.current().getCaller();
if ((caller == null) || BaseCmd.isAdmin(caller.getType())) {
isAdmin = true;
}