etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge with master

This commit is contained in:
Alex Huang 2010-12-03 04:21:37 -08:00
parent b859e103d8
commit 3aa19666cf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/api/commands/CreateSnapshotCmd.java
View File

@ -26,7 +26,6 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.response.SnapshotResponse;
import com.cloud.async.AsyncJob;
import com.cloud.event.EventTypes;
@ -114,6 +113,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
return "creating snapshot for volume: " + getVolumeId();
}
@Override
public AsyncJob.Type getInstanceType() {
return AsyncJob.Type.Snapshot;
}
@ -121,7 +121,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
@Override
public void callCreate(){
long id = _snapshotMgr.getNextInSequence(this);
this.setId(id);
this.setEntityId(id);
}
@Override

7
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -63,12 +63,11 @@ import com.cloud.event.dao.EventDao;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.UsageServerException;
import com.cloud.host.dao.DetailsDao;
import com.cloud.host.dao.HostDao;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Snapshot.Type;
import com.cloud.storage.Snapshot.Status;
import com.cloud.storage.Snapshot.Type;
import com.cloud.storage.SnapshotPolicyVO;
import com.cloud.storage.SnapshotScheduleVO;
import com.cloud.storage.SnapshotVO;
@ -101,10 +100,10 @@ import com.cloud.utils.component.Inject;
import com.cloud.utils.component.Manager;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.JoinBuilder.JoinType;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.UserVmDao;
@ -361,7 +360,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
public SnapshotVO createSnapshot(CreateSnapshotCmd cmd) throws ResourceAllocationException {
Long volumeId = cmd.getVolumeId();
Long policyId = cmd.getPolicyId();
Long snapshotId = cmd.getId();
Long snapshotId = cmd.getEntityId();
Long startEventId = cmd.getStartEventId();
return createSnapshotImpl(volumeId, policyId, snapshotId, startEventId);
}