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

bug 10410: show template per zone 

status 10410: resolved fixed
This commit is contained in:
anthony 2011-06-27 17:14:00 -07:00
parent 6fe033deae
commit d57f187963
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1493,7 +1493,7 @@ public class ApiResponseHelper implements ResponseGenerator {
}
boolean foundTheSameTemplate = false;
for (TemplateResponse res : responses) {
if (res.getId() == templateHostRef.getTemplateId()) {
if (res.getId() == templateHostRef.getTemplateId() && res.getZoneId() == templateZonePair.second()) {
foundTheSameTemplate = true;
continue;
}
@ -2079,6 +2079,23 @@ public class ApiResponseHelper implements ResponseGenerator {
List<VMTemplateHostVO> isoHosts = ApiDBUtils.listTemplateHostBy(iso.getId(), isoZonePair.second(), readyOnly);
for (VMTemplateHostVO isoHost : isoHosts) {
if (readyOnly) {
if (isoHost.getDownloadState() != Status.DOWNLOADED) {
continue;
}
boolean foundTheSameTemplate = false;
for (TemplateResponse res : isoResponses) {
if (res.getId() == isoHost.getTemplateId() && res.getZoneId() == isoZonePair.second()) {
foundTheSameTemplate = true;
continue;
}
}
if (foundTheSameTemplate) {
continue;
}
}
TemplateResponse isoResponse = new TemplateResponse();
isoResponse.setId(iso.getId());
isoResponse.setName(iso.getName());