Repository: cloudstack Updated Branches: refs/heads/4.4-forward dbfce8b11 -> de04881da
CLOUDSTACK-6915: Include searching deleted OS entries Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de04881d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de04881d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de04881d Branch: refs/heads/4.4-forward Commit: de04881da177b28d7cb3efc09adb2d8069f0fdd3 Parents: dbfce8b Author: amoghvk <amogh.vase...@citrix.com> Authored: Mon Jun 16 14:29:14 2014 -0700 Committer: amoghvk <amogh.vase...@citrix.com> Committed: Mon Jun 16 14:29:14 2014 -0700 ---------------------------------------------------------------------- .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +- .../hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java | 2 +- server/src/com/cloud/hypervisor/KVMGuru.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de04881d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index 08d12f2..f82c2c1 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -310,7 +310,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Co } } // Determine the VM's OS description - GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); + GuestOSVO guestOS = _guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); to.setHostName(vm.getHostName()); HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de04881d/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java index c10f4a0..3f950d6 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java @@ -89,7 +89,7 @@ public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru to.setBootloader(bt); // Determine the VM's OS description - GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); + GuestOSVO guestOS = _guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId()); GuestOSHypervisorVO guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de04881d/server/src/com/cloud/hypervisor/KVMGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java index 287b0d2..954ada8 100644 --- a/server/src/com/cloud/hypervisor/KVMGuru.java +++ b/server/src/com/cloud/hypervisor/KVMGuru.java @@ -57,7 +57,7 @@ public class KVMGuru extends HypervisorGuruBase implements HypervisorGuru { VirtualMachineTO to = toVirtualMachineTO(vm); // Determine the VM's OS description - GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); + GuestOSVO guestOS = _guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId()); GuestOSHypervisorVO guestOsMapping = _guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), getHypervisorType().toString(), host.getHypervisorVersion());
