apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab and trailing spaces

Browse Source
This commit is contained in:
Kelven Yang 2013-12-16 15:15:15 -08:00
parent 9d3827e6fe
commit 719271b1d9
14 changed files with 485 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/components-api/src/com/cloud/vm/VmWork.java
View File

@ -32,7 +32,7 @@ public class VmWork implements Serializable {
this.accountId = accountId; this.accountId = accountId;
this.vmId = vmId; this.vmId = vmId;
this.handlerName = handlerName; this.handlerName = handlerName;
} }
public long getUserId() { public long getUserId() {
return userId; return userId;
@ -42,9 +42,9 @@ public class VmWork implements Serializable {
return accountId; return accountId;
} }
public long getVmId() { public long getVmId() {
return vmId; return vmId;
} }
public String getHandlerName() { public String getHandlerName() {
return handlerName; return handlerName;

464
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -736,9 +736,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
} }
private void orchestrateStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy) throws InsufficientCapacityException, private void orchestrateStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException { ConcurrentOperationException, ResourceUnavailableException {
CallContext cctxt = CallContext.current(); CallContext cctxt = CallContext.current();
Account account = cctxt.getCallingAccount(); Account account = cctxt.getCallingAccount();
User caller = cctxt.getCallingUser(); User caller = cctxt.getCallingUser();
@ -1898,7 +1898,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
} }
private void orchestrateMigrateWithStorage(String vmUuid, long srcHostId, long destHostId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException, private void orchestrateMigrateWithStorage(String vmUuid, long srcHostId, long destHostId, Map<Volume, StoragePool> volumeToPool) throws ResourceUnavailableException,
ConcurrentOperationException { ConcurrentOperationException {
VMInstanceVO vm = _vmDao.findByUuid(vmUuid); VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
@ -3448,9 +3448,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
} }
private void orchestrateMigrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId) private void orchestrateMigrateForScale(String vmUuid, long srcHostId, DeployDestination dest, Long oldSvcOfferingId)
throws ResourceUnavailableException, ConcurrentOperationException { throws ResourceUnavailableException, ConcurrentOperationException {
VMInstanceVO vm = _vmDao.findByUuid(vmUuid); VMInstanceVO vm = _vmDao.findByUuid(vmUuid);
s_logger.info("Migrating " + vm + " to " + dest); s_logger.info("Migrating " + vm + " to " + dest);
vm.getServiceOfferingId(); vm.getServiceOfferingId();
@ -4163,25 +4163,25 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
workJob.setUserId(callingUser.getId()); workJob.setUserId(callingUser.getId());
workJob.setStep(VmWorkJobVO.Step.Starting); workJob.setStep(VmWorkJobVO.Step.Starting);
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkStart workInfo = new VmWorkStart(callingUser.getId(), callingAccount.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER); VmWorkStart workInfo = new VmWorkStart(callingUser.getId(), callingAccount.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER);
workInfo.setPlan(planToDeploy); workInfo.setPlan(planToDeploy);
workInfo.setParams(params); workInfo.setParams(params);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
// Transaction syntax sugar has a cost here // Transaction syntax sugar has a cost here
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"),
VirtualMachine.PowerState.PowerOn, vm.getId(), null); VirtualMachine.PowerState.PowerOn, vm.getId(), null);
@ -4207,32 +4207,32 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkStop.class.getName()); workJob.setCmd(VmWorkStop.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setStep(VmWorkJobVO.Step.Prepare); workJob.setStep(VmWorkJobVO.Step.Prepare);
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkStop workInfo = new VmWorkStop(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, cleanup); VmWorkStop workInfo = new VmWorkStop(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, cleanup);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"),
VirtualMachine.PowerState.PowerOff, vm.getId(), null); VirtualMachine.PowerState.PowerOff, vm.getId(), null);
@ -4266,26 +4266,26 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkReboot.class.getName()); workJob.setCmd(VmWorkReboot.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setStep(VmWorkJobVO.Step.Prepare); workJob.setStep(VmWorkJobVO.Step.Prepare);
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkReboot workInfo = new VmWorkReboot(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, params); VmWorkReboot workInfo = new VmWorkReboot(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, params);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"),
vm.getId()); vm.getId());
@ -4301,41 +4301,41 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkMigrate.class.getName()); VmWorkMigrate.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkMigrate.class.getName()); workJob.setCmd(VmWorkMigrate.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkMigrate workInfo = new VmWorkMigrate(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, dest); VmWorkMigrate workInfo = new VmWorkMigrate(user.getId(), account.getId(), vm.getId(), VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, dest);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"),
VirtualMachine.PowerState.PowerOn, vm.getId(), vm.getPowerHostId()); VirtualMachine.PowerState.PowerOn, vm.getId(), vm.getPowerHostId());
@ -4354,42 +4354,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkMigrateWithStorage.class.getName()); VmWorkMigrateWithStorage.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkMigrate.class.getName()); workJob.setCmd(VmWorkMigrate.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkMigrateWithStorage workInfo = new VmWorkMigrateWithStorage(user.getId(), account.getId(), vm.getId(), VmWorkMigrateWithStorage workInfo = new VmWorkMigrateWithStorage(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, destHostId, volumeToPool); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, destHostId, volumeToPool);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), return new VmStateSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"),
VirtualMachine.PowerState.PowerOn, vm.getId(), destHostId); VirtualMachine.PowerState.PowerOn, vm.getId(), destHostId);
@ -4407,42 +4407,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkMigrateForScale.class.getName()); VmWorkMigrateForScale.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkMigrate.class.getName()); workJob.setCmd(VmWorkMigrate.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkMigrateForScale workInfo = new VmWorkMigrateForScale(user.getId(), account.getId(), vm.getId(), VmWorkMigrateForScale workInfo = new VmWorkMigrateForScale(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, dest, newSvcOfferingId); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, srcHostId, dest, newSvcOfferingId);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId()); return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId());
} }
@ -4459,42 +4459,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkStorageMigration.class.getName()); VmWorkStorageMigration.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkStorageMigration.class.getName()); workJob.setCmd(VmWorkStorageMigration.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkStorageMigration workInfo = new VmWorkStorageMigration(user.getId(), account.getId(), vm.getId(), VmWorkStorageMigration workInfo = new VmWorkStorageMigration(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, destPool); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, destPool);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId()); return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId());
} }
@ -4559,42 +4559,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkRemoveNicFromVm.class.getName()); VmWorkRemoveNicFromVm.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkRemoveNicFromVm.class.getName()); workJob.setCmd(VmWorkRemoveNicFromVm.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkRemoveNicFromVm workInfo = new VmWorkRemoveNicFromVm(user.getId(), account.getId(), vm.getId(), VmWorkRemoveNicFromVm workInfo = new VmWorkRemoveNicFromVm(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, nic); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, nic);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId()); return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId());
} }
@ -4609,42 +4609,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkRemoveVmFromNetwork.class.getName()); VmWorkRemoveVmFromNetwork.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkRemoveVmFromNetwork.class.getName()); workJob.setCmd(VmWorkRemoveVmFromNetwork.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkRemoveVmFromNetwork workInfo = new VmWorkRemoveVmFromNetwork(user.getId(), account.getId(), vm.getId(), VmWorkRemoveVmFromNetwork workInfo = new VmWorkRemoveVmFromNetwork(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, network, broadcastUri); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, network, broadcastUri);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId()); return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId());
} }
@ -4661,42 +4661,42 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
_vmDao.lockRow(vm.getId(), true); _vmDao.lockRow(vm.getId(), true);
List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs( List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
VirtualMachine.Type.Instance, vm.getId(), VirtualMachine.Type.Instance, vm.getId(),
VmWorkReconfigure.class.getName()); VmWorkReconfigure.class.getName());
VmWorkJobVO workJob = null; VmWorkJobVO workJob = null;
if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) {
assert (pendingWorkJobs.size() == 1); assert (pendingWorkJobs.size() == 1);
workJob = pendingWorkJobs.get(0); workJob = pendingWorkJobs.get(0);
} else { } else {
workJob = new VmWorkJobVO(context.getContextId()); workJob = new VmWorkJobVO(context.getContextId());
workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER); workJob.setDispatcher(VmWorkJobDispatcher.VM_WORK_JOB_DISPATCHER);
workJob.setCmd(VmWorkReconfigure.class.getName()); workJob.setCmd(VmWorkReconfigure.class.getName());
workJob.setAccountId(account.getId()); workJob.setAccountId(account.getId());
workJob.setUserId(user.getId()); workJob.setUserId(user.getId());
workJob.setVmType(vm.getType()); workJob.setVmType(vm.getType());
workJob.setVmInstanceId(vm.getId()); workJob.setVmInstanceId(vm.getId());
// save work context info (there are some duplications) // save work context info (there are some duplications)
VmWorkReconfigure workInfo = new VmWorkReconfigure(user.getId(), account.getId(), vm.getId(), VmWorkReconfigure workInfo = new VmWorkReconfigure(user.getId(), account.getId(), vm.getId(),
VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, oldServiceOffering, reconfiguringOnExistingHost); VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, oldServiceOffering, reconfiguringOnExistingHost);
workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo));
_jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId()); _jobMgr.submitAsyncJob(workJob, VmWorkJobDispatcher.VM_WORK_QUEUE, vm.getId());
} }
context.putContextParameter("workJob", workJob); context.putContextParameter("workJob", workJob);
context.putContextParameter("jobId", new Long(workJob.getId())); context.putContextParameter("jobId", new Long(workJob.getId()));
} }
}); });
final long jobId = (Long)context.getContextParameter("jobId"); final long jobId = (Long)context.getContextParameter("jobId");
AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId); AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(jobId);
return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId()); return new VmJobSyncOutcome((VmWorkJobVO)context.getContextParameter("workJob"), vm.getId());
} }

24
engine/orchestration/src/com/cloud/vm/VmWorkAddVmToNetwork.java
View File

@ -21,22 +21,22 @@ import com.cloud.network.Network;
public class VmWorkAddVmToNetwork extends VmWork { public class VmWorkAddVmToNetwork extends VmWork {
private static final long serialVersionUID = 8861516006586736813L; private static final long serialVersionUID = 8861516006586736813L;
Network network; Network network;
NicProfile requstedNicProfile; NicProfile requstedNicProfile;
public VmWorkAddVmToNetwork(long userId, long accountId, long vmId, String handlerName, public VmWorkAddVmToNetwork(long userId, long accountId, long vmId, String handlerName,
Network network, NicProfile requested) { Network network, NicProfile requested) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.network = network; this.network = network;
requstedNicProfile = requested; requstedNicProfile = requested;
} }
public Network getNetwork() { public Network getNetwork() {
return network; return network;
} }
public NicProfile getRequestedNicProfile() { public NicProfile getRequestedNicProfile() {
return requstedNicProfile; return requstedNicProfile;
} }
} }

5
engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
View File

@ -41,7 +41,8 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch
public static final String VM_WORK_JOB_WAKEUP_DISPATCHER = "VmWorkJobWakeupDispatcher"; public static final String VM_WORK_JOB_WAKEUP_DISPATCHER = "VmWorkJobWakeupDispatcher";
@Inject private VirtualMachineManagerImpl _vmMgr; @Inject private VirtualMachineManagerImpl _vmMgr;
@Inject private AsyncJobManager _asyncJobMgr; @Inject
private AsyncJobManager _asyncJobMgr;
@Inject private VMInstanceDao _instanceDao; @Inject private VMInstanceDao _instanceDao;
private Map<String, VmWorkJobHandler> _handlers; private Map<String, VmWorkJobHandler> _handlers;
@ -57,7 +58,7 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch
_handlers = handlers; _handlers = handlers;
} }
@Override @Override
public void runJob(AsyncJob job) { public void runJob(AsyncJob job) {
VmWork work = null; VmWork work = null;
try { try {

20
engine/orchestration/src/com/cloud/vm/VmWorkMigrateForScale.java
View File

@ -19,19 +19,19 @@ package com.cloud.vm;
import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeployDestination;
public class VmWorkMigrateForScale extends VmWork { public class VmWorkMigrateForScale extends VmWork {
private static final long serialVersionUID = 6854870395568389613L; private static final long serialVersionUID = 6854870395568389613L;
long srcHostId; long srcHostId;
DeployDestination deployDestination; DeployDestination deployDestination;
Long newSvcOfferingId; Long newSvcOfferingId;
public VmWorkMigrateForScale(long userId, long accountId, long vmId, String handlerName, long srcHostId, public VmWorkMigrateForScale(long userId, long accountId, long vmId, String handlerName, long srcHostId,
DeployDestination dest, Long newSvcOfferingId) { DeployDestination dest, Long newSvcOfferingId) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.srcHostId = srcHostId; this.srcHostId = srcHostId;
deployDestination = dest; deployDestination = dest;
this.newSvcOfferingId = newSvcOfferingId; this.newSvcOfferingId = newSvcOfferingId;
} }
public long getSrcHostId() { public long getSrcHostId() {
@ -39,10 +39,10 @@ public class VmWorkMigrateForScale extends VmWork {
} }
public DeployDestination getDeployDestination() { public DeployDestination getDeployDestination() {
return deployDestination; return deployDestination;
} }
public Long getNewServiceOfferringId() { public Long getNewServiceOfferringId() {
return newSvcOfferingId; return newSvcOfferingId;
} }
} }

22
engine/orchestration/src/com/cloud/vm/VmWorkMigrateWithStorage.java
View File

@ -22,31 +22,31 @@ import com.cloud.storage.StoragePool;
import com.cloud.storage.Volume; import com.cloud.storage.Volume;
public class VmWorkMigrateWithStorage extends VmWork { public class VmWorkMigrateWithStorage extends VmWork {
private static final long serialVersionUID = -5626053872453569165L; private static final long serialVersionUID = -5626053872453569165L;
long srcHostId; long srcHostId;
long destHostId; long destHostId;
Map<Volume, StoragePool> volumeToPool; Map<Volume, StoragePool> volumeToPool;
public VmWorkMigrateWithStorage(long userId, long accountId, long vmId, String handlerName, long srcHostId, public VmWorkMigrateWithStorage(long userId, long accountId, long vmId, String handlerName, long srcHostId,
long destHostId, Map<Volume, StoragePool> volumeToPool) { long destHostId, Map<Volume, StoragePool> volumeToPool) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.srcHostId = srcHostId; this.srcHostId = srcHostId;
this.destHostId = destHostId; this.destHostId = destHostId;
this.volumeToPool = volumeToPool; this.volumeToPool = volumeToPool;
} }
public long getSrcHostId() { public long getSrcHostId() {
return srcHostId; return srcHostId;
} }
public long getDestHostId() { public long getDestHostId() {
return destHostId; return destHostId;
} }
public Map<Volume, StoragePool> getVolumeToPool() { public Map<Volume, StoragePool> getVolumeToPool() {
return volumeToPool; return volumeToPool;
} }
} }

2
engine/orchestration/src/com/cloud/vm/VmWorkReboot.java
View File

@ -31,7 +31,7 @@ public class VmWorkReboot extends VmWork {
public VmWorkReboot(long userId, long accountId, long vmId, String handlerName, Map<VirtualMachineProfile.Param, Object> params) { public VmWorkReboot(long userId, long accountId, long vmId, String handlerName, Map<VirtualMachineProfile.Param, Object> params) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
setParams(params); setParams(params);
} }
public Map<VirtualMachineProfile.Param, Object> getParams() { public Map<VirtualMachineProfile.Param, Object> getParams() {

16
engine/orchestration/src/com/cloud/vm/VmWorkReconfigure.java
View File

@ -19,25 +19,25 @@ package com.cloud.vm;
import com.cloud.offering.ServiceOffering; import com.cloud.offering.ServiceOffering;
public class VmWorkReconfigure extends VmWork { public class VmWorkReconfigure extends VmWork {
private static final long serialVersionUID = -4517030323758086615L; private static final long serialVersionUID = -4517030323758086615L;
ServiceOffering newServiceOffering; ServiceOffering newServiceOffering;
boolean sameHost; boolean sameHost;
public VmWorkReconfigure(long userId, long accountId, long vmId, String handlerName, public VmWorkReconfigure(long userId, long accountId, long vmId, String handlerName,
ServiceOffering newServiceOffering, boolean sameHost) { ServiceOffering newServiceOffering, boolean sameHost) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.newServiceOffering = newServiceOffering; this.newServiceOffering = newServiceOffering;
this.sameHost = sameHost; this.sameHost = sameHost;
} }
public ServiceOffering getNewServiceOffering() { public ServiceOffering getNewServiceOffering() {
return newServiceOffering; return newServiceOffering;
} }
public boolean isSameHost() { public boolean isSameHost() {
return sameHost; return sameHost;
} }
} }

6
engine/orchestration/src/com/cloud/vm/VmWorkRemoveNicFromVm.java
View File

@ -19,15 +19,15 @@ package com.cloud.vm;
public class VmWorkRemoveNicFromVm extends VmWork { public class VmWorkRemoveNicFromVm extends VmWork {
private static final long serialVersionUID = -4265657031064437923L; private static final long serialVersionUID = -4265657031064437923L;
Nic nic; Nic nic;
public VmWorkRemoveNicFromVm(long userId, long accountId, long vmId, String handlerName, Nic nic) { public VmWorkRemoveNicFromVm(long userId, long accountId, long vmId, String handlerName, Nic nic) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.nic = nic; this.nic = nic;
} }
public Nic getNic() { public Nic getNic() {
return nic; return nic;
} }
} }

24
engine/orchestration/src/com/cloud/vm/VmWorkRemoveVmFromNetwork.java
View File

@ -21,23 +21,23 @@ import java.net.URI;
import com.cloud.network.Network; import com.cloud.network.Network;
public class VmWorkRemoveVmFromNetwork extends VmWork { public class VmWorkRemoveVmFromNetwork extends VmWork {
private static final long serialVersionUID = -5070392905642149925L; private static final long serialVersionUID = -5070392905642149925L;
Network network; Network network;
URI broadcastUri; URI broadcastUri;
public VmWorkRemoveVmFromNetwork(long userId, long accountId, long vmId, String handlerName, Network network, URI broadcastUri) { public VmWorkRemoveVmFromNetwork(long userId, long accountId, long vmId, String handlerName, Network network, URI broadcastUri) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.network = network; this.network = network;
this.broadcastUri = broadcastUri; this.broadcastUri = broadcastUri;
} }
public Network getNetwork() { public Network getNetwork() {
return network; return network;
} }
public URI getBroadcastUri() { public URI getBroadcastUri() {
return broadcastUri; return broadcastUri;
} }
} }

116
engine/orchestration/src/com/cloud/vm/VmWorkStart.java
View File

@ -52,74 +52,74 @@ public class VmWorkStart extends VmWork {
public VmWorkStart(long userId, long accountId, long vmId, String handlerName) { public VmWorkStart(long userId, long accountId, long vmId, String handlerName) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
} }
public DeploymentPlan getPlan() { public DeploymentPlan getPlan() {
if(podId != null || clusterId != null || hostId != null || poolId != null || physicalNetworkId != null) { if (podId != null || clusterId != null || hostId != null || poolId != null || physicalNetworkId != null) {
// this is ugly, to work with legacy code, we need to re-construct the DeploymentPlan hard-codely // this is ugly, to work with legacy code, we need to re-construct the DeploymentPlan hard-codely
// this has to be refactored together with migrating legacy code into the new way // this has to be refactored together with migrating legacy code into the new way
ReservationContext context = null; ReservationContext context = null;
if(reservationId != null) { if (reservationId != null) {
Journal journal = new Journal.LogJournal("VmWorkStart", s_logger); Journal journal = new Journal.LogJournal("VmWorkStart", s_logger);
context = new ReservationContextImpl(reservationId, journal, context = new ReservationContextImpl(reservationId, journal,
CallContext.current().getCallingUser(), CallContext.current().getCallingUser(),
CallContext.current().getCallingAccount()); CallContext.current().getCallingAccount());
} }
DeploymentPlan plan = new DataCenterDeployment( DeploymentPlan plan = new DataCenterDeployment(
dcId, podId, clusterId, hostId, poolId, physicalNetworkId, dcId, podId, clusterId, hostId, poolId, physicalNetworkId,
context); context);
return plan; return plan;
} }
return null; return null;
} }
public void setPlan(DeploymentPlan plan) { public void setPlan(DeploymentPlan plan) {
if(plan != null) { if (plan != null) {
dcId = plan.getDataCenterId(); dcId = plan.getDataCenterId();
podId = plan.getPodId(); podId = plan.getPodId();
clusterId = plan.getClusterId(); clusterId = plan.getClusterId();
hostId = plan.getHostId(); hostId = plan.getHostId();
poolId = plan.getPoolId(); poolId = plan.getPoolId();
physicalNetworkId = plan.getPhysicalNetworkId(); physicalNetworkId = plan.getPhysicalNetworkId();
avoids = plan.getAvoids(); avoids = plan.getAvoids();
if(plan.getReservationContext() != null) if (plan.getReservationContext() != null)
reservationId = plan.getReservationContext().getReservationId(); reservationId = plan.getReservationContext().getReservationId();
} }
} }
public Map<String, String> getRawParams() { public Map<String, String> getRawParams() {
return rawParams; return rawParams;
} }
public void setRawParams(Map<String, String> params) { public void setRawParams(Map<String, String> params) {
rawParams = params; rawParams = params;
} }
public Map<VirtualMachineProfile.Param, Object> getParams() { public Map<VirtualMachineProfile.Param, Object> getParams() {
Map<VirtualMachineProfile.Param, Object> map = new HashMap<VirtualMachineProfile.Param, Object>(); Map<VirtualMachineProfile.Param, Object> map = new HashMap<VirtualMachineProfile.Param, Object>();
if(rawParams != null) { if (rawParams != null) {
for(Map.Entry<String, String> entry : rawParams.entrySet()) { for (Map.Entry<String, String> entry : rawParams.entrySet()) {
VirtualMachineProfile.Param key = new VirtualMachineProfile.Param(entry.getKey()); VirtualMachineProfile.Param key = new VirtualMachineProfile.Param(entry.getKey());
Object val = JobSerializerHelper.fromObjectSerializedString(entry.getValue()); Object val = JobSerializerHelper.fromObjectSerializedString(entry.getValue());
map.put(key, val); map.put(key, val);
} }
} }
return map; return map;
} }
public void setParams(Map<VirtualMachineProfile.Param, Object> params) { public void setParams(Map<VirtualMachineProfile.Param, Object> params) {
if(params != null) { if (params != null) {
rawParams = new HashMap<String, String>(); rawParams = new HashMap<String, String>();
for(Map.Entry<VirtualMachineProfile.Param, Object> entry : params.entrySet()) { for (Map.Entry<VirtualMachineProfile.Param, Object> entry : params.entrySet()) {
rawParams.put(entry.getKey().getName(), JobSerializerHelper.toObjectSerializedString( rawParams.put(entry.getKey().getName(), JobSerializerHelper.toObjectSerializedString(
entry.getValue() instanceof Serializable ? (Serializable)entry.getValue() : entry.getValue().toString())); entry.getValue() instanceof Serializable ? (Serializable)entry.getValue() : entry.getValue().toString()));
} }
} }
} }
} }

4
engine/orchestration/src/com/cloud/vm/VmWorkStop.java
View File

@ -17,9 +17,9 @@
package com.cloud.vm; package com.cloud.vm;
public class VmWorkStop extends VmWork { public class VmWorkStop extends VmWork {
private static final long serialVersionUID = 202908740486785251L; private static final long serialVersionUID = 202908740486785251L;
private final boolean cleanup; private final boolean cleanup;
public VmWorkStop(long userId, long accountId, long vmId, String handlerName, boolean cleanup) { public VmWorkStop(long userId, long accountId, long vmId, String handlerName, boolean cleanup) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);

4
engine/orchestration/src/com/cloud/vm/VmWorkStorageMigration.java
View File

@ -26,10 +26,10 @@ public class VmWorkStorageMigration extends VmWork {
public VmWorkStorageMigration(long userId, long accountId, long vmId, String handlerName, StoragePool destPool) { public VmWorkStorageMigration(long userId, long accountId, long vmId, String handlerName, StoragePool destPool) {
super(userId, accountId, vmId, handlerName); super(userId, accountId, vmId, handlerName);
this.destPool = destPool; this.destPool = destPool;
} }
public StoragePool getDestStoragePool() { public StoragePool getDestStoragePool() {
return destPool; return destPool;
} }
} }