Removed unused stuff from virtualmachinemanager
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad1c82fd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad1c82fd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad1c82fd Branch: refs/heads/vmsync Commit: ad1c82fdda2a97f6d0bb764b37f42ae9f9fd2c8d Parents: 38a3057 Author: Alex Huang <[email protected]> Authored: Tue Jun 11 13:15:23 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Tue Jun 11 13:15:23 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/storage/VolumeManager.java | 6 +- .../src/com/cloud/vm/VirtualMachineManager.java | 6 +- .../engine/vm/VirtualMachineOrchestrator.java | 2 +- .../com/cloud/vm/VirtualMachineProfileImpl.java | 29 +- .../com/cloud/storage/VolumeManagerImpl.java | 9 +- .../vm/ClusteredVirtualMachineManagerImpl.java | 7 +- .../com/cloud/vm/ReservationContextImpl.java | 22 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 182 +++------- .../async/MockVirtualMachineManagerImpl.java | 361 ------------------- .../cloud/vm/VirtualMachineManagerImplTest.java | 21 +- .../vm/VmWorkMockVirtualMachineManagerImpl.java | 5 +- 12 files changed, 102 insertions(+), 550 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/engine/components-api/src/com/cloud/storage/VolumeManager.java ---------------------------------------------------------------------- diff --git a/engine/components-api/src/com/cloud/storage/VolumeManager.java b/engine/components-api/src/com/cloud/storage/VolumeManager.java index c2e5bdc..36fd75b 100644 --- a/engine/components-api/src/com/cloud/storage/VolumeManager.java +++ b/engine/components-api/src/com/cloud/storage/VolumeManager.java @@ -27,7 +27,6 @@ import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.deploy.DeployDestination; @@ -41,6 +40,7 @@ import com.cloud.storage.Volume.Type; import com.cloud.user.Account; import com.cloud.vm.DiskProfile; import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; public interface VolumeManager extends VolumeApiService { @@ -92,8 +92,8 @@ public interface VolumeManager extends VolumeApiService { @Override Volume migrateVolume(MigrateVolumeCmd cmd); - <T extends VMInstanceVO> void migrateVolumes(T vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, - Map<VolumeVO, StoragePoolVO> volumeToPool); + void migrateVolumes(VirtualMachine vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, + Map<Volume, StoragePool> volumeToPool); boolean storageMigration( VirtualMachineProfile vm, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java ---------------------------------------------------------------------- diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java index 922a1f4..70142d5 100644 --- a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java @@ -21,8 +21,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; - import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.deploy.DeployDestination; @@ -42,7 +40,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.StoragePool; import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VolumeVO; +import com.cloud.storage.Volume; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; @@ -127,7 +125,7 @@ public interface VirtualMachineManager extends Manager { VirtualMachine migrate(String vmUuid, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; - VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<VolumeVO, StoragePoolVO> volumeToPool) throws ResourceUnavailableException, + VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; void reboot(String vmUuid, User caller, Account account); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/engine/orchestration/src/org/apache/cloudstack/engine/vm/VirtualMachineOrchestrator.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/vm/VirtualMachineOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/vm/VirtualMachineOrchestrator.java index 43e34e4..1c5356e 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/vm/VirtualMachineOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/vm/VirtualMachineOrchestrator.java @@ -347,7 +347,7 @@ public class VirtualMachineOrchestrator extends ManagerBase { _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Vm-Operations-Cleanup")); // ReservationContextImpl.setComponents(_userDao, _domainDao, _accountDao); - VirtualMachineProfileImpl.setComponents(_offeringDao, _templateDao, _accountDao); + VirtualMachineProfileImpl.setComponents(_entityMgr); VirtualMachineEntityImpl2.init(_entityMgr, this, _networkOrchestrator, _storageOrchestrator); return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/engine/schema/src/com/cloud/vm/VirtualMachineProfileImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/VirtualMachineProfileImpl.java b/engine/schema/src/com/cloud/vm/VirtualMachineProfileImpl.java index 4f1bd5f..5805c03 100644 --- a/engine/schema/src/com/cloud/vm/VirtualMachineProfileImpl.java +++ b/engine/schema/src/com/cloud/vm/VirtualMachineProfileImpl.java @@ -22,16 +22,15 @@ import java.util.List; import java.util.Map; import com.cloud.agent.api.to.VolumeTO; +import com.cloud.dao.EntityManager; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.offering.ServiceOffering; import com.cloud.service.ServiceOfferingVO; -import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.dao.VMTemplateDao; import com.cloud.template.VirtualMachineTemplate; import com.cloud.template.VirtualMachineTemplate.BootloaderType; import com.cloud.user.Account; -import com.cloud.user.dao.AccountDao; +import com.cloud.user.AccountVO; /** * Implementation of VirtualMachineProfile. @@ -59,6 +58,9 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { _offering = offering; _params = params; _owner = owner; + if (_owner == null) { + _owner = s_entityMgr.findById(AccountVO.class, vm.getAccountId()); + } if (_params == null) { _params = new HashMap<Param, Object>(); } @@ -70,10 +72,6 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { this(vm, null, null, null, null); } - public VirtualMachineProfileImpl(VirtualMachine.Type type) { - _type = type; - } - @Override public String toString() { return _vm.toString(); @@ -87,7 +85,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { @Override public ServiceOffering getServiceOffering() { if (_offering == null) { - _offering = s_offeringDao.findByIdIncludingRemoved(_vm.getServiceOfferingId()); + _offering = s_entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, _vm.getServiceOfferingId()); } return _offering; } @@ -105,7 +103,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { @Override public VirtualMachineTemplate getTemplate() { if (_template == null && _vm != null) { - _template = s_templateDao.findByIdIncludingRemoved(_vm.getTemplateId()); + _template = s_entityMgr.findByIdIncludingRemoved(VMTemplateVO.class, _vm.getTemplateId()); } return _template; } @@ -182,9 +180,6 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { @Override public Account getOwner() { - if (_owner == null) { - _owner = s_accountDao.findByIdIncludingRemoved(_vm.getAccountId()); - } return _owner; } @@ -193,14 +188,10 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile { return _bootArgs.toString(); } - static ServiceOfferingDao s_offeringDao; - static VMTemplateDao s_templateDao; - static AccountDao s_accountDao; + static EntityManager s_entityMgr; - public static void setComponents(ServiceOfferingDao offeringDao, VMTemplateDao templateDao, AccountDao accountDao) { - s_offeringDao = offeringDao; - s_templateDao = templateDao; - s_accountDao = accountDao; + public static void setComponents(EntityManager entityMgr) { + s_entityMgr = entityMgr; } @Override http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/src/com/cloud/storage/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index b75f461..9d3f4df 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -2154,15 +2154,14 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { } @Override - public <T extends VMInstanceVO> void migrateVolumes(T vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, - Map<VolumeVO, StoragePoolVO> volumeToPool) { + public void migrateVolumes(VirtualMachine vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, Map<Volume, StoragePool> volumeToPool) { // Check if all the vms being migrated belong to the vm. // Check if the storage pool is of the right type. // Create a VolumeInfo to DataStore map too. Map<VolumeInfo, DataStore> volumeMap = new HashMap<VolumeInfo, DataStore>(); - for (Map.Entry<VolumeVO, StoragePoolVO> entry : volumeToPool.entrySet()) { - VolumeVO volume = entry.getKey(); - StoragePoolVO storagePool = entry.getValue(); + for (Map.Entry<Volume, StoragePool> entry : volumeToPool.entrySet()) { + Volume volume = entry.getKey(); + StoragePool storagePool = entry.getValue(); StoragePool destPool = (StoragePool)dataStoreMgr.getDataStore(storagePool.getId(), DataStoreRole.Primary); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java index 42ff5d4..8f84055 100644 --- a/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/ClusteredVirtualMachineManagerImpl.java @@ -20,16 +20,17 @@ import java.util.List; import java.util.Map; import javax.ejb.Local; +import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - +import com.cloud.cluster.ClusterManager; import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHostVO; @Local(value=VirtualMachineManager.class) public class ClusteredVirtualMachineManagerImpl extends VirtualMachineManagerImpl implements ClusterManagerListener { + @Inject + ClusterManager _clusterMgr; protected ClusteredVirtualMachineManagerImpl() { } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/src/com/cloud/vm/ReservationContextImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/ReservationContextImpl.java b/server/src/com/cloud/vm/ReservationContextImpl.java index f187f2b..cab93b4 100644 --- a/server/src/com/cloud/vm/ReservationContextImpl.java +++ b/server/src/com/cloud/vm/ReservationContextImpl.java @@ -16,12 +16,11 @@ // under the License. package com.cloud.vm; +import com.cloud.dao.EntityManager; import com.cloud.domain.Domain; -import com.cloud.domain.dao.DomainDao; +import com.cloud.domain.DomainVO; import com.cloud.user.Account; import com.cloud.user.User; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.UserDao; import com.cloud.utils.Journal; public class ReservationContextImpl implements ReservationContext { @@ -65,17 +64,14 @@ public class ReservationContextImpl implements ReservationContext { @Override public Account getAccount() { - if (_account == null) { - _account = s_accountDao.findByIdIncludingRemoved(_caller.getId()); - } - return _account; + return _account; } @Override public Domain getDomain() { if (_domain == null) { getAccount(); - _domain = s_domainDao.findByIdIncludingRemoved(_account.getDomainId()); + _domain = s_entityMgr.findById(DomainVO.class, _account.getDomainId()); } return _domain; } @@ -90,13 +86,9 @@ public class ReservationContextImpl implements ReservationContext { return _reservationId; } - static UserDao s_userDao; - static DomainDao s_domainDao; - static AccountDao s_accountDao; + static EntityManager s_entityMgr; - static public void setComponents(UserDao userDao, DomainDao domainDao, AccountDao accountDao) { - s_userDao = userDao; - s_domainDao = domainDao; - s_accountDao = accountDao; + static public void setComponents(EntityManager entityMgr) { + s_entityMgr = entityMgr; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 6b840a9..8378fdd 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3992,7 +3992,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } List<VolumeVO> vmVolumes = _volsDao.findUsableVolumesForInstance(vm.getId()); - Map<VolumeVO, StoragePoolVO> volToPoolObjectMap = new HashMap<VolumeVO, StoragePoolVO>(); + Map<Volume, StoragePool> volToPoolObjectMap = new HashMap<Volume, StoragePool>(); if (!isVMUsingLocalStorage(vm) && destinationHost.getClusterId().equals(srcHost.getClusterId())) { if (volumeToPool.isEmpty()) { // If the destination host is in the same cluster and volumes do not have to be migrated across pools http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 409fd62..e42427b 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -38,12 +38,10 @@ import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; -import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.framework.jobs.AsyncJobConstants; import org.apache.cloudstack.framework.jobs.AsyncJobManager; import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.messagebus.TopicConstants; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.vm.jobs.VmWorkJobDao; import org.apache.cloudstack.vm.jobs.VmWorkJobVO; @@ -79,27 +77,23 @@ import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.alert.AlertManager; import com.cloud.api.ApiSerializerHelper; import com.cloud.async.AsyncJobExecutionContext; -import com.cloud.capacity.CapacityManager; -import com.cloud.cluster.ClusterManager; +import com.cloud.cluster.ManagementServerNode; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dao.EntityManager; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterDetailsVO; +import com.cloud.dc.ClusterVO; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.HostPodDao; import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.deploy.DeploymentPlanningManager; -import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; import com.cloud.exception.AffinityConflictException; @@ -127,14 +121,12 @@ import com.cloud.hypervisor.HypervisorGuruManager; import com.cloud.network.Network; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; -import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.rules.RulesManager; import com.cloud.offering.ServiceOffering; import com.cloud.org.Cluster; import com.cloud.resource.ResourceManager; import com.cloud.service.ServiceOfferingVO; -import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageManager; @@ -144,19 +136,11 @@ import com.cloud.storage.Volume; import com.cloud.storage.Volume.Type; import com.cloud.storage.VolumeManager; import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.DiskOfferingDao; -import com.cloud.storage.dao.GuestOSCategoryDao; -import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.StoragePoolHostDao; -import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; -import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.user.Account; import com.cloud.user.AccountManager; -import com.cloud.user.ResourceLimitService; import com.cloud.user.User; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.UserDao; import com.cloud.utils.DateUtil; import com.cloud.utils.Journal; import com.cloud.utils.NumbersUtil; @@ -178,11 +162,9 @@ import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.PowerState; import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.NicDao; -import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.snapshot.VMSnapshotManager; -import com.cloud.vm.snapshot.dao.VMSnapshotDao; @Local(value = VirtualMachineManager.class) public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMachineManager, Listener { @@ -194,7 +176,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject protected StorageManager _storageMgr; @Inject - DataStoreManager dataStoreMgr; + DataStoreManager _dataStoreMgr; @Inject protected NetworkManager _networkMgr; @Inject @@ -203,31 +185,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac protected AgentManager _agentMgr; @Inject protected VMInstanceDao _vmDao; - @Inject - protected ServiceOfferingDao _offeringDao; - @Inject - protected DiskOfferingDao _diskOfferingDao; - @Inject - protected VMTemplateDao _templateDao; - @Inject - protected UserDao _userDao; - @Inject - protected AccountDao _accountDao; - @Inject - protected DomainDao _domainDao; - @Inject - protected ClusterManager _clusterMgr; - /* @Inject protected ItWorkDao _workDao; */ @Inject - protected UserVmDao _userVmDao; - @Inject - protected CapacityManager _capacityMgr; - @Inject protected NicDao _nicsDao; @Inject protected AccountManager _accountMgr; @@ -236,36 +199,16 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject protected AlertManager _alertMgr; @Inject - protected GuestOSCategoryDao _guestOsCategoryDao; - @Inject - protected GuestOSDao _guestOsDao; - @Inject protected VolumeDao _volsDao; @Inject protected ConfigurationManager _configMgr; @Inject protected HighAvailabilityManager _haMgr; @Inject - protected HostPodDao _podDao; - @Inject - protected DataCenterDao _dcDao; - @Inject - protected ClusterDao _clusterDao; - @Inject - protected PrimaryDataStoreDao _storagePoolDao; - @Inject protected HypervisorGuruManager _hvGuruMgr; @Inject - protected NetworkDao _networkDao; - @Inject protected StoragePoolHostDao _poolHostDao; @Inject - protected VMSnapshotDao _vmSnapshotDao; - @Inject - protected VolumeDataFactory volFactory; - @Inject - protected ResourceLimitService _resourceLimitMgr; - @Inject protected RulesManager rulesMgr; @Inject protected AffinityGroupVMMapDao _affinityGroupVMMapDao; @@ -276,8 +219,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return _planners; } - public void setPlanners(List<DeploymentPlanner> _planners) { - this._planners = _planners; + public void setPlanners(List<DeploymentPlanner> planners) { + _planners = planners; } protected List<HostAllocator> _hostAllocators; @@ -286,8 +229,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return _hostAllocators; } - public void setHostAllocators(List<HostAllocator> _hostAllocators) { - this._hostAllocators = _hostAllocators; + public void setHostAllocators(List<HostAllocator> hostAllocators) { + _hostAllocators = hostAllocators; } @Inject @@ -297,9 +240,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac protected ResourceManager _resourceMgr; @Inject - protected SnapshotManager _snapshotMgr; - - @Inject protected VMSnapshotManager _vmSnapshotMgr = null; @Inject protected ClusterDetailsDao _clusterDetailsDao; @@ -309,7 +249,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject protected ConfigurationDao _configDao; @Inject - VolumeManager volumeMgr; + VolumeManager _volumeMgr; @Inject protected MessageBus _messageBus; @Inject protected VirtualMachinePowerStateSync _syncMgr; @@ -398,15 +338,15 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } if (template.getFormat() == ImageFormat.ISO) { - volumeMgr.allocateRawVolume(Type.ROOT, "ROOT-" + vm.getId(), rootDiskOffering.first(), rootDiskOffering.second(), vm, owner); + _volumeMgr.allocateRawVolume(Type.ROOT, "ROOT-" + vm.getId(), rootDiskOffering.first(), rootDiskOffering.second(), vm, owner); } else if (template.getFormat() == ImageFormat.BAREMETAL) { // Do nothing } else { - volumeMgr.allocateTemplatedVolume(Type.ROOT, "ROOT-" + vm.getId(), rootDiskOffering.first(), template, vm, owner); + _volumeMgr.allocateTemplatedVolume(Type.ROOT, "ROOT-" + vm.getId(), rootDiskOffering.first(), template, vm, owner); } for (Pair<DiskOfferingVO, Long> offering : dataDiskOfferings) { - volumeMgr.allocateRawVolume(Type.DATADISK, "DATA-" + vm.getId(), offering.first(), offering.second(), vm, owner); + _volumeMgr.allocateRawVolume(Type.DATADISK, "DATA-" + vm.getId(), offering.first(), offering.second(), vm, owner); } txn.commit(); @@ -466,7 +406,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.debug("Cleaning up NICS"); _networkMgr.cleanupNics(profile); // Clean up volumes based on the vm's instance id - volumeMgr.cleanupVolumes(vm.getId()); + _volumeMgr.cleanupVolumes(vm.getId()); VirtualMachineGuru guru = getVmGuru(vm); guru.finalizeExpunge(vm); @@ -521,8 +461,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _retry = NumbersUtil.parseInt(params.get(Config.StartRetry.key()), 10); - ReservationContextImpl.setComponents(_userDao, _domainDao, _accountDao); - VirtualMachineProfileImpl.setComponents(_offeringDao, _templateDao, _accountDao); + ReservationContextImpl.setComponents(_entityMgr); + VirtualMachineProfileImpl.setComponents(_entityMgr); _cancelWait = NumbersUtil.parseLong(params.get(Config.VmOpCancelInterval.key()), 3600); _cleanupWait = NumbersUtil.parseLong(params.get(Config.VmOpCleanupWait.key()), 3600); @@ -533,7 +473,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _forceStop = Boolean.parseBoolean(params.get(Config.VmDestroyForcestop.key())); _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Vm-Operations-Cleanup")); - _nodeId = _clusterMgr.getManagementNodeId(); + _nodeId = ManagementServerNode.getManagementServerId(); _agentMgr.registerForHostEvents(this, true, true, true); @@ -849,7 +789,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac job.log(s_logger, "Recreating" + vol + " of " + vm + " because its template has changed."); plan.setPoolId(null); } else { - StoragePool pool = (StoragePool)dataStoreMgr.getPrimaryDataStore(vol.getPoolId()); + StoragePool pool = (StoragePool)_dataStoreMgr.getPrimaryDataStore(vol.getPoolId()); Long rootVolPodId = pool.getPodId(); Long rootVolClusterId = pool.getClusterId(); Long clusterIdSpecified = plan.getClusterId(); @@ -921,8 +861,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VmWorkJobVO work = start.third(); VMInstanceVO startedVm = null; - ServiceOfferingVO offering = _offeringDao.findById(vm.getServiceOfferingId()); - VMTemplateVO template = _templateDao.findById(vm.getTemplateId()); + ServiceOfferingVO offering = _entityMgr.findById(ServiceOfferingVO.class, vm.getServiceOfferingId()); + VMTemplateVO template = _entityMgr.findById(VMTemplateVO.class, vm.getTemplateId()); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType()); @@ -954,7 +894,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac try { _networkMgr.prepare(vmProfile, dest, reservation); - volumeMgr.prepare(vmProfile, dest); + _volumeMgr.prepare(vmProfile, dest); reuseVolume = true; @@ -1168,7 +1108,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.warn("Unable to release some network resources.", e); } - volumeMgr.release(profile); + _volumeMgr.release(profile); s_logger.debug("Successfully cleanued up resources for the vm " + vm + " in " + state + " state"); return true; } @@ -1366,7 +1306,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac try { if (vm.getHypervisorType() != HypervisorType.BareMetal) { - volumeMgr.release(profile); + _volumeMgr.release(profile); s_logger.debug("Successfully released storage resources for the vm " + vm); } } catch (Exception e) { @@ -1652,7 +1592,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); boolean migrationResult = false; try { - migrationResult = volumeMgr.storageMigration(profile, destPool); + migrationResult = _volumeMgr.storageMigration(profile, destPool); if (migrationResult) { //if the vm is migrated to different pod in basic mode, need to reallocate ip @@ -1861,24 +1801,23 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac */ } - private Map<VolumeVO, StoragePoolVO> getPoolListForVolumesForMigration(VirtualMachineProfile profile, - Host host, Map<VolumeVO, StoragePoolVO> volumeToPool) { + private void filterPoolListForVolumesForMigration(VirtualMachineProfile profile, Host host, Map<Volume, StoragePool> volumeToPool) { List<VolumeVO> allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId()); for (VolumeVO volume : allVolumes) { - StoragePoolVO pool = volumeToPool.get(volume); - DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); - StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId()); - if (pool != null) { + StoragePool dstPool = volumeToPool.get(volume); + DiskOfferingVO diskOffering = _entityMgr.findById(DiskOfferingVO.class, volume.getDiskOfferingId()); + StoragePoolVO srcPool = _entityMgr.findById(StoragePoolVO.class, volume.getPoolId()); + if (dstPool != null) { // Check if pool is accessible from the destination host and disk offering with which the volume was // created is compliant with the pool type. - if (_poolHostDao.findByPoolHost(pool.getId(), host.getId()) == null || - pool.isLocal() != diskOffering.getUseLocalStorage()) { + if (_poolHostDao.findByPoolHost(dstPool.getId(), host.getId()) == null || + dstPool.isLocal() != diskOffering.getUseLocalStorage()) { // Cannot find a pool for the volume. Throw an exception. - throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + pool + + throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + dstPool + " while migrating vm to host " + host + ". Either the pool is not accessible from the " + "host or because of the offering with which the volume is created it cannot be placed on " + "the given pool."); - } else if (pool.getId() == currentPool.getId()){ + } else if (dstPool.getId() == srcPool.getId()){ // If the pool to migrate too is the same as current pool, remove the volume from the list of // volumes to be migrated. volumeToPool.remove(volume); @@ -1898,10 +1837,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac // Volume needs to be migrated. Pick the first pool from the list. Add a mapping to migrate the // volume to a pool only if it is required; that is the current pool on which the volume resides // is not available on the destination host. - if (poolList.contains(currentPool)) { + if (poolList.contains(srcPool)) { currentPoolAvailable = true; } else { - volumeToPool.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid())); + volumeToPool.put(volume, poolList.get(0)); } break; @@ -1916,8 +1855,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } } - - return volumeToPool; } private void moveVmToMigratingState(VMInstanceVO vm, Long hostId, VmWorkJobVO work) @@ -1950,23 +1887,23 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public VirtualMachine migrateWithStorage(String vmUuid, long srcHostId, long destHostId, - Map<VolumeVO, StoragePoolVO> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, + Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException { CallContext context = CallContext.current(); VMInstanceVO vm = _vmDao.findByUuid(vmUuid); - HostVO srcHost = _hostDao.findById(srcHostId); - HostVO destHost = _hostDao.findById(destHostId); + HostVO srcHost = _entityMgr.findById(HostVO.class, srcHostId); + HostVO destHost = _entityMgr.findById(HostVO.class, destHostId); VirtualMachineGuru vmGuru = getVmGuru(vm); - DataCenterVO dc = _dcDao.findById(destHost.getDataCenterId()); - HostPodVO pod = _podDao.findById(destHost.getPodId()); - Cluster cluster = _clusterDao.findById(destHost.getClusterId()); + DataCenterVO dc = _entityMgr.findById(DataCenterVO.class, destHost.getDataCenterId()); + HostPodVO pod = _entityMgr.findById(HostPodVO.class, destHost.getPodId()); + Cluster cluster = _entityMgr.findById(ClusterVO.class, destHost.getClusterId()); DeployDestination destination = new DeployDestination(dc, pod, cluster, destHost); // Create a map of which volume should go in which storage pool. VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); - volumeToPool = getPoolListForVolumesForMigration(profile, destHost, volumeToPool); + filterPoolListForVolumesForMigration(profile, destHost, volumeToPool); // If none of the volumes have to be migrated, fail the call. Administrator needs to make a call for migrating // a vm and not migrating a vm with storage. @@ -1983,7 +1920,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } _networkMgr.prepareNicForMigration(profile, destination); - volumeMgr.prepareForMigration(profile, destination); + _volumeMgr.prepareForMigration(profile, destination); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType()); VirtualMachineTO to = hvGuru.implement(profile); @@ -2001,7 +1938,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac boolean migrated = false; try { // Migrate the vm and its volume. - volumeMgr.migrateVolumes(vm, to, srcHost, destHost, volumeToPool); + _volumeMgr.migrateVolumes(vm, to, srcHost, destHost, volumeToPool); // Put the vm back to running state. moveVmOutofMigratingStateOnSuccess(vm, destHost.getId(), work); @@ -2050,7 +1987,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac HypervisorGuru hvGuru = _hvGuruMgr.getGuru(profile.getVirtualMachine().getHypervisorType()); VirtualMachineTO to = hvGuru.implement(profile); return to; - } + } protected void cancelWorkItems(long nodeId) { /* @@ -2095,6 +2032,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean migrateAway(VirtualMachine.Type vmType, long vmId, long srcHostId) throws InsufficientServerCapacityException, VirtualMachineMigrationException { + CallContext cc = CallContext.current(); VMInstanceVO vm = _vmDao.findById(vmId); if (vm == null) { s_logger.debug("Unable to find a VM for " + vmId); @@ -2160,7 +2098,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return true; } try { - advanceStop(vm.getUuid(), true, _accountMgr.getSystemUser(), _accountMgr.getSystemAccount()); + advanceStop(vm.getUuid(), true, cc.getCallingUser(), cc.getCallingAccount()); return true; } catch (ResourceUnavailableException e) { s_logger.debug("Unable to stop VM due to " + e.getMessage()); @@ -3038,7 +2976,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public void checkIfCanUpgrade(VirtualMachine vmInstance, long newServiceOfferingId) { - ServiceOfferingVO newServiceOffering = _offeringDao.findById(newServiceOfferingId); + ServiceOfferingVO newServiceOffering = _entityMgr.findById(ServiceOfferingVO.class, newServiceOfferingId); if (newServiceOffering == null) { throw new InvalidParameterValueException("Unable to find a service offering with id " + newServiceOfferingId); } @@ -3061,7 +2999,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac "has the requested service offering (" + newServiceOffering.getName() + ")"); } - ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getServiceOfferingId()); + ServiceOfferingVO currentServiceOffering = _entityMgr.findByIdIncludingRemoved(ServiceOfferingVO.class, vmInstance.getServiceOfferingId()); // Check that the service offering being upgraded to has the same Guest IP type as the VM's current service offering // NOTE: With the new network refactoring in 2.2, we shouldn't need the check for same guest IP type anymore. @@ -3183,19 +3121,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + CallContext cc = CallContext.current(); s_logger.debug("Adding vm " + vm + " to network " + network + "; requested nic profile " + requested); - VMInstanceVO vmVO; - if (vm.getType() == VirtualMachine.Type.User) { - vmVO = _userVmDao.findById(vm.getId()); - } else { - vmVO = _vmDao.findById(vm.getId()); - } - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), - _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); + VMInstanceVO vmVO = _vmDao.findById(vm.getId()); + ReservationContext context = new ReservationContextImpl(null, null, cc.getCallingUser(), cc.getCallingAccount()); - VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, - null, null, null); + VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); DataCenter dc = _configMgr.getZone(network.getDataCenterId()); Host host = _hostDao.findById(vm.getHostId()); @@ -3255,10 +3187,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean removeNicFromVm(VirtualMachine vm, NicVO nic) throws ConcurrentOperationException, ResourceUnavailableException { + CallContext cc = CallContext.current(); + VMInstanceVO vmVO = _vmDao.findById(vm.getId()); - NetworkVO network = _networkDao.findById(nic.getNetworkId()); - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), - _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); + NetworkVO network = _entityMgr.findById(NetworkVO.class, nic.getNetworkId()); + ReservationContext context = new ReservationContextImpl(null, null, cc.getCallingUser(), cc.getCallingAccount()); VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); @@ -3319,9 +3252,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean removeVmFromNetwork(VirtualMachine vm, Network network, URI broadcastUri) throws ConcurrentOperationException, ResourceUnavailableException { + CallContext cc = CallContext.current(); + VMInstanceVO vmVO = _vmDao.findById(vm.getId()); - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), - _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); + ReservationContext context = new ReservationContextImpl(null, null, cc.getCallingUser(), cc.getCallingAccount()); VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/test/com/cloud/async/MockVirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/async/MockVirtualMachineManagerImpl.java b/server/test/com/cloud/async/MockVirtualMachineManagerImpl.java deleted file mode 100644 index e164d05..0000000 --- a/server/test/com/cloud/async/MockVirtualMachineManagerImpl.java +++ /dev/null @@ -1,361 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.async; - -import java.net.URI; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.naming.ConfigurationException; - -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; - -import com.cloud.agent.api.to.NicTO; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.deploy.DeployDestination; -import com.cloud.deploy.DeploymentPlan; -import com.cloud.exception.AgentUnavailableException; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientServerCapacityException; -import com.cloud.exception.ManagementServerException; -import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.VirtualMachineMigrationException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.Network; -import com.cloud.network.dao.NetworkVO; -import com.cloud.offering.ServiceOffering; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.storage.DiskOfferingVO; -import com.cloud.storage.StoragePool; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VolumeVO; -import com.cloud.user.Account; -import com.cloud.user.User; -import com.cloud.utils.Pair; -import com.cloud.utils.fsm.NoTransitionException; -import com.cloud.vm.NicProfile; -import com.cloud.vm.NicVO; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VmWork; -import com.cloud.vm.VirtualMachine.Event; -import com.cloud.vm.VirtualMachine.Type; -import com.cloud.vm.VirtualMachineGuru; -import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.VirtualMachineProfile; -import com.cloud.vm.VirtualMachineProfile.Param; - -public class MockVirtualMachineManagerImpl implements VirtualMachineManager { - - @Override - public String getName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setName(String name) { - // TODO Auto-generated method stub - - } - - @Override - public void setConfigParams(Map<String, Object> params) { - // TODO Auto-generated method stub - - } - - @Override - public Map<String, Object> getConfigParams() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getRunLevel() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void setRunLevel(int level) { - // TODO Auto-generated method stub - - } - - @Override - public boolean configure(String name, Map<String, Object> params) - throws ConfigurationException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean start() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean stop() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean allocate(String vmInstanceName, VMTemplateVO template, - ServiceOfferingVO serviceOffering, - Pair<? extends DiskOfferingVO, Long> rootDiskOffering, - List<Pair<DiskOfferingVO, Long>> dataDiskOfferings, - List<Pair<NetworkVO, NicProfile>> networks, - Map<Param, Object> params, DeploymentPlan plan, - HypervisorType hyperType, Account owner) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean allocate(String vmInstanceName, VMTemplateVO template, - ServiceOfferingVO serviceOffering, - List<Pair<NetworkVO, NicProfile>> networkProfiles, - DeploymentPlan plan, HypervisorType hyperType, Account owner) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void start(String vmUuid, Map<Param, Object> params, - @Deprecated User caller, @Deprecated Account account) { - // TODO Auto-generated method stub - - } - - @Override - public void start(String vmUuid, Map<Param, Object> params, - @Deprecated User caller, @Deprecated Account account, - DeploymentPlan planToDeploy) { - // TODO Auto-generated method stub - - } - - @Override - public void stop(String vmUuid, @Deprecated User caller, - @Deprecated Account account) { - // TODO Auto-generated method stub - - } - - @Override - public void expunge(String vmUuid, @Deprecated User caller, - @Deprecated Account account) { - // TODO Auto-generated method stub - - } - - @Override - public void registerGuru(Type type, VirtualMachineGuru guru) { - // TODO Auto-generated method stub - - } - - @Override - public Collection<VirtualMachineGuru> getRegisteredGurus() { - // TODO Auto-generated method stub - return null; - } - - @Override - public VirtualMachineGuru getVmGuru(VirtualMachine vm) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean stateTransitTo(VMInstanceVO vm, Event e, Long hostId) - throws NoTransitionException { - // TODO Auto-generated method stub - return false; - } - - @Override - public void advanceStart(String vmUuid, Map<Param, Object> params, - @Deprecated User caller, @Deprecated Account account) - throws InsufficientCapacityException, ResourceUnavailableException, - ConcurrentOperationException, OperationTimedoutException { - // TODO Auto-generated method stub - - } - - @Override - public void advanceStart(String vmUuid, Map<Param, Object> params, - @Deprecated User caller, @Deprecated Account account, - DeploymentPlan planToDeploy) throws InsufficientCapacityException, - ResourceUnavailableException, ConcurrentOperationException, - OperationTimedoutException { - // TODO Auto-generated method stub - - } - - @Override - public void advanceStop(String vmUuid, boolean cleanup, - @Deprecated User caller, @Deprecated Account account) - throws ResourceUnavailableException, OperationTimedoutException, - ConcurrentOperationException { - // TODO Auto-generated method stub - - } - - @Override - public void advanceExpunge(String vmUuid, @Deprecated User caller, - @Deprecated Account account) throws ResourceUnavailableException, - OperationTimedoutException, ConcurrentOperationException { - // TODO Auto-generated method stub - - } - - @Override - public boolean destroy(String vmUuid, @Deprecated User caller, - @Deprecated Account account) throws ResourceUnavailableException, - OperationTimedoutException, ConcurrentOperationException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean migrateAway(Type type, long vmid, long hostId) - throws InsufficientServerCapacityException, - VirtualMachineMigrationException { - // TODO Auto-generated method stub - return false; - } - - @Override - public VirtualMachine migrate(String vmUuid, long srcHostId, - DeployDestination dest) throws ResourceUnavailableException, - ConcurrentOperationException, ManagementServerException, - VirtualMachineMigrationException { - // TODO Auto-generated method stub - return null; - } - - @Override - public VirtualMachine migrateWithStorage(String vmUuid, long srcId, - long destId, Map<VolumeVO, StoragePoolVO> volumeToPool) - throws ResourceUnavailableException, ConcurrentOperationException, - ManagementServerException, VirtualMachineMigrationException { - // TODO Auto-generated method stub - return null; - } - - @Override - public void reboot(String vmUuid, User caller, Account account) { - // TODO Auto-generated method stub - - } - - @Override - public void advanceReboot(String vmUuid, User caller, Account account) - throws InsufficientCapacityException, ResourceUnavailableException, - ConcurrentOperationException, OperationTimedoutException { - // TODO Auto-generated method stub - - } - - @Override - public VirtualMachine storageMigration(String vmUuid, - StoragePool storagePoolId) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void checkIfCanUpgrade(VirtualMachine vmInstance, - long newServiceOfferingId) { - // TODO Auto-generated method stub - - } - - @Override - public boolean upgradeVmDb(long vmId, long serviceOfferingId) { - // TODO Auto-generated method stub - return false; - } - - @Override - public NicProfile addVmToNetwork(VirtualMachine vm, Network network, - NicProfile requested) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean removeNicFromVm(VirtualMachine vm, NicVO nic) - throws ConcurrentOperationException, ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean removeVmFromNetwork(VirtualMachine vm, Network network, - URI broadcastUri) throws ConcurrentOperationException, - ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override - public VirtualMachineTO toVmTO(VirtualMachineProfile profile) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean reConfigureVm(VirtualMachine vm, - ServiceOffering newServiceOffering, boolean sameHost) - throws ResourceUnavailableException, ConcurrentOperationException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean findHostAndMigrate(String vmUuid, Long newSvcOfferingId) - throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException, VirtualMachineMigrationException, - ManagementServerException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean migrateForScale(String vmUuid, long srcHostId, - DeployDestination dest, Long newSvcOfferingId) - throws ResourceUnavailableException, ConcurrentOperationException, - ManagementServerException, VirtualMachineMigrationException { - // TODO Auto-generated method stub - return false; - } - - @Override - public NicTO toNicTO(NicProfile nic, HypervisorType hypervisorType) { - // TODO Auto-generated method stub - return null; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java index e7dd38d..659adb7 100644 --- a/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -58,6 +58,7 @@ import com.cloud.agent.api.ScaleVmCommand; import com.cloud.capacity.CapacityManager; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dao.EntityManager; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; @@ -75,8 +76,10 @@ import com.cloud.hypervisor.HypervisorGuruManager; import com.cloud.network.NetworkManager; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; +import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolHostVO; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.Volume; import com.cloud.storage.VolumeManager; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.DiskOfferingDao; @@ -152,6 +155,9 @@ public class VirtualMachineManagerImplTest { @Mock ItWorkVO _work; + @Mock + EntityManager _entityMgr; + @Mock ClusterDao _clusterDao; @Mock HostPodDao _podDao; @Mock DataCenterDao _dcDao; @@ -168,31 +174,24 @@ public class VirtualMachineManagerImplTest { @Mock StoragePoolVO _destStoragePoolMock; @Mock HostVO _srcHostMock; @Mock HostVO _destHostMock; - @Mock Map<VolumeVO, StoragePoolVO> _volumeToPoolMock; + @Mock + Map<Volume, StoragePool> _volumeToPoolMock; @Before public void setup(){ MockitoAnnotations.initMocks(this); - _vmMgr._templateDao = _templateDao; + _vmMgr._entityMgr = _entityMgr; _vmMgr._volsDao = _volsDao; - _vmMgr.volumeMgr = _storageMgr; - _vmMgr._accountDao = _accountDao; - _vmMgr._userDao = _userDao; + _vmMgr._volumeMgr = _storageMgr; _vmMgr._accountMgr = _accountMgr; _vmMgr._configMgr = _configMgr; - _vmMgr._capacityMgr = _capacityMgr; _vmMgr._hostDao = _hostDao; _vmMgr._nodeId = 1L; /* _vmMgr._workDao = _workDao; */ _vmMgr._agentMgr = _agentMgr; - _vmMgr._podDao = _podDao; - _vmMgr._clusterDao = _clusterDao; - _vmMgr._dcDao = _dcDao; - _vmMgr._diskOfferingDao = _diskOfferingDao; - _vmMgr._storagePoolDao = _storagePoolDao; _vmMgr._poolHostDao= _poolHostDao; _vmMgr._networkMgr = _networkMgr; _vmMgr._hvGuruMgr = _hvGuruMgr; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad1c82fd/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java b/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java index 98b5af8..1d49071 100644 --- a/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java +++ b/server/test/com/cloud/vm/VmWorkMockVirtualMachineManagerImpl.java @@ -28,7 +28,6 @@ import org.apache.log4j.Logger; import org.apache.cloudstack.framework.jobs.AsyncJobConstants; import org.apache.cloudstack.framework.messagebus.MessageBus; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; @@ -51,7 +50,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.StoragePool; import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VolumeVO; +import com.cloud.storage.Volume; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; @@ -353,7 +352,7 @@ public class VmWorkMockVirtualMachineManagerImpl implements VirtualMachineManage } @Override - public VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<VolumeVO, StoragePoolVO> volumeToPool) throws ResourceUnavailableException, + public VirtualMachine migrateWithStorage(String vmUuid, long srcId, long destId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException { // TODO Auto-generated method stub return null;
