Repository: cloudstack Updated Branches: refs/heads/4.4 ccee282a7 -> d79251853
CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> (cherry picked from commit 89fabe82b9b28df7405022a1707f71dbddfe1604) Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7925185 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7925185 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7925185 Branch: refs/heads/4.4 Commit: d79251853b1c494808e1c9885ddab2b65db5f6d3 Parents: ccee282 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Jul 31 19:01:57 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Jul 31 19:04:22 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/hypervisor/LXCGuru.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7925185/server/src/com/cloud/hypervisor/LXCGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/hypervisor/LXCGuru.java b/server/src/com/cloud/hypervisor/LXCGuru.java index 52e289a..7283ac5 100644 --- a/server/src/com/cloud/hypervisor/LXCGuru.java +++ b/server/src/com/cloud/hypervisor/LXCGuru.java @@ -20,15 +20,23 @@ import javax.ejb.Local; import javax.inject.Inject; import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.storage.GuestOSHypervisorVO; import com.cloud.storage.GuestOSVO; import com.cloud.storage.dao.GuestOSDao; +import com.cloud.storage.dao.GuestOSHypervisorDao; import com.cloud.vm.VirtualMachineProfile; @Local(value = HypervisorGuru.class) public class LXCGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject GuestOSDao _guestOsDao; + @Inject + GuestOSHypervisorDao _guestOsHypervisorDao; + @Inject + HostDao _hostDao; @Override public HypervisorType getHypervisorType() { @@ -47,6 +55,14 @@ public class LXCGuru extends HypervisorGuruBase implements HypervisorGuru { GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); + HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId()); + GuestOSHypervisorVO guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion()); + if (guestOsMapping == null) { + to.setPlatformEmulator("Other"); + } else { + to.setPlatformEmulator(guestOsMapping.getGuestOsName()); + } + return to; }