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

Fix a bug where listImageStores also shows cacheStorage.

This commit is contained in:
Min Chen 2013-05-09 19:07:03 -07:00
parent 1e539e81e3
commit 0824be38ff
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/api/query/QueryManagerImpl.java
View File

@ -142,6 +142,7 @@ import com.cloud.server.Criteria;
import com.cloud.server.ResourceTag.TaggedResourceType;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.service.dao.ServiceOfferingDao;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.ImageStore;
import com.cloud.storage.ScopeType;
import com.cloud.storage.Storage;
@ -1973,9 +1974,11 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ);
sb.and("protocol", sb.entity().getProtocol(), SearchCriteria.Op.EQ);
sb.and("provider", sb.entity().getProviderName(), SearchCriteria.Op.EQ);
sb.and("role", sb.entity().getRole(), SearchCriteria.Op.EQ);
SearchCriteria<ImageStoreJoinVO> sc = sb.create();
sc.setParameters("role", DataStoreRole.Image);
if (keyword != null) {

11
server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java
View File

@ -23,6 +23,7 @@ import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.ImageStore;
import com.cloud.storage.ScopeType;
import org.apache.cloudstack.api.Identity;
@ -59,6 +60,10 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id
@Enumerated(value = EnumType.STRING)
private ScopeType scope;
@Column(name = "role")
@Enumerated(value = EnumType.STRING)
private DataStoreRole role;
@Column(name="data_center_id")
private long zoneId;
@ -176,6 +181,12 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id
this.detailValue = detailValue;
}
public DataStoreRole getRole() {
return role;
}
public void setRole(DataStoreRole role) {
this.role = role;
}
}