You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/02/27 08:05:34 UTC
git commit: refs/heads/master - CLOUDSTACK-1293: resetpasswordforVm
shows "passsd reset to undefined"
Updated Branches:
refs/heads/master dc6b4b54f -> 254275dc2
CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined"
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/254275dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/254275dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/254275dc
Branch: refs/heads/master
Commit: 254275dc268c116bb9d88d772b3b33bd9b02967c
Parents: dc6b4b5
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Wed Feb 27 09:57:07 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Feb 27 12:35:04 2013 +0530
----------------------------------------------------------------------
.../cloud/entity/api/VirtualMachineEntity.java | 4 +++-
.../engine/cloud/entity/api/VMEntityManager.java | 5 ++++-
.../cloud/entity/api/VMEntityManagerImpl.java | 5 +++--
.../cloud/entity/api/VirtualMachineEntityImpl.java | 15 ++++++++-------
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
5 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/254275dc/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
----------------------------------------------------------------------
diff --git a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
index 1fd4e54..de0e7c2 100755
--- a/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
+++ b/engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntity.java
@@ -19,6 +19,7 @@
package org.apache.cloudstack.engine.cloud.entity.api;
import java.util.List;
+import java.util.Map;
import javax.ws.rs.BeanParam;
import javax.ws.rs.GET;
@@ -36,6 +37,7 @@ import com.cloud.exception.CloudException;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.vm.VirtualMachineProfile;
/**
@@ -104,7 +106,7 @@ public interface VirtualMachineEntity extends CloudStackEntity {
* @param reservationId reservation id from reserve call.
*
*/
- void deploy(String reservationId, String caller) throws InsufficientCapacityException, ResourceUnavailableException;
+ void deploy(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
/**
* Stop the virtual machine
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/254275dc/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
index 8e58e73..a36ca3a 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java
@@ -25,6 +25,9 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.vm.VirtualMachineProfile;
+
+import java.util.Map;
public interface VMEntityManager {
@@ -34,7 +37,7 @@ public interface VMEntityManager {
String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException;
- void deployVirtualMachine(String reservationId, String caller) throws InsufficientCapacityException, ResourceUnavailableException;
+ void deployVirtualMachine(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException;
boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/254275dc/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
index 552aba4..d7bab4a 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
@@ -58,6 +58,7 @@ import com.cloud.user.dao.UserDao;
import com.cloud.utils.component.ComponentContext;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachineManager;
+import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachineProfileImpl;
import com.cloud.vm.dao.VMInstanceDao;
@@ -188,7 +189,7 @@ public class VMEntityManagerImpl implements VMEntityManager {
}
@Override
- public void deployVirtualMachine(String reservationId, String caller) throws InsufficientCapacityException, ResourceUnavailableException{
+ public void deployVirtualMachine(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException{
//grab the VM Id and destination using the reservationId.
VMReservationVO vmReservation = _reservationDao.findByReservationId(reservationId);
@@ -208,7 +209,7 @@ public class VMEntityManagerImpl implements VMEntityManager {
DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(),
vmReservation.getHostId(), poolId , null);
- VMInstanceVO vmDeployed = _itMgr.start(vm, null, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()), plan);
+ VMInstanceVO vmDeployed = _itMgr.start(vm, params, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()), plan);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/254275dc/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
index 13358d8..508b0b9 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java
@@ -33,6 +33,7 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.vm.VirtualMachineProfile;
@Component
public class VirtualMachineEntityImpl implements VirtualMachineEntity {
@@ -40,14 +41,14 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
@Inject private VMEntityManager manager;
private VMEntityVO vmEntityVO;
-
+
public VirtualMachineEntityImpl() {
}
-
+
public void init(String vmId) {
- this.vmEntityVO = this.manager.loadVirtualMachine(vmId);
+ this.vmEntityVO = this.manager.loadVirtualMachine(vmId);
}
-
+
public void init(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List<String> computeTags, List<String> rootDiskTags, List<String> networks) {
init(vmId);
this.vmEntityVO.setOwner(owner);
@@ -57,7 +58,7 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
this.vmEntityVO.setComputeTags(computeTags);
this.vmEntityVO.setRootDiskTags(rootDiskTags);
this.vmEntityVO.setNetworkIds(networks);
-
+
manager.saveVirtualMachine(vmEntityVO);
}
@@ -204,8 +205,8 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity {
}
@Override
- public void deploy(String reservationId, String caller) throws InsufficientCapacityException, ResourceUnavailableException{
- manager.deployVirtualMachine(reservationId, caller);
+ public void deploy(String reservationId, String caller, Map<VirtualMachineProfile.Param, Object> params) throws InsufficientCapacityException, ResourceUnavailableException{
+ manager.deployVirtualMachine(reservationId, caller, params);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/254275dc/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 c2bba63..ce53c45 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2907,7 +2907,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
}
String reservationId = vmEntity.reserve(plannerName, plan, new ExcludeList(), new Long(callerUser.getId()).toString());
- vmEntity.deploy(reservationId, new Long(callerUser.getId()).toString());
+ vmEntity.deploy(reservationId, new Long(callerUser.getId()).toString(), params);
Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> vmParamPair = new Pair(vm, params);
if (vm != null && vm.isUpdateParameters()) {