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

fix build

This commit is contained in:
Edison Su 2012-11-15 13:28:56 -08:00
parent 2cae511464
commit 3b668d2907
15 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/api/src/org/apache/cloudstack/engine/cloud/entity/api/VolumeEntity.java
View File

@ -22,7 +22,6 @@ import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity;
import org.apache.cloudstack.engine.entity.api.CloudStackEntity;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.VolumeDiskType;
import org.apache.cloudstack.engine.subsystem.api.storage.type.VolumeType;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
public interface VolumeEntity extends CloudStackEntity {

2
engine/storage/src/org/apache/cloudstack/storage/StorageOrchestratorImpl.java
View File

@ -348,7 +348,7 @@ public class StorageOrchestratorImpl implements StorageOrchestrator {
PrimaryDataStore pd = primaryStorageMgr.getPrimaryDataStore(dataStoreId);
boolean existsOnPrimaryStorage = pd.templateExists(template.getId());
if (!existsOnPrimaryStorage) {
pd.installTemplate(template);
//pd.installTemplate(template);
}
return false;
}

4
engine/storage/src/org/apache/cloudstack/storage/datastore/DefaultPrimaryDataStoreImpl.java
View File

@ -14,7 +14,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.disktype.VolumeDiskTyp
import org.apache.cloudstack.storage.HypervisorHostEndPoint;
import org.apache.cloudstack.storage.datastore.db.DataStoreVO;
import org.apache.cloudstack.storage.datastore.driver.PrimaryDataStoreDriver;
import org.apache.cloudstack.storage.image.TemplateInfo;
import org.apache.cloudstack.storage.image.TemplateObject;
import org.apache.cloudstack.storage.volume.VolumeEntityImpl;
import org.apache.cloudstack.storage.volume.VolumeEvent;
@ -143,7 +143,7 @@ public class DefaultPrimaryDataStoreImpl implements PrimaryDataStore {
}
@Override
public boolean createTemplate(TemplateObject template) {
public boolean installTemplate(TemplateObject template) {
// TODO Auto-generated method stub
return false;
}

2
engine/storage/src/org/apache/cloudstack/storage/datastore/manager/DefaultPrimaryDataStoreManagerImpl.java
View File

@ -20,12 +20,12 @@ package org.apache.cloudstack.storage.datastore.manager;
import javax.inject.Inject;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
import org.apache.cloudstack.storage.datastore.db.DataStoreVO;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreProviderDao;
import org.apache.cloudstack.storage.datastore.lifecycle.PrimaryDataStoreLifeCycle;
import org.apache.cloudstack.storage.datastore.provider.PrimaryDataStoreProvider;
import org.apache.cloudstack.storage.datastore.provider.PrimaryDataStoreProviderManager;
import org.springframework.stereotype.Component;

1
engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DefaultPrimaryDatastoreProviderImpl.java
View File

@ -3,7 +3,6 @@ package org.apache.cloudstack.storage.datastore.provider;
import javax.inject.Inject;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
import org.apache.cloudstack.storage.datastore.DefaultPrimaryDataStoreImpl;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
import org.apache.cloudstack.storage.datastore.db.DataStoreVO;

4
engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreProvider.java → engine/storage/src/org/apache/cloudstack/storage/datastore/provider/PrimaryDataStoreProvider.java
View File

@ -1,8 +1,10 @@
package org.apache.cloudstack.engine.subsystem.api.storage;
package org.apache.cloudstack.storage.datastore.provider;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
public interface PrimaryDataStoreProvider {
public PrimaryDataStore getDataStore(long dataStoreId);
public PrimaryDataStoreInfo getDataStoreInfo(long dataStoreId);

1
engine/storage/src/org/apache/cloudstack/storage/datastore/provider/PrimaryDataStoreProviderManager.java
View File

@ -1,6 +1,5 @@
package org.apache.cloudstack.storage.datastore.provider;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
public interface PrimaryDataStoreProviderManager {
public PrimaryDataStoreProvider getDataStoreProvider(Long providerId);

1
engine/storage/src/org/apache/cloudstack/storage/datastore/provider/PrimaryDataStoreProviderManagerImpl.java
View File

@ -18,7 +18,6 @@
*/
package org.apache.cloudstack.storage.datastore.provider;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
import org.springframework.stereotype.Component;
@Component

6
engine/storage/src/org/apache/cloudstack/storage/image/driver/ImageDataStoreDriver.java
View File

@ -18,11 +18,11 @@
*/
package org.apache.cloudstack.storage.image.driver;
import org.apache.cloudstack.storage.image.Template;
import org.apache.cloudstack.storage.image.TemplateInfo;
public interface ImageDataStoreDriver {
boolean registerTemplate(Template template);
boolean registerTemplate(TemplateInfo template);
String grantAccess(long templateId, long endPointId);
boolean revokeAccess(long templateId, long endPointId);
boolean deleteTemplate(Template template);
boolean deleteTemplate(TemplateInfo template);
}

6
engine/storage/src/org/apache/cloudstack/storage/image/driver/ImageDataStoreDriverImpl.java
View File

@ -18,14 +18,14 @@
*/
package org.apache.cloudstack.storage.image.driver;
import org.apache.cloudstack.storage.image.Template;
import org.apache.cloudstack.storage.image.TemplateInfo;
public class ImageDataStoreDriverImpl implements ImageDataStoreDriver {
public ImageDataStoreDriverImpl() {
}
@Override
public boolean registerTemplate(Template template) {
public boolean registerTemplate(TemplateInfo template) {
//TODO: check the availability of template
return true;
}
@ -43,7 +43,7 @@ public class ImageDataStoreDriverImpl implements ImageDataStoreDriver {
}
@Override
public boolean deleteTemplate(Template template) {
public boolean deleteTemplate(TemplateInfo template) {
// TODO Auto-generated method stub
return false;
}

9
engine/storage/src/org/apache/cloudstack/storage/image/motion/DefaultImageMotionProvider.java
View File

@ -18,6 +18,15 @@
*/
package org.apache.cloudstack.storage.image.motion;
import org.apache.cloudstack.engine.cloud.entity.api.TemplateEntity;
import org.apache.cloudstack.storage.datastore.PrimaryDataStore;
public class DefaultImageMotionProvider implements ImageMotionProvider {
@Override
public boolean canHandle(TemplateEntity template, PrimaryDataStore dataStoe) {
// TODO Auto-generated method stub
return false;
}
}

2
engine/storage/src/org/apache/cloudstack/storage/image/motion/ImageMotionServiceImpl.java
View File

@ -30,7 +30,7 @@ public class ImageMotionServiceImpl implements ImageMotionService {
}
@Override
public boolean copyTemplate(TemplateEntity template, PrimaryDataStore dataStore) {
public boolean copyTemplate(TemplateEntity template, PrimaryDataStoreInfo dataStore) {
// TODO Auto-generated method stub
return false;
}

7
engine/storage/src/org/apache/cloudstack/storage/image/provider/ImageDataStoreProviderManagerImpl.java
View File

@ -22,6 +22,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.cloudstack.storage.image.TemplateObject;
import org.apache.cloudstack.storage.image.db.ImageDataDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreProviderDao;
@ -70,4 +71,10 @@ public class ImageDataStoreProviderManagerImpl implements ImageDataStoreProvider
ImageDataVO iddv = imageDataDao.findById(templateId);
return getDataStore(iddv.getId());
}
@Override
public TemplateObject getTemplate(long templateId) {
// TODO Auto-generated method stub
return null;
}
}

22
engine/storage/src/org/apache/cloudstack/storage/image/store/ImageDataStoreImpl.java
View File

@ -20,7 +20,7 @@ package org.apache.cloudstack.storage.image.store;
import javax.inject.Inject;
import org.apache.cloudstack.storage.image.Template;
import org.apache.cloudstack.storage.image.TemplateInfo;
import org.apache.cloudstack.storage.image.db.ImageDataDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreDao;
import org.apache.cloudstack.storage.image.db.ImageDataStoreVO;
@ -43,18 +43,18 @@ public class ImageDataStoreImpl implements ImageDataStore {
this.downloader = downloader;
this.imageDataStoreVO = dataStoreVO;
}
/*
@Override
public Template registerTemplate(long templateId) {
public TemplateInfo registerTemplate(long templateId) {
ImageDataVO idv = imageDao.findById(templateId);
Template template = new Template(this, idv);
TemplateInfo template = new TemplateInfo(this, idv);
if (driver.registerTemplate(template)) {
template.setImageDataStoreId(imageDataStoreVO.getId());
return template;
} else {
return null;
}
}
}*/
@Override
public String grantAccess(long templateId, long endPointId) {
@ -85,4 +85,16 @@ public class ImageDataStoreImpl implements ImageDataStore {
return this.downloader;
}
@Override
public long getImageDataStoreId() {
// TODO Auto-generated method stub
return 0;
}
@Override
public TemplateInfo registerTemplate(long templateId) {
// TODO Auto-generated method stub
return null;
}
}

2
engine/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java
View File

@ -27,7 +27,6 @@ import java.util.concurrent.Executors;
import javax.inject.Inject;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.QCOW2;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.VHD;
import org.apache.cloudstack.engine.subsystem.api.storage.disktype.VMDK;
@ -36,6 +35,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.disktype.VolumeDiskTyp
import org.apache.cloudstack.engine.subsystem.api.storage.type.VolumeTypeHelper;
import org.apache.cloudstack.storage.datastore.DefaultPrimaryDataStoreImpl;
import org.apache.cloudstack.storage.datastore.provider.DefaultPrimaryDatastoreProviderImpl;
import org.apache.cloudstack.storage.datastore.provider.PrimaryDataStoreProvider;
import org.apache.cloudstack.storage.image.format.ISO;
import org.apache.cloudstack.storage.image.format.ImageFormat;
import org.apache.cloudstack.storage.image.format.ImageFormatHelper;