Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions server/src/main/java/com/cloud/template/TemplateManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@
import com.cloud.vm.VmDetailConstants;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.google.common.base.Joiner;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

Expand Down Expand Up @@ -1376,8 +1375,15 @@ public boolean deleteTemplate(DeleteTemplateCmd cmd) {
vmInstanceVOList = _vmInstanceDao.listNonExpungedByTemplate(templateId);
}
if(!cmd.isForced() && CollectionUtils.isNotEmpty(vmInstanceVOList)) {
Comment thread
erikbocks marked this conversation as resolved.
Outdated
final String message = String.format("Unable to delete Template: %s because Instance: [%s] are using it.", template, Joiner.on(",").join(vmInstanceVOList));
logger.warn(message);
String message = String.format("Unable to delete template with ID %s, because there are VM instances using it.", template);
String instancesListMessage = String.format(" Instances list: [%s].", StringUtils.join(vmInstanceVOList, ","));

Comment thread
erikbocks marked this conversation as resolved.
logger.warn("{}{}", message, instancesListMessage);

if (_accountMgr.isRootAdmin(caller.getAccountId())) {
message += instancesListMessage;
}

throw new InvalidParameterValueException(message);
}

Expand Down
Loading