Updated Branches: refs/heads/object_store 896095760 -> 755b9311a
Fix some typo. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/755b9311 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/755b9311 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/755b9311 Branch: refs/heads/object_store Commit: 755b9311a4599955905afed561797344b3baf688 Parents: 8960957 Author: Min Chen <min.c...@citrix.com> Authored: Thu May 23 10:49:41 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Thu May 23 10:49:41 2013 -0700 ---------------------------------------------------------------------- .../CloudStackPrimaryDataStoreDriverImpl.java | 24 ++++---------- 1 files changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/755b9311/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java index aad1769..e801429 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java @@ -36,16 +36,10 @@ import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.apache.cloudstack.storage.to.SnapshotObjectTO; import org.apache.cloudstack.storage.volume.VolumeObject; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; -import com.cloud.agent.api.ManageSnapshotAnswer; -import com.cloud.agent.api.ManageSnapshotCommand; -import com.cloud.agent.api.storage.CreateAnswer; -import com.cloud.agent.api.storage.CreateCommand; -import com.cloud.agent.api.storage.DestroyCommand; import com.cloud.agent.api.storage.ResizeVolumeAnswer; import com.cloud.agent.api.storage.ResizeVolumeCommand; import com.cloud.agent.api.to.DataObjectType; @@ -54,19 +48,15 @@ import com.cloud.agent.api.to.DataTO; import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.exception.StorageUnavailableException; import com.cloud.host.dao.HostDao; -import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.ResizeVolumePayload; -import com.cloud.storage.SnapshotVO; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePool; import com.cloud.storage.VolumeManager; -import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.snapshot.SnapshotManager; -import com.cloud.vm.DiskProfile; import com.cloud.vm.dao.VMInstanceDao; public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver { @@ -82,7 +72,7 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri @Inject SnapshotDao snapshotDao; @Inject PrimaryDataStoreDao primaryStoreDao; @Inject SnapshotManager snapshotMgr; - @Inject EndPointSelector epSelecotor; + @Inject EndPointSelector epSelector; @Override public String grantAccess(DataObject data, EndPoint ep) { // TODO Auto-generated method stub @@ -118,9 +108,9 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri if (s_logger.isDebugEnabled()) { s_logger.debug("Creating volume: " + volume); } - + CreateObjectCommand cmd = new CreateObjectCommand(volume.getTO()); - EndPoint ep = epSelecotor.select(volume); + EndPoint ep = epSelector.select(volume); Answer answer = ep.sendMessage(cmd); return answer; } @@ -157,7 +147,7 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri CommandResult result = new CommandResult(); try { - EndPoint ep = epSelecotor.select(data); + EndPoint ep = epSelector.select(data); Answer answer = ep.sendMessage(cmd); if (answer != null && !answer.getResult()) { result.setResult(answer.getDetails()); @@ -188,11 +178,11 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri CreateCmdResult result = null; try { DataTO snapshotTO = snapshot.getTO(); - + CreateObjectCommand cmd = new CreateObjectCommand(snapshotTO); - EndPoint ep = this.epSelecotor.select(snapshot); + EndPoint ep = this.epSelector.select(snapshot); Answer answer = ep.sendMessage(cmd); - + result = new CreateCmdResult(null, answer); if (answer != null && !answer.getResult()) { result.setResult(answer.getDetails());
