apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix listImageStores to only list store with Image role, excluding those

Browse Source 
cache stores since they are also stored in image_store table.
This commit is contained in:
Min Chen 2013-05-09 21:43:52 -07:00
parent f965e2d892
commit 6f4fcf741c
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/api/src/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java
View File

@ -31,5 +31,5 @@ public interface ImageStoreDao extends GenericDao<ImageStoreVO, Long> {
public List<ImageStoreVO> findByProvider(String provider); public List<ImageStoreVO> findByProvider(String provider);
public List<ImageStoreVO> findByScope(ZoneScope scope); public List<ImageStoreVO> findByScope(ZoneScope scope);
public List<ImageStoreVO> findImageCacheByScope(ZoneScope scope); public List<ImageStoreVO> findImageCacheByScope(ZoneScope scope);
public List<ImageStoreVO> listImageStores();
} }

2
engine/storage/image/src/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java
View File

@ -92,7 +92,7 @@ public class ImageStoreProviderManagerImpl implements ImageStoreProviderManager
@Override @Override
public List<DataStore> listImageStores() { public List<DataStore> listImageStores() {
List<ImageStoreVO> stores = dataStoreDao.listAll(); List<ImageStoreVO> stores = dataStoreDao.listImageStores();
List<DataStore> imageStores = new ArrayList<DataStore>(); List<DataStore> imageStores = new ArrayList<DataStore>();
for (ImageStoreVO store : stores) { for (ImageStoreVO store : stores) {
imageStores.add(getImageStore(store.getId())); imageStores.add(getImageStore(store.getId()));

8
engine/storage/src/org/apache/cloudstack/storage/image/db/ImageStoreDaoImpl.java
View File

@ -96,4 +96,12 @@ public class ImageStoreDaoImpl extends GenericDaoBase<ImageStoreVO, Long> implem
return listBy(sc); return listBy(sc);
} }
@Override
public List<ImageStoreVO> listImageStores() {
SearchCriteria<ImageStoreVO> sc = createSearchCriteria();
sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.Image);
return listBy(sc);
}
} }