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

whilst fixing the iso bug, i realized that the public isos werent being returned for the regular user when he tries to attach the iso to the running vm. adding a listpublicisos() method for a regular user, which will take care of the same

This commit is contained in:
abhishek 2010-11-19 14:18:57 -08:00
parent e5c137e303
commit 726cf09274
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/dao/VMTemplateDao.java
View File

@ -70,6 +70,6 @@ public interface VMTemplateDao extends GenericDao<VMTemplateVO, Long> {
public List<VMTemplateVO> listAllInZone(long dataCenterId);
public List<VMTemplateVO> listByHypervisorType(HypervisorType hyperType);
public List<VMTemplateVO> xenToolsIsoSearch();
public List<VMTemplateVO> publicIsoSearch();
}

18
core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
View File

@ -68,7 +68,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
protected SearchBuilder<VMTemplateVO> TmpltsInZoneSearch;
private SearchBuilder<VMTemplateVO> PublicSearch;
private SearchBuilder<VMTemplateVO> NameAccountIdSearch;
private SearchBuilder<VMTemplateVO> XenToolsIsoSearch;
private SearchBuilder<VMTemplateVO> PublicIsoSearch;
private String routerTmpltName;
private String consoleProxyTmpltName;
@ -105,9 +105,10 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
@Override
public List<VMTemplateVO> xenToolsIsoSearch(){
SearchCriteria<VMTemplateVO> sc = XenToolsIsoSearch.create();
sc.setParameters("name", "xs-tools.iso");
public List<VMTemplateVO> publicIsoSearch(){
SearchCriteria<VMTemplateVO> sc = PublicIsoSearch.create();
sc.setParameters("public", 1);
sc.setParameters("format", "ISO");
return listBy(sc);
}
@ -192,8 +193,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
NameAccountIdSearch.and("name", NameAccountIdSearch.entity().getName(), SearchCriteria.Op.EQ);
NameAccountIdSearch.and("accountId", NameAccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
XenToolsIsoSearch = createSearchBuilder();
XenToolsIsoSearch.and("name", XenToolsIsoSearch.entity().getName(), SearchCriteria.Op.EQ);
PublicIsoSearch = createSearchBuilder();
PublicIsoSearch.and("public", PublicIsoSearch.entity().isPublicTemplate(), SearchCriteria.Op.EQ);
PublicIsoSearch.and("format", PublicIsoSearch.entity().getFormat(), SearchCriteria.Op.EQ);
tmpltTypeHyperSearch = createSearchBuilder();
tmpltTypeHyperSearch.and("templateType", tmpltTypeHyperSearch.entity().getTemplateType(), SearchCriteria.Op.EQ);
@ -300,8 +302,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
}
if(isIso && (account.getType() == Account.ACCOUNT_TYPE_NORMAL)){
List<VMTemplateVO> xenToolsIso = xenToolsIsoSearch();
templates.addAll(xenToolsIso);
List<VMTemplateVO> publicIsos = publicIsoSearch();
templates.addAll(publicIsos);
}
} catch (Exception e) {
s_logger.warn("Error listing templates", e);