cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: fix build
Date Thu, 13 Dec 2012 23:17:39 GMT
Updated Branches:
  refs/heads/javelin 75285f90b -> 510d3759a


fix build


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/510d3759
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/510d3759
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/510d3759

Branch: refs/heads/javelin
Commit: 510d3759a70589a67b68880d0b411124d6b09b3f
Parents: 75285f9
Author: Edison Su <sudison@gmail.com>
Authored: Thu Dec 13 15:17:23 2012 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Dec 13 15:17:23 2012 -0800

----------------------------------------------------------------------
 .../cloudstack/storage/test/volumeServiceTest.java |    6 +++---
 .../SolidfirePrimaryDataStoreProvider.java         |   10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/510d3759/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
index 09fa3d1..e34f077 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
@@ -231,13 +231,13 @@ public class volumeServiceTest {
 		try {
 			primaryDataStoreProviderMgr.configure("primary data store mgr", new HashMap<String,
Object>());
 			PrimaryDataStoreProvider provider = primaryDataStoreProviderMgr.getDataStoreProvider("default
primary data store provider");
-			PrimaryDataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
+
 			Map<String, String> params = new HashMap<String, String>();
 			params.put("url", "nfs://test/test");
 			params.put("dcId", dcId.toString());
 			params.put("clusterId", clusterId.toString());
 			params.put("name", "my primary data store");
-			PrimaryDataStoreInfo primaryDataStoreInfo = lifeCycle.registerDataStore(params);
+			PrimaryDataStoreInfo primaryDataStoreInfo = provider.registerDataStore(params);
 			return primaryDataStoreInfo;
 		} catch (ConfigurationException e) {
 			return null;
@@ -293,7 +293,7 @@ public class volumeServiceTest {
 		DefaultPrimaryDatastoreProviderImpl provider = ComponentInject.inject(DefaultPrimaryDatastoreProviderImpl.class);
 		//assertNotNull(provider.dataStoreDao);
 
-		DefaultPrimaryDataStore dpdsi = DefaultPrimaryDataStore.createDataStore(null, null, null);
+		DefaultPrimaryDataStore dpdsi = DefaultPrimaryDataStore.createDataStore(null);
 		//assertNotNull(dpdsi.volumeDao);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/510d3759/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
index 2fbcc2c..672a726 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/provider/SolidfirePrimaryDataStoreProvider.java
@@ -1,10 +1,14 @@
 package org.apache.cloudstack.storage.datastore.provider;
 
+import java.util.List;
+
 import org.apache.cloudstack.storage.datastore.DefaultPrimaryDataStore;
 import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
+import org.apache.cloudstack.storage.datastore.configurator.PrimaryDataStoreConfigurator;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreVO;
 import org.apache.cloudstack.storage.datastore.driver.SolidfirePrimaryDataStoreDriver;
 import org.apache.cloudstack.storage.datastore.lifecycle.DefaultPrimaryDataStoreLifeCycleImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -13,8 +17,8 @@ public class SolidfirePrimaryDataStoreProvider extends
 	private final String name = "Solidfre Primary Data Store Provider";
 
 
-	public SolidfirePrimaryDataStoreProvider() {
-	    super();
+	public SolidfirePrimaryDataStoreProvider(@Qualifier("solidfire") List<PrimaryDataStoreConfigurator>
configurators) {
+	    super(configurators);
 		
 		// TODO Auto-generated constructor stub
 	}
@@ -35,7 +39,7 @@ public class SolidfirePrimaryDataStoreProvider extends
         SolidfirePrimaryDataStoreDriver driver = new SolidfirePrimaryDataStoreDriver();
         pds.setDriver(driver);
         
-        DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(super.dataStoreDao,
pds);
+        DefaultPrimaryDataStoreLifeCycleImpl lifeCycle = new DefaultPrimaryDataStoreLifeCycleImpl(dataStoreDao);
         pds.setLifeCycle(lifeCycle);
         return pds;
 	}


Mime
View raw message