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

standardize register ISO response

This commit is contained in:
Manoj Kumar 2025-11-04 16:44:58 +05:30
parent a4cca72d33
commit c67e7d02ed
No known key found for this signature in database
GPG Key ID: E952B7234D2C6F88
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
View File

@ -164,12 +164,15 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
private String getTemplateStatus(TemplateJoinVO template) {
if (template.getDownloadState() == Status.DOWNLOADED) {
return "Download Complete";
return "Successfully Installed";
}
String templateStatus = "Processing";
if (template.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
if (template.getDownloadPercent() == 100) {
templateStatus = "Installing Template";
if (template.getFormat() == Storage.ImageFormat.ISO) {
templateStatus = "Installing ISO";
}
} else {
templateStatus = template.getDownloadPercent() + "% Downloaded";
}
@ -506,24 +509,9 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation<Templa
// If the user is an admin, add the template download status
if (isAdmin || caller.getId() == iso.getAccountId()) {
// add download status
if (iso.getDownloadState() != Status.DOWNLOADED) {
String isoStatus = "Processing";
if (iso.getDownloadState() == Status.DOWNLOADED) {
isoStatus = "Download Complete";
} else if (iso.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
if (iso.getDownloadPercent() == 100) {
isoStatus = "Installing ISO";
} else {
isoStatus = iso.getDownloadPercent() + "% Downloaded";
}
} else if (iso.getDownloadState() == Status.BYPASSED) {
isoStatus = "Bypassed Secondary Storage";
} else {
isoStatus = iso.getErrorString();
}
isoResponse.setStatus(isoStatus);
} else {
isoResponse.setStatus("Successfully Installed");
String templateStatus = getTemplateStatus(iso);
if (templateStatus != null) {
isoResponse.setStatus(templateStatus);
}
isoResponse.setUrl(iso.getUrl());
List<TemplateDataStoreVO> isosInStore = _templateStoreDao.listByTemplateNotBypassed(iso.getId());