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

bug 9941: fixed listVolumes api - use leftouter join with vm_instance table because instance_id is NULL for detached volumes

Browse Source 
status 9941: resolved fixed

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/server/ManagementServerImpl.java
This commit is contained in:
alena 2011-05-19 18:49:12 -07:00
parent 7bae4e3155
commit 24e86c109e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -798,8 +798,10 @@ public class ApiResponseHelper implements ResponseGenerator {
volResponse.setVirtualMachineId(vm.getId()); volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getHostName()); volResponse.setVirtualMachineName(vm.getHostName());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId()); UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName()); if (userVm != null) {
volResponse.setVirtualMachineState(vm.getState().toString()); volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
volResponse.setVirtualMachineState(vm.getState().toString());
}
} }
// Show the virtual size of the volume // Show the virtual size of the volume

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

@ -2342,8 +2342,9 @@ public class ManagementServerImpl implements ManagementServer {
// display user vm volumes only // display user vm volumes only
SearchBuilder<VMInstanceVO> vmSearch = _vmInstanceDao.createSearchBuilder(); SearchBuilder<VMInstanceVO> vmSearch = _vmInstanceDao.createSearchBuilder();
vmSearch.and("type", vmSearch.entity().getType(), SearchCriteria.Op.NIN); vmSearch.and("type", vmSearch.entity().getType(), SearchCriteria.Op.NIN);
sb.join("vmSearch", vmSearch, sb.entity().getInstanceId(), vmSearch.entity().getId(), JoinBuilder.JoinType.INNER); vmSearch.or("nulltype", vmSearch.entity().getType(), SearchCriteria.Op.NULL);
sb.join("vmSearch", vmSearch, sb.entity().getInstanceId(), vmSearch.entity().getId(), JoinBuilder.JoinType.LEFTOUTER);
// now set the SC criteria... // now set the SC criteria...
SearchCriteria<VolumeVO> sc = sb.create(); SearchCriteria<VolumeVO> sc = sb.create();
if (keyword != null) { if (keyword != null) {