Fix typo in class name AsyncRpcConext -> AsyncRpcContext
Signed-off-by: Prasanna Santhanam <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de38cd81 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de38cd81 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de38cd81 Branch: refs/heads/vmsync Commit: de38cd815f76e39ddfd2d2cf9354378c677f718a Parents: 56a001d Author: Prasanna Santhanam <t...@apache.org> Authored: Tue Jun 25 19:05:30 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Sat Jun 29 13:50:25 2013 +0530 ---------------------------------------------------------------------- .../storage/image/TemplateServiceImpl.java | 7 +--- .../storage/snapshot/SnapshotServiceImpl.java | 8 ++-- .../datastore/DataObjectManagerImpl.java | 8 ++-- .../storage/image/BaseImageStoreDriverImpl.java | 41 +++++++++----------- .../storage/volume/VolumeServiceImpl.java | 16 ++++---- .../framework/async/AsyncRpcConext.java | 30 -------------- .../framework/async/AsyncRpcContext.java | 30 ++++++++++++++ .../AsyncSampleEventDrivenStyleCaller.java | 4 +- .../motion/VmwareStorageMotionStrategyTest.java | 4 +- .../CloudStackImageStoreLifeCycleImpl.java | 34 ++++++++-------- .../driver/SampleImageStoreDriverImpl.java | 2 - .../SamplePrimaryDataStoreDriverImpl.java | 14 ++++--- .../template/HypervisorTemplateAdapter.java | 16 ++++---- 13 files changed, 104 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java index da62712..22eb010 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java @@ -40,16 +40,14 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateEvent; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.DataObjectManager; @@ -84,7 +82,6 @@ import com.cloud.template.TemplateManager; import com.cloud.user.AccountManager; import com.cloud.user.ResourceLimitService; import com.cloud.utils.UriUtils; -import com.cloud.utils.fsm.NoTransitionException; @Component public class TemplateServiceImpl implements TemplateService { @@ -122,7 +119,7 @@ public class TemplateServiceImpl implements TemplateService { @Inject TemplateManager _tmpltMgr; - class TemplateOpContext<T> extends AsyncRpcConext<T> { + class TemplateOpContext<T> extends AsyncRpcContext<T> { final TemplateObject template; final AsyncCallFuture<TemplateApiResult> future; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java index 48ec512..3d7d4f2 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java @@ -33,7 +33,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.CopyCmdAnswer; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; @@ -79,7 +79,7 @@ public class SnapshotServiceImpl implements SnapshotService { @Inject VMSnapshotDao _vmSnapshotDao; - static private class CreateSnapshotContext<T> extends AsyncRpcConext<T> { + static private class CreateSnapshotContext<T> extends AsyncRpcContext<T> { final SnapshotInfo snapshot; final AsyncCallFuture<SnapshotResult> future; @@ -91,7 +91,7 @@ public class SnapshotServiceImpl implements SnapshotService { } } - static private class DeleteSnapshotContext<T> extends AsyncRpcConext<T> { + static private class DeleteSnapshotContext<T> extends AsyncRpcContext<T> { final SnapshotInfo snapshot; final AsyncCallFuture<SnapshotResult> future; @@ -104,7 +104,7 @@ public class SnapshotServiceImpl implements SnapshotService { } - static private class CopySnapshotContext<T> extends AsyncRpcConext<T> { + static private class CopySnapshotContext<T> extends AsyncRpcContext<T> { final SnapshotInfo srcSnapshot; final SnapshotInfo destSnapshot; final AsyncCallFuture<SnapshotResult> future; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java index 7878d8d..db69c64 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreState import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -78,7 +78,7 @@ public class DataObjectManagerImpl implements DataObjectManager { return objectInDataStoreMgr.get(dataObj, dataStore); } - class CreateContext<T> extends AsyncRpcConext<T> { + class CreateContext<T> extends AsyncRpcContext<T> { final DataObject objInStrore; public CreateContext(AsyncCompletionCallback<T> callback, DataObject objInStore) { @@ -205,7 +205,7 @@ public class DataObjectManagerImpl implements DataObjectManager { return null; } - class CopyContext<T> extends AsyncRpcConext<T> { + class CopyContext<T> extends AsyncRpcContext<T> { DataObject destObj; DataObject srcObj; @@ -293,7 +293,7 @@ public class DataObjectManagerImpl implements DataObjectManager { return null; } - class DeleteContext<T> extends AsyncRpcConext<T> { + class DeleteContext<T> extends AsyncRpcContext<T> { private final DataObject obj; public DeleteContext(AsyncCompletionCallback<T> callback, DataObject obj) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java index 97c1671..9db205b 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java @@ -18,10 +18,16 @@ */ package org.apache.cloudstack.storage.image; -import java.util.Date; -import java.util.Set; -import javax.inject.Inject; - +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.storage.DownloadAnswer; +import com.cloud.agent.api.to.DataObjectType; +import com.cloud.agent.api.to.DataTO; +import com.cloud.storage.VMTemplateStorageResourceAssoc; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.storage.dao.VolumeDao; +import com.cloud.storage.download.DownloadMonitor; import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; @@ -30,31 +36,22 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; -import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.log4j.Logger; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.storage.DownloadAnswer; -import com.cloud.agent.api.to.DataObjectType; -import com.cloud.agent.api.to.DataTO; -import com.cloud.storage.VMTemplateStorageResourceAssoc; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.VMTemplateDao; -import com.cloud.storage.dao.VolumeDao; -import com.cloud.storage.download.DownloadMonitor; +import javax.inject.Inject; +import java.util.Date; public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { private static final Logger s_logger = Logger.getLogger(BaseImageStoreDriverImpl.class); @Inject - VMTemplateDao templateDao; + VMTemplateDao _templateDao; @Inject DownloadMonitor _downloadMonitor; @Inject @@ -71,7 +68,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { return null; } - class CreateContext<T> extends AsyncRpcConext<T> { + class CreateContext<T> extends AsyncRpcContext<T> { final DataObject data; public CreateContext(AsyncCompletionCallback<T> callback, DataObject data) { @@ -115,9 +112,9 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { updateBuilder.setPhysicalSize(answer.getTemplatePhySicalSize()); _templateStoreDao.update(tmpltStoreVO.getId(), updateBuilder); // update size in vm_template table - VMTemplateVO tmlptUpdater = templateDao.createForUpdate(); + VMTemplateVO tmlptUpdater = _templateDao.createForUpdate(); tmlptUpdater.setSize(answer.getTemplateSize()); - templateDao.update(obj.getId(), tmlptUpdater); + _templateDao.update(obj.getId(), tmlptUpdater); } AsyncCompletionCallback<CreateCmdResult> caller = context.getParentCallback(); @@ -131,9 +128,9 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { caller.complete(result); } else if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { if (answer.getCheckSum() != null) { - VMTemplateVO templateDaoBuilder = templateDao.createForUpdate(); + VMTemplateVO templateDaoBuilder = _templateDao.createForUpdate(); templateDaoBuilder.setChecksum(answer.getCheckSum()); - templateDao.update(obj.getId(), templateDaoBuilder); + _templateDao.update(obj.getId(), templateDaoBuilder); } CreateCmdResult result = new CreateCmdResult(null, null); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index de1e423..89313e4 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -46,7 +46,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.DataObjectManager; @@ -124,7 +124,7 @@ public class VolumeServiceImpl implements VolumeService { public VolumeServiceImpl() { } - private class CreateVolumeContext<T> extends AsyncRpcConext<T> { + private class CreateVolumeContext<T> extends AsyncRpcContext<T> { private final DataObject volume; private final AsyncCallFuture<VolumeApiResult> future; @@ -190,7 +190,7 @@ public class VolumeServiceImpl implements VolumeService { return null; } - private class DeleteVolumeContext<T> extends AsyncRpcConext<T> { + private class DeleteVolumeContext<T> extends AsyncRpcContext<T> { private final VolumeObject volume; private final AsyncCallFuture<VolumeApiResult> future; @@ -282,7 +282,7 @@ public class VolumeServiceImpl implements VolumeService { return null; } - class CreateBaseImageContext<T> extends AsyncRpcConext<T> { + class CreateBaseImageContext<T> extends AsyncRpcContext<T> { private final VolumeInfo volume; private final PrimaryDataStore dataStore; private final TemplateInfo srcTemplate; @@ -421,7 +421,7 @@ public class VolumeServiceImpl implements VolumeService { return null; } - private class CreateVolumeFromBaseImageContext<T> extends AsyncRpcConext<T> { + private class CreateVolumeFromBaseImageContext<T> extends AsyncRpcContext<T> { private final DataObject vo; private final AsyncCallFuture<VolumeApiResult> future; private final DataObject templateOnStore; @@ -576,7 +576,7 @@ public class VolumeServiceImpl implements VolumeService { return volDao.persist(newVol); } - private class CopyVolumeContext<T> extends AsyncRpcConext<T> { + private class CopyVolumeContext<T> extends AsyncRpcContext<T> { final VolumeInfo srcVolume; final VolumeInfo destVolume; final AsyncCallFuture<VolumeApiResult> future; @@ -780,7 +780,7 @@ public class VolumeServiceImpl implements VolumeService { return null; } - private class MigrateVolumeContext<T> extends AsyncRpcConext<T> { + private class MigrateVolumeContext<T> extends AsyncRpcContext<T> { final VolumeInfo srcVolume; final VolumeInfo destVolume; final AsyncCallFuture<VolumeApiResult> future; @@ -848,7 +848,7 @@ public class VolumeServiceImpl implements VolumeService { return null; } - private class MigrateVmWithVolumesContext<T> extends AsyncRpcConext<T> { + private class MigrateVmWithVolumesContext<T> extends AsyncRpcContext<T> { final Map<VolumeInfo, DataStore> volumeToPool; final AsyncCallFuture<CommandResult> future; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcConext.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcConext.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcConext.java deleted file mode 100644 index 102364c..0000000 --- a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcConext.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.async; - -public class AsyncRpcConext<T> { - protected final AsyncCompletionCallback<T> parentCallBack; - public AsyncRpcConext(AsyncCompletionCallback<T> callback) { - this.parentCallBack = callback; - } - - public AsyncCompletionCallback<T> getParentCallback() { - return this.parentCallBack; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java ---------------------------------------------------------------------- diff --git a/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java new file mode 100644 index 0000000..cdb2054 --- /dev/null +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncRpcContext.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.async; + +public class AsyncRpcContext<T> { + protected final AsyncCompletionCallback<T> parentCallBack; + public AsyncRpcContext(AsyncCompletionCallback<T> callback) { + this.parentCallBack = callback; + } + + public AsyncCompletionCallback<T> getParentCallback() { + return this.parentCallBack; + } +} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java ---------------------------------------------------------------------- diff --git a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java index db39588..d98ba65 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCallbackDriver; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -59,7 +59,7 @@ public class AsyncSampleEventDrivenStyleCaller { } } - private class TestContext<T> extends AsyncRpcConext<T> { + private class TestContext<T> extends AsyncRpcContext<T> { private boolean finished; private String result; /** http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java b/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java index 3d2ad57..b3ea5d5 100644 --- a/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java +++ b/plugins/hypervisors/vmware/test/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategyTest.java @@ -37,7 +37,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.test.utils.SpringUtils; @@ -209,7 +209,7 @@ public class VmwareStorageMotionStrategyTest { assertFalse("Migration across cluster didn't fail.", this.result.isSuccess()); } - private class MockContext<T> extends AsyncRpcConext<T> { + private class MockContext<T> extends AsyncRpcContext<T> { final Map<VolumeInfo, DataStore> volumeToPool; final AsyncCallFuture<CommandResult> future; /** http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java index 7b30575..21a5e0a 100644 --- a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java +++ b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackImageStoreLifeCycleImpl.java @@ -16,14 +16,14 @@ // under the License. package org.apache.cloudstack.storage.datastore.lifecycle; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.inject.Inject; - +import com.cloud.agent.api.StoragePoolInfo; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.resource.Discoverer; +import com.cloud.resource.ResourceManager; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.ScopeType; +import com.cloud.utils.UriUtils; import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; @@ -35,14 +35,12 @@ import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; import org.apache.log4j.Logger; -import com.cloud.agent.api.StoragePoolInfo; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.resource.Discoverer; -import com.cloud.resource.ResourceManager; -import com.cloud.storage.DataStoreRole; -import com.cloud.storage.ScopeType; -import com.cloud.utils.UriUtils; +import javax.inject.Inject; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class CloudStackImageStoreLifeCycleImpl implements ImageStoreLifeCycle { @@ -83,7 +81,7 @@ public class CloudStackImageStoreLifeCycleImpl implements ImageStoreLifeCycle { DataStoreRole role = (DataStoreRole) dsInfos.get("role"); Map<String, String> details = (Map<String, String>) dsInfos.get("details"); - s_logger.info("Trying to add a new host at " + url + " in data center " + dcId); + s_logger.info("Trying to add a new data store at " + url + " to data center " + dcId); URI uri = null; try { @@ -103,7 +101,7 @@ public class CloudStackImageStoreLifeCycleImpl implements ImageStoreLifeCycle { if (dcId == null) { throw new InvalidParameterValueException( - "DataCenter id is null, and cloudstack default image storehas to be associated with a data center"); + "DataCenter id is null, and cloudstack default image store has to be associated with a data center"); } Map<String, Object> imageStoreParameters = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java b/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java index 44f94f3..66f4d77 100644 --- a/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java +++ b/plugins/storage/image/sample/src/org/apache/cloudstack/storage/datastore/driver/SampleImageStoreDriverImpl.java @@ -39,13 +39,11 @@ public class SampleImageStoreDriverImpl extends BaseImageStoreDriverImpl { @Override public DataStoreTO getStoreTO(DataStore store) { - // TODO Auto-generated method stub return null; } @Override public String createEntityExtractUrl(DataStore store, String installPath, ImageFormat format) { - // TODO Auto-generated method stub return null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java index 78f2263..1d00c97 100644 --- a/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java +++ b/plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java @@ -23,7 +23,7 @@ import com.cloud.storage.dao.StoragePoolHostDao; import org.apache.cloudstack.engine.subsystem.api.storage.*; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.command.CommandResult; import org.apache.cloudstack.storage.command.CreateObjectCommand; import org.apache.cloudstack.storage.datastore.DataObjectManager; @@ -54,12 +54,16 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver return null; } +<<<<<<< HEAD @Override public ChapInfo getChapInfo(VolumeInfo volumeInfo) { return null; } private class CreateVolumeContext<T> extends AsyncRpcConext<T> { +======= + private class CreateVolumeContext<T> extends AsyncRpcContext<T> { +>>>>>>> Fix typo in class name private final DataObject volume; public CreateVolumeContext(AsyncCompletionCallback<T> callback, DataObject volume) { super(callback); @@ -86,8 +90,8 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver /* * DeleteCommand cmd = new DeleteCommand(vo.getUri()); * - * EndPoint ep = selector.select(vo); AsyncRpcConext<CommandResult> - * context = new AsyncRpcConext<CommandResult>(callback); + * EndPoint ep = selector.select(vo); AsyncRpcContext<CommandResult> + * context = new AsyncRpcContext<CommandResult>(callback); * AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> * caller = AsyncCallbackDispatcher.create(this); * caller.setCallback(caller.getTarget().deleteCallback(null, null)) @@ -96,7 +100,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver } public Void deleteCallback(AsyncCallbackDispatcher<SamplePrimaryDataStoreDriverImpl, Answer> callback, - AsyncRpcConext<CommandResult> context) { + AsyncRpcContext<CommandResult> context) { CommandResult result = new CommandResult(); Answer answer = callback.getResult(); if (!answer.getResult()) { @@ -108,7 +112,7 @@ public class SamplePrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver /* * private class CreateVolumeFromBaseImageContext<T> extends - * AsyncRpcConext<T> { private final VolumeObject volume; + * AsyncRpcContext<T> { private final VolumeObject volume; * * public CreateVolumeFromBaseImageContext(AsyncCompletionCallback<T> * callback, VolumeObject volume) { super(callback); this.volume = volume; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de38cd81/server/src/com/cloud/template/HypervisorTemplateAdapter.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index da8c1c4..869231a 100755 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -39,7 +39,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; -import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; import org.apache.log4j.Logger; @@ -168,13 +168,13 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { return template; } - private class CreateTemplateContext<T> extends AsyncRpcConext<T> { - final TemplateInfo template; - public CreateTemplateContext(AsyncCompletionCallback<T> callback, TemplateInfo template) { - super(callback); - this.template = template; - } - } + private class CreateTemplateContext<T> extends AsyncRpcContext<T> { + final TemplateInfo template; + public CreateTemplateContext(AsyncCompletionCallback<T> callback, TemplateInfo template) { + super(callback); + this.template = template; + } + } protected Void createTemplateAsyncCallBack(AsyncCallbackDispatcher<HypervisorTemplateAdapter, TemplateApiResult> callback, CreateTemplateContext<TemplateApiResult> context) {
