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

bug 5897: returning the os_type_id 

status 5897: resolved fixed
This commit is contained in:
abhishek 2010-08-30 16:25:58 -07:00
parent 1c87879e21
commit 854611e40a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/cloud/server/ManagementServer.java
View File

@ -2188,4 +2188,5 @@ public interface ManagementServer {
boolean checkIfMaintenable(long hostId);
Map<String, String> listCapabilities();
GuestOSCategoryVO getGuestOsCategory(Long guestOsId);
}

7
server/src/com/cloud/api/commands/ListVMsCmd.java
View File

@ -33,6 +33,8 @@ import com.cloud.domain.DomainVO;
import com.cloud.host.HostVO;
import com.cloud.server.Criteria;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
@ -178,6 +180,7 @@ public class ListVMsCmd extends BaseCmd {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NAME.getName(), vmInstance.getName()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.CREATED.getName(), getDateString(vmInstance.getCreated())));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.IP_ADDRESS.getName(), vmInstance.getPrivateIpAddress()));
if (vmInstance.getState() != null) {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.STATE.getName(), vmInstance.getState().toString()));
}
@ -258,7 +261,9 @@ public class ListVMsCmd extends BaseCmd {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NETWORK_KB_WRITE.getName(), networkKbWrite));
}
vmData.add(new Pair<String, Object>(BaseCmd.Properties.OS_TYPE_ID.getName(),vmInstance.getGuestOSId()));
GuestOSCategoryVO guestOsCategory = getManagementServer().getGuestOsCategory(vmInstance.getGuestOSId());
if(guestOsCategory!=null)
vmData.add(new Pair<String, Object>(BaseCmd.Properties.OS_TYPE_ID.getName(),guestOsCategory.getId()));
//network groups
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NETWORK_GROUP_LIST.getName(), getManagementServer().getNetworkGroupsNamesForVm(vmInstance.getId())));

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

@ -8632,6 +8632,10 @@ public class ManagementServerImpl implements ManagementServer {
return capabilities;
}
@Override
public GuestOSCategoryVO getGuestOsCategory(Long guestOsId)
{
return _guestOSCategoryDao.findById(guestOsId);
}
}