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

Cleaning up some TODOs related to generating API command responses. Now that the ApiDBUtils class is available, setting things like domainNames is possible, so make use of that.

Browse Source
This commit is contained in:
Kris McQueen 2010-09-15 14:56:20 -07:00
parent 496bcb9e85
commit 8607fbe923
11 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -1,8 +1,11 @@
package com.cloud.api;
import java.util.ArrayList;
import java.util.List;
import com.cloud.agent.manager.AgentManager;
import com.cloud.async.AsyncJobManager;
import com.cloud.async.AsyncJobVO;
import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO;
@ -24,15 +27,19 @@ import com.cloud.server.ManagementServer;
import com.cloud.server.StatsCollector;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.GuestOS;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.StorageManager;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.DiskOfferingDao;
import com.cloud.storage.dao.GuestOSCategoryDao;
import com.cloud.storage.dao.GuestOSDao;
import com.cloud.storage.dao.StoragePoolDao;
import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VMTemplateHostDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
@ -42,6 +49,7 @@ import com.cloud.user.UserStatisticsVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.user.dao.UserStatisticsDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.dao.UserVmDao;
@ -50,6 +58,7 @@ public class ApiDBUtils {
private static ManagementServer _ms;
private static AccountManager _accountMgr;
private static AgentManager _agentMgr;
private static AsyncJobManager _asyncMgr;
private static NetworkGroupManager _networkGroupMgr;
private static StorageManager _storageMgr;
private static StatsCollector _statsCollector;
@ -58,6 +67,7 @@ public class ApiDBUtils {
private static ClusterDao _clusterDao;
private static DiskOfferingDao _diskOfferingDao;
private static DomainDao _domainDao;
private static GuestOSDao _guestOSDao;
private static GuestOSCategoryDao _guestOSCategoryDao;
private static HostDao _hostDao;
private static IPAddressDao _ipAddressDao;
@ -65,6 +75,7 @@ public class ApiDBUtils {
private static ServiceOfferingDao _serviceOfferingDao;
private static StoragePoolDao _storagePoolDao;
private static VMTemplateDao _templateDao;
private static VMTemplateHostDao _templateHostDao;
private static UserDao _userDao;
private static UserStatisticsDao _userStatsDao;
private static UserVmDao _userVmDao;
@ -77,6 +88,7 @@ public class ApiDBUtils {
ComponentLocator locator = ComponentLocator.getLocator(ManagementServer.Name);
_accountMgr = locator.getManager(AccountManager.class);
_agentMgr = locator.getManager(AgentManager.class);
_asyncMgr = locator.getManager(AsyncJobManager.class);
_networkGroupMgr = locator.getManager(NetworkGroupManager.class);
_storageMgr = locator.getManager(StorageManager.class);
@ -84,6 +96,7 @@ public class ApiDBUtils {
_clusterDao = locator.getDao(ClusterDao.class);
_diskOfferingDao = locator.getDao(DiskOfferingDao.class);
_domainDao = locator.getDao(DomainDao.class);
_guestOSDao = locator.getDao(GuestOSDao.class);
_guestOSCategoryDao = locator.getDao(GuestOSCategoryDao.class);
_hostDao = locator.getDao(HostDao.class);
_ipAddressDao = locator.getDao(IPAddressDao.class);
@ -91,6 +104,7 @@ public class ApiDBUtils {
_serviceOfferingDao = locator.getDao(ServiceOfferingDao.class);
_storagePoolDao = locator.getDao(StoragePoolDao.class);
_templateDao = locator.getDao(VMTemplateDao.class);
_templateHostDao = locator.getDao(VMTemplateHostDao.class);
_userDao = locator.getDao(UserDao.class);
_userStatsDao = locator.getDao(UserStatisticsDao.class);
_userVmDao = locator.getDao(UserVmDao.class);
@ -134,7 +148,11 @@ public class ApiDBUtils {
return _accountMgr.findCorrectResourceLimit(account, type);
}
public static AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
return _asyncMgr.findInstancePendingAsyncJob(instanceType, instanceId);
}
public static long getResourceCount(ResourceType type, long accountId) {
AccountVO account = _accountDao.findById(accountId);
@ -181,6 +199,10 @@ public class ApiDBUtils {
return _domainDao.findById(domainId);
}
public static GuestOS findGuestOSById(Long id) {
return _guestOSDao.findById(id);
}
public static HostVO findHostById(Long hostId) {
return _hostDao.findById(hostId);
}
@ -219,6 +241,10 @@ public class ApiDBUtils {
return _userDao.findById(userId);
}
public static UserVm findUserVmById(Long vmId) {
return _userVmDao.findById(vmId);
}
public static VolumeVO findVolumeById(Long volumeId) {
return _volumeDao.findById(volumeId);
}
@ -227,6 +253,19 @@ public class ApiDBUtils {
return _zoneDao.findById(zoneId);
}
public static List<VMTemplateHostVO> listTemplateHostBy(long templateId, Long zoneId) {
if (zoneId != null) {
HostVO secondaryStorageHost = _storageMgr.getSecondaryStorageHost(zoneId);
if (secondaryStorageHost == null) {
return new ArrayList<VMTemplateHostVO>();
} else {
return _templateHostDao.listByHostTemplate(secondaryStorageHost.getId(), templateId);
}
} else {
return _templateHostDao.listByOnlyTemplateId(templateId);
}
}
public static List<UserStatisticsVO> listUserStatsBy(Long accountId) {
return _userStatsDao.listBy(accountId);
}

4
server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java
View File

@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
@ -97,8 +98,7 @@ public class CreateDiskOfferingCmd extends BaseCmd {
response.setDiskSize(responseObject.getDiskSize());
response.setDisplayText(responseObject.getDisplayText());
response.setDomainId(responseObject.getDomainId());
// FIXME: domain name in the response
// response.setDomain(responseObject.getDomain());
response.setDomain(ApiDBUtils.findDomainById(responseObject.getDomainId()).getName());
response.setName(responseObject.getName());
response.setTags(responseObject.getTags());
} else {

4
server/src/com/cloud/api/commands/CreateDomainCmd.java
View File

@ -20,6 +20,7 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
@ -76,8 +77,7 @@ public class CreateDomainCmd extends BaseCmd {
response.setDomainName(responseObject.getName());
response.setLevel(responseObject.getLevel());
response.setParentDomainId(responseObject.getParent());
// FIXME: domain name from id for parent domain
// response.setParentDomainName(responseObject.getParentDomainName());
response.setParentDomainName(ApiDBUtils.findDomainById(responseObject.getParent()).getName());
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create domain");
}

9
server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java
View File

@ -20,6 +20,7 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
@ -27,6 +28,7 @@ import com.cloud.api.Parameter;
import com.cloud.api.response.FirewallRuleResponse;
import com.cloud.network.FirewallRuleVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.uservm.UserVm;
@Implementation(method="createPortForwardingRule", manager=Manager.NetworkManager)
public class CreateIPForwardingRuleCmd extends BaseCmd {
@ -97,9 +99,10 @@ public class CreateIPForwardingRuleCmd extends BaseCmd {
fwResponse.setPrivatePort(fwRule.getPrivatePort());
fwResponse.setProtocol(fwRule.getProtocol());
fwResponse.setPublicPort(fwRule.getPublicPort());
// TODO: implement
// fwResponse.setVirtualMachineId(fwRule.getVirtualMachineId());
// fwResponse.setVirtualMachineName(fwRule.getVirtualMachineName());
UserVm vm = ApiDBUtils.findUserVmById(virtualMachineId);
fwResponse.setVirtualMachineId(vm.getId());
fwResponse.setVirtualMachineName(vm.getName());
return SerializerHelper.toSerializedString(fwResponse);
}

4
server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
View File

@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.LoadBalancerResponse;
@ -108,8 +109,7 @@ public class CreateLoadBalancerRuleCmd extends BaseCmd {
response.setPublicPort(responseObj.getPublicPort());
response.setAccountName(responseObj.getAccountName());
response.setDomainId(responseObj.getDomainId());
// TODO: implement
// response.setDomainName(responseObj.getDomainName());
response.setDomainName(ApiDBUtils.findDomainById(responseObj.getDomainId()).getName());
return SerializerHelper.toSerializedString(response);
}

4
server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java
View File

@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.NetworkGroupResponse;
@ -88,8 +89,7 @@ public class CreateNetworkGroupCmd extends BaseCmd {
response.setAccountName(group.getAccountName());
response.setDescription(group.getDescription());
response.setDomainId(group.getDomainId());
// TODO: implement
// response.setDomainName(group.getDomainName());
response.setDomainName(ApiDBUtils.findDomainById(group.getDomainId()).getName());
response.setId(group.getId());
response.setName(group.getName());

8
server/src/com/cloud/api/commands/CreatePodCmd.java
View File

@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.PodResponse;
@ -101,10 +102,9 @@ public class CreatePodCmd extends BaseCmd {
PodResponse response = new PodResponse();
response.setId(pod.getId());
response.setCidr(pod.getCidrAddress() + "/" + pod.getCidrSize());
// TODO: implement
// response.setEndIp(pod.getEndIp());
// response.setStartIp(pod.getStartIp());
// response.setZoneName(pod.getZoneName());
response.setEndIp(endIp == null ? "" : endIp);
response.setStartIp(startIp);
response.setZoneName(ApiDBUtils.findZoneById(pod.getDataCenterId()).getName());
response.setGateway(pod.getGateway());
response.setName(pod.getName());
response.setZoneId(pod.getDataCenterId());

4
server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java
View File

@ -20,6 +20,7 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
@ -90,8 +91,7 @@ public class CreatePortForwardingServiceCmd extends BaseCmd {
response.setDescription(group.getDescription());
response.setAccountName(group.getAccountName());
response.setDomainId(group.getDomainId());
// TODO: implement
//response.setDomainName(group.getDomainName());
response.setDomainName(ApiDBUtils.findDomainById(group.getDomainId()).getName());
return SerializerHelper.toSerializedString(response);
}

17
server/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -25,6 +25,7 @@ import java.util.Map;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
@ -163,14 +164,14 @@ public class ListIsosCmd extends BaseListCmd {
Map<Long, List<VMTemplateHostVO>> isoHostsMap = new HashMap<Long, List<VMTemplateHostVO>>();
for (VMTemplateVO iso : isos) {
// TODO: implement
List<VMTemplateHostVO> isoHosts = getManagementServer().listTemplateHostBy(iso.getId(), zoneId);
List<VMTemplateHostVO> isoHosts = ApiDBUtils.listTemplateHostBy(iso.getId(), zoneId);
if (iso.getName().equals("xs-tools.iso")) {
List<Long> xstoolsZones = new ArrayList<Long>();
// the xs-tools.iso is a special case since it will be available on every computing host in the zone and we want to return it once per zone
List<VMTemplateHostVO> xstoolsHosts = new ArrayList<VMTemplateHostVO>();
for (VMTemplateHostVO isoHost : isoHosts) {
// TODO: implement
HostVO host = getManagementServer().getHostBy(isoHost.getHostId());
HostVO host = ApiDBUtils.findHostById(isoHost.getHostId());
if (!xstoolsZones.contains(Long.valueOf(host.getDataCenterId()))) {
xstoolsZones.add(Long.valueOf(host.getDataCenterId()));
xstoolsHosts.add(isoHost);
@ -202,7 +203,7 @@ public class ListIsosCmd extends BaseListCmd {
isoResponse.setCrossZones(iso.isCrossZones());
// TODO: implement
GuestOS os = getManagementServer().findGuestOSById(iso.getGuestOSId());
GuestOS os = ApiDBUtils.findGuestOSById(iso.getGuestOSId());
if (os != null) {
isoResponse.setOsTypeId(os.getId());
isoResponse.setOsTypeName(os.getDisplayName());
@ -212,18 +213,18 @@ public class ListIsosCmd extends BaseListCmd {
}
// add account ID and name
Account owner = getManagementServer().findAccountById(iso.getAccountId());
Account owner = ApiDBUtils.findAccountById(iso.getAccountId());
if (owner != null) {
isoResponse.setAccount(owner.getAccountName());
isoResponse.setDomainId(owner.getDomainId());
// TODO: implement
isoResponse.setDomainName(getManagementServer().findDomainIdById(owner.getDomainId()).getName());
isoResponse.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName());
}
// Add the zone ID
// TODO: implement
HostVO host = getManagementServer().getHostBy(isoHost.getHostId());
DataCenterVO datacenter = getManagementServer().getDataCenterBy(host.getDataCenterId());
HostVO host = ApiDBUtils.findHostById(isoHost.getHostId());
DataCenterVO datacenter = ApiDBUtils.findZoneById(host.getDataCenterId());
isoResponse.setZoneId(host.getDataCenterId());
isoResponse.setZoneName(datacenter.getName());
@ -254,7 +255,7 @@ public class ListIsosCmd extends BaseListCmd {
isoResponse.setSize(isoSize);
}
AsyncJobVO asyncJob = getManagementServer().findInstancePendingAsyncJob("vm_template", iso.getId());
AsyncJobVO asyncJob = ApiDBUtils.findInstancePendingAsyncJob("vm_template", iso.getId());
if(asyncJob != null) {
isoResponse.setJobId(asyncJob.getId());
isoResponse.setJobStatus(asyncJob.getStatus());

18
server/src/com/cloud/server/ManagementServer.java
View File

@ -117,7 +117,6 @@ import com.cloud.network.security.NetworkGroupVO;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.DiskTemplateVO;
import com.cloud.storage.GuestOS;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.Snapshot;
@ -580,15 +579,6 @@ public interface ManagementServer {
*/
List<VMTemplateVO> searchForTemplates(Criteria c);
/**
* Lists the template host records by template Id
*
* @param templateId
* @param zoneId
* @return List of VMTemplateHostVO
*/
List<VMTemplateHostVO> listTemplateHostBy(long templateId, Long zoneId);
/**
* Obtains pods that match the data center ID
* @param dataCenterId
@ -1006,13 +996,6 @@ public interface ManagementServer {
* @return Account
*/
Account findAccountById(Long accountId);
/**
* Finds a GuestOS by the ID.
* @param id
* @return GuestOS
*/
GuestOS findGuestOSById(Long id);
/**
* Searches for accounts by the specified search criteria
@ -1160,7 +1143,6 @@ public interface ManagementServer {
*/
AsyncJobResult queryAsyncJobResult(QueryAsyncJobResultCmd cmd) throws PermissionDeniedException;
AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId);
AsyncJobVO findAsyncJobById(long jobId);
/**

25
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -201,7 +201,6 @@ import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.DiskTemplateVO;
import com.cloud.storage.GuestOS;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.LaunchPermissionVO;
@ -3199,20 +3198,6 @@ public class ManagementServerImpl implements ManagementServer {
return _launchPermissionDao.listPermittedTemplates(accountId);
}
@Override
public List<VMTemplateHostVO> listTemplateHostBy(long templateId, Long zoneId) {
if (zoneId != null) {
HostVO secondaryStorageHost = _storageMgr.getSecondaryStorageHost(zoneId);
if (secondaryStorageHost == null) {
return new ArrayList<VMTemplateHostVO>();
} else {
return _templateHostDao.listByHostTemplate(secondaryStorageHost.getId(), templateId);
}
} else {
return _templateHostDao.listByOnlyTemplateId(templateId);
}
}
@Override
public List<HostPodVO> listPods(long dataCenterId) {
return _hostPodDao.listByDataCenterId(dataCenterId);
@ -3258,11 +3243,6 @@ public class ManagementServerImpl implements ManagementServer {
return _accountDao.findById(accountId);
}
@Override
public GuestOS findGuestOSById(Long id) {
return this._guestOSDao.findById(id);
}
@Override
public List<AccountVO> searchForAccounts(ListAccountsCmd cmd) {
Account account = (Account)UserContext.current().getAccountObject();
@ -5583,11 +5563,6 @@ public class ManagementServerImpl implements ManagementServer {
return _asyncMgr.queryAsyncJobResult(jobId);
}
@Override
public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) {
return _asyncMgr.findInstancePendingAsyncJob(instanceType, instanceId);
}
@Override
public AsyncJobVO findAsyncJobById(long jobId) {
return _asyncMgr.getAsyncJob(jobId);