apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail if osTypeId parameter or rootdiskcontroller/nicadapter details are set on template registration

Browse Source
This commit is contained in:
nvazquez 2020-10-23 10:39:21 -03:00
parent 187813a209
commit 0c6900e3bd
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
View File

@ -39,12 +39,10 @@ import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.commons.collections.MapUtils;
import org.apache.log4j.Logger;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.template.VirtualMachineTemplate;
import com.cloud.vm.VmDetailConstants;
@APICommand(name = "registerTemplate", description = "Registers an existing template into the CloudStack cloud. ", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@ -343,21 +341,7 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd {
"Parameter directdownload is only allowed for KVM templates");
}
if (getHypervisor().equalsIgnoreCase(Hypervisor.HypervisorType.VMware.toString())) {
if (osTypeId != null) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "ostypeid is not supported on VMWare, as we honour what is defined in the template");
}
Map templateDetails = getDetails();
if (MapUtils.isNotEmpty(templateDetails)) {
if (templateDetails.containsKey(VmDetailConstants.ROOT_DISK_CONTROLLER)) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "rootDiskController is not supported on VMWare, as we honour what is defined in the template");
}
if (templateDetails.containsKey(VmDetailConstants.NIC_ADAPTER)) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "nicAdapter is not supported on VMWare, as we honour what is defined in the template");
}
}
} else if (osTypeId == null) {
if (!getHypervisor().equalsIgnoreCase(Hypervisor.HypervisorType.VMware.toString()) && osTypeId == null) {
throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please provide a guest OS type");
}
}

21
server/src/main/java/com/cloud/template/TemplateAdapterBase.java
View File

@ -27,9 +27,11 @@ import com.cloud.deployasis.DeployAsIsConstants;
import com.cloud.storage.upload.params.IsoUploadParams;
import com.cloud.storage.upload.params.TemplateUploadParams;
import com.cloud.storage.upload.params.UploadParams;
import com.cloud.vm.VmDetailConstants;
import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd;
import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.log4j.Logger;
@ -170,9 +172,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
}
if (deployAsIs) {
GuestOS deployAsIsGuestOs = ApiDBUtils.findGuestOSByDisplayName(DeployAsIsConstants.DEFAULT_GUEST_OS_DEPLOY_AS_IS);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Setting default guest OS for deploy-as-is template while the template registration is not completed");
}
s_logger.info("Setting default guest OS for deploy-as-is template while the template registration is not completed");
guestOSId = deployAsIsGuestOs.getId();
}
}
@ -291,9 +291,22 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat
+ EnumUtils.listValues(HypervisorType.values()).replace("None, ", ""));
}
Map details = cmd.getDetails();
if (hypervisorType == HypervisorType.VMware) {
if (MapUtils.isNotEmpty(details)) {
if (details.containsKey(VmDetailConstants.ROOT_DISK_CONTROLLER)) {
s_logger.info("Ignoring the rootDiskController detail provided, as we honour what is defined in the template");
details.remove(VmDetailConstants.ROOT_DISK_CONTROLLER);
}
if (details.containsKey(VmDetailConstants.NIC_ADAPTER)) {
s_logger.info("Ignoring the nicAdapter detail provided, as we honour what is defined in the template");
details.remove(VmDetailConstants.NIC_ADAPTER);
}
}
}
return prepare(false, CallContext.current().getCallingUserId(), cmd.getTemplateName(), cmd.getDisplayText(), cmd.getBits(), cmd.isPasswordEnabled(), cmd.getRequiresHvm(),
cmd.getUrl(), cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneId, hypervisorType, cmd.getChecksum(), true,
cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING : TemplateType.USER,
cmd.getTemplateTag(), owner, details, cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING : TemplateType.USER,
cmd.isDirectDownload(), cmd.isDeployAsIs());
}