Repository: cloudstack Updated Branches: refs/heads/4.5 265219501 -> 6df396c9c
CLOUDSTACK:6915 search including removed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c153966 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c153966 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c153966 Branch: refs/heads/4.5 Commit: 0c153966e6269249fa38ab7859ab8352747e73f4 Parents: aaa561a Author: amoghvk <amogh.vase...@citrix.com> Authored: Fri Oct 31 15:29:07 2014 -0700 Committer: amoghvk <amogh.vase...@citrix.com> Committed: Fri Oct 31 15:29:07 2014 -0700 ---------------------------------------------------------------------- .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 4 ++-- .../xenserver/src/com/cloud/hypervisor/XenServerGuru.java | 2 +- server/src/com/cloud/hypervisor/KVMGuru.java | 2 +- server/src/com/cloud/hypervisor/LXCGuru.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/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 63ee707..7c23699 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -27,7 +27,6 @@ import java.util.UUID; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.log4j.Logger; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; @@ -38,6 +37,7 @@ import org.apache.cloudstack.framework.config.Configurable; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.command.CopyCommand; import org.apache.cloudstack.storage.command.DeleteCommand; +import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.to.VolumeObjectTO; @@ -311,7 +311,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/0c153966/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java index 4019edc..89c2046 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java @@ -90,7 +90,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 = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/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 492342c..b6a7651 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 = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/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 46989d9..025c498 100644 --- a/server/src/com/cloud/hypervisor/LXCGuru.java +++ b/server/src/com/cloud/hypervisor/LXCGuru.java @@ -52,7 +52,7 @@ public class LXCGuru 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());
