Incremental checkin

This commit is contained in:
abhishek 2010-08-17 10:00:09 -07:00
parent 663f982628
commit 1a0415601f
2 changed files with 4 additions and 2 deletions

View File

@ -732,8 +732,8 @@ public interface ManagementServer {
* @param serviceOfferingId * @param serviceOfferingId
* @return success/failure * @return success/failure
*/ */
boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId, long startEventId); // boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId, long startEventId);
long upgradeVirtualMachineAsync(long userId, long vmId, long serviceOfferingId) throws InvalidParameterValueException; // long upgradeVirtualMachineAsync(long userId, long vmId, long serviceOfferingId) throws InvalidParameterValueException;
/** /**

View File

@ -2611,6 +2611,7 @@ public class ManagementServerImpl implements ManagementServer {
return _vmMgr.recoverVirtualMachine(vmId); return _vmMgr.recoverVirtualMachine(vmId);
} }
/*
@Override @Override
public boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId,long startEventId) { public boolean upgradeVirtualMachine(long userId, long vmId, long serviceOfferingId,long startEventId) {
UserVmVO userVm = _userVmDao.findById(vmId); UserVmVO userVm = _userVmDao.findById(vmId);
@ -2701,6 +2702,7 @@ public class ManagementServerImpl implements ManagementServer {
return _asyncMgr.submitAsyncJob(job, true); return _asyncMgr.submitAsyncJob(job, true);
} }
*/
@Override @Override
public void updateVirtualMachine(long vmId, String displayName, String group, boolean enable, Long userId, long accountId) { public void updateVirtualMachine(long vmId, String displayName, String group, boolean enable, Long userId, long accountId) {