Add the storage provider/driver/lifecycle for simulator Include storage modules for simulator into plugins pom.xml
Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3cf2dfc6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3cf2dfc6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3cf2dfc6 Branch: refs/heads/simulator-storage-fixes Commit: 3cf2dfc6f18ae802fc74652276ebb2d0f3357dc0 Parents: 7077126 Author: Prasanna Santhanam <[email protected]> Authored: Wed Jun 26 19:02:52 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jun 26 19:11:27 2013 +0530 ---------------------------------------------------------------------- plugins/pom.xml | 7 ++++--- plugins/storage/image/simulator/pom.xml | 3 --- .../datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java | 1 + .../datastore/provider/SimulatorImageStoreProviderImpl.java | 2 ++ 4 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cf2dfc6/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index 9ad56c6..04eb55c 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -35,7 +35,7 @@ <module>api/rate-limit</module> <module>api/discovery</module> <module>acl/static-role-based</module> - <module>affinity-group-processors/host-anti-affinity</module> + <module>affinity-group-processors/host-anti-affinity</module> <module>affinity-group-processors/explicit-dedication</module> <module>deployment-planners/user-concentrated-pod</module> <module>deployment-planners/user-dispersing</module> @@ -64,7 +64,8 @@ <module>storage/image/s3</module> <module>storage/image/swift</module> <module>storage/image/default</module> - <module>storage/image/sample</module> + <module>storage/image/sample</module> + <module>storage/image/simulator</module> <module>storage/volume/solidfire</module> <module>storage/volume/default</module> <module>storage/volume/sample</module> @@ -158,8 +159,8 @@ </activation> <modules> <module>hypervisors/simulator</module> + <module>storage/image/simulator</module> </modules> </profile> </profiles> - </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cf2dfc6/plugins/storage/image/simulator/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/storage/image/simulator/pom.xml b/plugins/storage/image/simulator/pom.xml index d13ab53..d4b6838 100644 --- a/plugins/storage/image/simulator/pom.xml +++ b/plugins/storage/image/simulator/pom.xml @@ -54,9 +54,6 @@ <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> <executions> <execution> <phase>integration-test</phase> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cf2dfc6/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java b/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java index 2577dd9..beaa7a5 100644 --- a/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java +++ b/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/lifecycle/SimulatorImageStoreLifeCycleImpl.java @@ -51,6 +51,7 @@ public class SimulatorImageStoreLifeCycleImpl implements ImageStoreLifeCycle { @Inject ImageStoreProviderManager imageStoreMgr; + @Override public DataStore initialize(Map<String, Object> dsInfos) { Long dcId = (Long) dsInfos.get("zoneId"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cf2dfc6/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java ---------------------------------------------------------------------- diff --git a/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java b/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java index 7df7de9..775d743 100644 --- a/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java +++ b/plugins/storage/image/simulator/src/org/apache/cloudstack/storage/datastore/provider/SimulatorImageStoreProviderImpl.java @@ -32,12 +32,14 @@ import org.apache.cloudstack.storage.image.ImageStoreDriver; import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper; import org.apache.cloudstack.storage.image.datastore.ImageStoreProviderManager; import org.apache.cloudstack.storage.image.store.lifecycle.ImageStoreLifeCycle; +import org.springframework.stereotype.Component; import javax.inject.Inject; import java.util.HashSet; import java.util.Map; import java.util.Set; +@Component public class SimulatorImageStoreProviderImpl implements ImageStoreProvider { private final String _providerName = DataStoreProvider.NFS_IMAGE;
