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

CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id

Browse Source
This commit is contained in:
Alena Prokharchyk 2013-07-30 14:30:53 -07:00
parent 9b7c4a6c47
commit 9f66d18de6
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
View File

@ -338,13 +338,6 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScale
*/ */
ApiDispatcher.processParameters(new DeployVMCmd(), deployParams); ApiDispatcher.processParameters(new DeployVMCmd(), deployParams);
<<<<<<< HEAD
if (autoscaleUserId == null) {
autoscaleUserId = CallContext.current().getCallingUserId();
}
=======
>>>>>>> a9148d9... CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
AutoScaleVmProfileVO profileVO = new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), cmd.getOtherDeployParams(), AutoScaleVmProfileVO profileVO = new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), cmd.getOtherDeployParams(),
cmd.getCounterParamList(), cmd.getDestroyVmGraceperiod(), autoscaleUserId); cmd.getCounterParamList(), cmd.getDestroyVmGraceperiod(), autoscaleUserId);
profileVO = checkValidityAndPersist(profileVO); profileVO = checkValidityAndPersist(profileVO);