You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/05/21 08:05:26 UTC
[cloudstack] branch master updated (0afba54 -> 93e3745)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 0afba54 Re-add code that was missed during merge forward of PR#2629
add 9aa1743 registerIso: Fixes #2654 register iso in all zones (#2652)
add 06f7e49 Host Affinity plugin (#2630)
add 7e6fddb managed-storage: Handle Ceph (#2655)
new 93e3745 Merge branch '4.11'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/cloud/deploy/DataCenterDeployment.java | 14 ++
.../main/java/com/cloud/deploy/DeploymentPlan.java | 6 +
client/pom.xml | 5 +
.../core/spring-core-registry-core-context.xml | 2 +-
.../host-affinity}/pom.xml | 18 +--
.../cloudstack/affinity/HostAffinityProcessor.java | 127 +++++++++++++++
.../cloudstack/host-affinity}/module.properties | 7 +-
.../host-affinity/spring-host-affinity-context.xml | 11 +-
.../affinity/HostAffinityProcessorTest.java | 176 +++++++++++++++++++++
.../wrapper/LibvirtMigrateCommandWrapper.java | 27 +++-
plugins/pom.xml | 1 +
.../deploy/DeploymentPlanningManagerImpl.java | 31 +++-
.../com/cloud/template/TemplateAdapterBase.java | 3 +-
.../vm/DeploymentPlanningManagerImplTest.java | 30 +++-
test/integration/smoke/test_affinity_groups.py | 95 ++++++++++-
15 files changed, 516 insertions(+), 37 deletions(-)
copy plugins/{deployment-planners/implicit-dedication => affinity-group-processors/host-affinity}/pom.xml (72%)
create mode 100644 plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java
copy {core/src/main/resources/META-INF/cloudstack/allocator => plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity}/module.properties (95%)
copy api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml => plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml (85%)
create mode 100644 plugins/affinity-group-processors/host-affinity/src/test/java/org/apache/cloudstack/affinity/HostAffinityProcessorTest.java
--
To stop receiving notification emails like this one, please contact
rohit@apache.org.
[cloudstack] 01/01: Merge branch '4.11'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 93e374599a23d23aed34e0793b0ed36cdb330fa2
Merge: 0afba54 7e6fddb
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon May 21 13:07:27 2018 +0530
Merge branch '4.11'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.../com/cloud/deploy/DataCenterDeployment.java | 14 ++
.../main/java/com/cloud/deploy/DeploymentPlan.java | 6 +
client/pom.xml | 5 +
.../core/spring-core-registry-core-context.xml | 2 +-
.../host-affinity/pom.xml | 29 ++++
.../cloudstack/affinity/HostAffinityProcessor.java | 127 +++++++++++++++
.../cloudstack/host-affinity/module.properties | 18 +++
.../host-affinity/spring-host-affinity-context.xml | 35 ++++
.../affinity/HostAffinityProcessorTest.java | 176 +++++++++++++++++++++
.../wrapper/LibvirtMigrateCommandWrapper.java | 27 +++-
plugins/pom.xml | 1 +
.../deploy/DeploymentPlanningManagerImpl.java | 31 +++-
.../com/cloud/template/TemplateAdapterBase.java | 3 +-
.../vm/DeploymentPlanningManagerImplTest.java | 30 +++-
test/integration/smoke/test_affinity_groups.py | 95 ++++++++++-
15 files changed, 581 insertions(+), 18 deletions(-)
diff --cc plugins/affinity-group-processors/host-affinity/pom.xml
index 0000000,6b58322..0af62c1
mode 000000,100644..100644
--- a/plugins/affinity-group-processors/host-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-affinity/pom.xml
@@@ -1,0 -1,33 +1,29 @@@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>Apache CloudStack Plugin - Host Affinity Processor</name>
+ <artifactId>cloud-plugin-host-affinity</artifactId>
+ <parent>
+ <artifactId>cloudstack-plugins</artifactId>
+ <groupId>org.apache.cloudstack</groupId>
- <version>4.11.1.0-SNAPSHOT</version>
++ <version>4.12.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
- <build>
- <defaultGoal>install</defaultGoal>
- <sourceDirectory>src</sourceDirectory>
- </build>
-</project>
++</project>
diff --cc plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java
index 0000000,055a644..055a644
mode 000000,100644..100644
--- a/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java
+++ b/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java
diff --cc plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties
index 0000000,fe0d91b..fe0d91b
mode 000000,100644..100644
--- a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties
+++ b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/module.properties
diff --cc plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml
index 0000000,3d42e80..3d42e80
mode 000000,100644..100644
--- a/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml
+++ b/plugins/affinity-group-processors/host-affinity/src/main/resources/META-INF/cloudstack/host-affinity/spring-host-affinity-context.xml
diff --cc plugins/affinity-group-processors/host-affinity/src/test/java/org/apache/cloudstack/affinity/HostAffinityProcessorTest.java
index 0000000,5dc9270..5dc9270
mode 000000,100644..100644
--- a/plugins/affinity-group-processors/host-affinity/src/test/java/org/apache/cloudstack/affinity/HostAffinityProcessorTest.java
+++ b/plugins/affinity-group-processors/host-affinity/src/test/java/org/apache/cloudstack/affinity/HostAffinityProcessorTest.java
diff --cc plugins/pom.xml
index 3634d60,67ec078..009577c
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@@ -51,6 -51,6 +51,7 @@@
<module>api/discovery</module>
<module>acl/static-role-based</module>
<module>acl/dynamic-role-based</module>
++ <module>affinity-group-processors/host-affinity</module>
<module>affinity-group-processors/host-anti-affinity</module>
<module>affinity-group-processors/explicit-dedication</module>
<module>ca/root-ca</module>
diff --cc server/src/main/java/com/cloud/template/TemplateAdapterBase.java
index 4a51b69,0000000..ebb73da
mode 100644,000000..100644
--- a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java
@@@ -1,480 -1,0 +1,481 @@@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.template;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
++import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
+import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
+
+import com.cloud.api.ApiDBUtils;
+import com.cloud.configuration.Config;
+import com.cloud.configuration.Resource.ResourceType;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.event.dao.UsageEventDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.org.Grouping;
+import com.cloud.projects.ProjectManager;
+import com.cloud.server.ConfigurationServer;
+import com.cloud.storage.GuestOS;
+import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.Storage.TemplateType;
+import com.cloud.storage.TemplateProfile;
+import com.cloud.storage.VMTemplateVO;
+import com.cloud.storage.dao.GuestOSHypervisorDao;
+import com.cloud.storage.dao.VMTemplateDao;
+import com.cloud.storage.dao.VMTemplateZoneDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountManager;
+import com.cloud.user.ResourceLimitService;
+import com.cloud.user.UserVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.user.dao.UserDao;
+import com.cloud.utils.EnumUtils;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.UserVmVO;
+import com.cloud.vm.dao.UserVmDao;
+
+public abstract class TemplateAdapterBase extends AdapterBase implements TemplateAdapter {
+ private final static Logger s_logger = Logger.getLogger(TemplateAdapterBase.class);
+ protected @Inject
+ DomainDao _domainDao;
+ protected @Inject
+ AccountDao _accountDao;
+ protected @Inject
+ ConfigurationDao _configDao;
+ protected @Inject
+ UserDao _userDao;
+ protected @Inject
+ AccountManager _accountMgr;
+ protected @Inject
+ DataCenterDao _dcDao;
+ protected @Inject
+ VMTemplateDao _tmpltDao;
+ protected @Inject
+ TemplateDataStoreDao _tmpltStoreDao;
+ protected @Inject
+ VMTemplateZoneDao _tmpltZoneDao;
+ protected @Inject
+ UsageEventDao _usageEventDao;
+ protected @Inject
+ HostDao _hostDao;
+ protected @Inject
+ UserVmDao _userVmDao;
+ protected @Inject
+ GuestOSHypervisorDao _osHyperDao;
+ protected @Inject
+ ResourceLimitService _resourceLimitMgr;
+ protected @Inject
+ ImageStoreDao _imgStoreDao;
+ @Inject
+ TemplateManager templateMgr;
+ @Inject
+ ConfigurationServer _configServer;
+ @Inject
+ ProjectManager _projectMgr;
+ @Inject
+ private TemplateDataStoreDao templateDataStoreDao;
+
+ @Override
+ public boolean stop() {
+ return true;
+ }
+
+ @Override
+ public TemplateProfile prepare(boolean isIso, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url,
+ Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneId, HypervisorType hypervisorType, String accountName,
+ Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload) throws ResourceAllocationException {
+ return prepare(isIso, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, format, guestOSId, zoneId,
+ hypervisorType, chksum, bootable, null, null, details, false, null, false, TemplateType.USER, directDownload);
+ }
+
+ @Override
+ public TemplateProfile prepare(boolean isIso, long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHVM, String url,
+ Boolean isPublic, Boolean featured, Boolean isExtractable, String format, Long guestOSId, List<Long> zoneIdList, HypervisorType hypervisorType, String chksum,
+ Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshkeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable,
+ TemplateType templateType, boolean directDownload) throws ResourceAllocationException {
+ //Long accountId = null;
+ // parameters verification
+
+ if (isPublic == null) {
+ isPublic = Boolean.FALSE;
+ }
+
+ if (isIso) {
+ if (bootable == null) {
+ bootable = Boolean.TRUE;
+ }
+ GuestOS noneGuestOs = ApiDBUtils.findGuestOSByDisplayName(ApiConstants.ISO_GUEST_OS_NONE);
+ if ((guestOSId == null || guestOSId == noneGuestOs.getId()) && bootable == true) {
+ throw new InvalidParameterValueException("Please pass a valid GuestOS Id");
+ }
+ if (bootable == false) {
+ guestOSId = noneGuestOs.getId(); //Guest os id of None.
+ }
+ } else {
+ if (bits == null) {
+ bits = Integer.valueOf(64);
+ }
+ if (passwordEnabled == null) {
+ passwordEnabled = false;
+ }
+ if (requiresHVM == null) {
+ requiresHVM = true;
+ }
+ }
+
+ if (isExtractable == null) {
+ isExtractable = Boolean.FALSE;
+ }
+ if (sshkeyEnabled == null) {
+ sshkeyEnabled = Boolean.FALSE;
+ }
+
+ boolean isAdmin = _accountMgr.isRootAdmin(templateOwner.getId());
+ boolean isRegionStore = false;
+ List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
+ if (stores != null && stores.size() > 0) {
+ isRegionStore = true;
+ }
+
+ if (!isAdmin && zoneIdList == null && !isRegionStore ) {
+ // domain admin and user should also be able to register template on a region store
+ throw new InvalidParameterValueException("Please specify a valid zone Id. Only admins can create templates in all zones.");
+ }
+
+ // check for the url format only when url is not null. url can be null incase of form based upload
+ if (url != null && url.toLowerCase().contains("file://")) {
+ throw new InvalidParameterValueException("File:// type urls are currently unsupported");
+ }
+
+ // check whether owner can create public templates
+ boolean allowPublicUserTemplates = TemplateManager.AllowPublicUserTemplates.valueIn(templateOwner.getId());
+ if (!isAdmin && !allowPublicUserTemplates && isPublic) {
+ throw new InvalidParameterValueException("Only private templates/ISO can be created.");
+ }
+
+ if (!isAdmin || featured == null) {
+ featured = Boolean.FALSE;
+ }
+
+ ImageFormat imgfmt;
+ try {
+ imgfmt = ImageFormat.valueOf(format.toUpperCase());
+ } catch (IllegalArgumentException e) {
+ s_logger.debug("ImageFormat IllegalArgumentException: " + e.getMessage());
+ throw new IllegalArgumentException("Image format: " + format + " is incorrect. Supported formats are " + EnumUtils.listValues(ImageFormat.values()));
+ }
+
+ // Check that the resource limit for templates/ISOs won't be exceeded
+ UserVO user = _userDao.findById(userId);
+ if (user == null) {
+ throw new IllegalArgumentException("Unable to find user with id " + userId);
+ }
+
+ _resourceLimitMgr.checkResourceLimit(templateOwner, ResourceType.template);
+
+ // If a zoneId is specified, make sure it is valid
+ if (zoneIdList != null) {
+ for (Long zoneId :zoneIdList) {
+ DataCenterVO zone = _dcDao.findById(zoneId);
+ if (zone == null) {
+ throw new IllegalArgumentException("Please specify a valid zone.");
+ }
+ Account caller = CallContext.current().getCallingAccount();
+ if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getId())) {
+ throw new PermissionDeniedException("Cannot perform this operation, Zone is currently disabled: " + zoneId);
+ }
+ }
+ }
+
+ List<VMTemplateVO> systemvmTmplts = _tmpltDao.listAllSystemVMTemplates();
+ for (VMTemplateVO template : systemvmTmplts) {
+ if (template.getName().equalsIgnoreCase(name) || template.getDisplayText().equalsIgnoreCase(displayText)) {
+ throw new IllegalArgumentException("Cannot use reserved names for templates");
+ }
+ }
+
+ if (hypervisorType.equals(Hypervisor.HypervisorType.XenServer)) {
+ if (details == null || !details.containsKey("hypervisortoolsversion") || details.get("hypervisortoolsversion") == null ||
+ ((String)details.get("hypervisortoolsversion")).equalsIgnoreCase("none")) {
+ String hpvs = _configDao.getValue(Config.XenServerPVdriverVersion.key());
+ if (hpvs != null) {
+ if (details == null) {
+ details = new HashMap<String, String>();
+ }
+ details.put("hypervisortoolsversion", hpvs);
+ }
+ }
+ }
+
+ Long id = _tmpltDao.getNextInSequence(Long.class, "id");
+ CallContext.current().setEventDetails("Id: " + id + " name: " + name);
+ return new TemplateProfile(id, userId, name, displayText, bits, passwordEnabled, requiresHVM, url, isPublic, featured, isExtractable, imgfmt, guestOSId, zoneIdList,
+ hypervisorType, templateOwner.getAccountName(), templateOwner.getDomainId(), templateOwner.getAccountId(), chksum, bootable, templateTag, details,
+ sshkeyEnabled, null, isDynamicallyScalable, templateType, directDownload);
+
+ }
+
+ @Override
+ public TemplateProfile prepare(RegisterTemplateCmd cmd) throws ResourceAllocationException {
+ //check if the caller can operate with the template owner
+ Account caller = CallContext.current().getCallingAccount();
+ Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
+ _accountMgr.checkAccess(caller, null, true, owner);
+
+ boolean isRouting = (cmd.isRoutingType() == null) ? false : cmd.isRoutingType();
+
+ List<Long> zoneId = cmd.getZoneIds();
+ // ignore passed zoneId if we are using region wide image store
+ List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
+ if (stores != null && stores.size() > 0) {
+ zoneId = null;
+ }
+
+ HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
+ if(hypervisorType == HypervisorType.None) {
+ throw new InvalidParameterValueException("Hypervisor Type: " + cmd.getHypervisor() + " is invalid. Supported Hypervisor types are "
+ + EnumUtils.listValues(HypervisorType.values()).replace("None, ", ""));
+ }
+
+ 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.isDirectDownload());
+
+ }
+
+ @Override
+ public TemplateProfile prepare(GetUploadParamsForTemplateCmd cmd) throws ResourceAllocationException {
+ //check if the caller can operate with the template owner
+ Account caller = CallContext.current().getCallingAccount();
+ Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
+ _accountMgr.checkAccess(caller, null, true, owner);
+
+ boolean isRouting = (cmd.isRoutingType() == null) ? false : cmd.isRoutingType();
+
+ List<Long> zoneList = null;
+ Long zoneId = cmd.getZoneId();
+ // ignore passed zoneId if we are using region wide image store
+ List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
+ if (!(stores != null && stores.size() > 0)) {
+ zoneList = new ArrayList<>();
+ zoneList.add(zoneId);
+ }
+
+ HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
+ if(hypervisorType == HypervisorType.None) {
+ throw new InvalidParameterValueException("Hypervisor Type: " + cmd.getHypervisor() + " is invalid. Supported Hypervisor types are "
+ + EnumUtils.listValues(HypervisorType.values()).replace("None, ", ""));
+ }
+
+ return prepare(false, CallContext.current().getCallingUserId(), cmd.getName(), cmd.getDisplayText(), cmd.getBits(), cmd.isPasswordEnabled(),
+ cmd.getRequiresHvm(), null, cmd.isPublic(), cmd.isFeatured(), cmd.isExtractable(), cmd.getFormat(), cmd.getOsTypeId(), zoneList,
+ hypervisorType, cmd.getChecksum(), true, cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null,
+ cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING : TemplateType.USER, false);
+
+ }
+
+ @Override
+ public TemplateProfile prepare(RegisterIsoCmd cmd) throws ResourceAllocationException {
+ //check if the caller can operate with the template owner
+ Account caller = CallContext.current().getCallingAccount();
+ Account owner = _accountMgr.getAccount(cmd.getEntityOwnerId());
+ _accountMgr.checkAccess(caller, null, true, owner);
+
+ List<Long> zoneList = null;
+ Long zoneId = cmd.getZoneId();
+ // ignore passed zoneId if we are using region wide image store
+ List<ImageStoreVO> stores = _imgStoreDao.findRegionImageStores();
- if (!(stores != null && stores.size() > 0)) {
++ if (CollectionUtils.isEmpty(stores) && zoneId != null && zoneId > 0L) {
+ zoneList = new ArrayList<>();
+ zoneList.add(zoneId);
+ }
+
+ return prepare(true, CallContext.current().getCallingUserId(), cmd.getIsoName(), cmd.getDisplayText(), 64, false, true, cmd.getUrl(), cmd.isPublic(),
+ cmd.isFeatured(), cmd.isExtractable(), ImageFormat.ISO.toString(), cmd.getOsTypeId(), zoneList, HypervisorType.None, cmd.getChecksum(), cmd.isBootable(), null,
+ owner, null, false, cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER, cmd.isDirectDownload());
+ }
+
+ protected VMTemplateVO persistTemplate(TemplateProfile profile, VirtualMachineTemplate.State initialState) {
+ List<Long> zoneIdList = profile.getZoneIdList();
+ VMTemplateVO template =
+ new VMTemplateVO(profile.getTemplateId(), profile.getName(), profile.getFormat(), profile.isPublic(), profile.isFeatured(), profile.isExtractable(),
+ profile.getTemplateType(), profile.getUrl(), profile.isRequiresHVM(), profile.getBits(), profile.getAccountId(), profile.getCheckSum(),
+ profile.getDisplayText(), profile.isPasswordEnabled(), profile.getGuestOsId(), profile.isBootable(), profile.getHypervisorType(),
+ profile.getTemplateTag(), profile.getDetails(), profile.isSshKeyEnabled(), profile.IsDynamicallyScalable(), profile.isDirectDownload());
+ template.setState(initialState);
+
+ if (profile.isDirectDownload()) {
+ template.setSize(profile.getSize());
+ }
+
+ if (zoneIdList == null) {
+ List<DataCenterVO> dcs = _dcDao.listAll();
+
+ if (dcs.isEmpty()) {
+ throw new CloudRuntimeException("No zones are present in the system, can't add template");
+ }
+
+ template.setCrossZones(true);
+ for (DataCenterVO dc : dcs) {
+ _tmpltDao.addTemplateToZone(template, dc.getId());
+ }
+
+ } else {
+ for (Long zoneId: zoneIdList) {
+ _tmpltDao.addTemplateToZone(template, zoneId);
+ }
+ }
+ return _tmpltDao.findById(template.getId());
+ }
+
+ private Long accountAndUserValidation(Account account, long userId, UserVmVO vmInstanceCheck, VMTemplateVO template, String msg) throws PermissionDeniedException {
+
+ if (account != null) {
+ if (!_accountMgr.isAdmin(account.getId())) {
+ if ((vmInstanceCheck != null) && (account.getId() != vmInstanceCheck.getAccountId())) {
+ throw new PermissionDeniedException(msg + ". Permission denied.");
+ }
+
+ if ((template != null) &&
+ (!template.isPublicTemplate() && (account.getId() != template.getAccountId()) && (template.getTemplateType() != TemplateType.PERHOST))) {
+ //special handling for the project case
+ Account owner = _accountMgr.getAccount(template.getAccountId());
+ if (owner.getType() == Account.ACCOUNT_TYPE_PROJECT) {
+ if (!_projectMgr.canAccessProjectAccount(account, owner.getId())) {
+ throw new PermissionDeniedException(msg + ". Permission denied. The caller can't access project's template");
+ }
+ } else {
+ throw new PermissionDeniedException(msg + ". Permission denied.");
+ }
+ }
+ } else {
+ if ((vmInstanceCheck != null) && !_domainDao.isChildDomain(account.getDomainId(), vmInstanceCheck.getDomainId())) {
+ throw new PermissionDeniedException(msg + ". Permission denied.");
+ }
+ // FIXME: if template/ISO owner is null we probably need to
+ // throw some kind of exception
+
+ if (template != null) {
+ Account templateOwner = _accountDao.findById(template.getAccountId());
+ if ((templateOwner != null) && !_domainDao.isChildDomain(account.getDomainId(), templateOwner.getDomainId())) {
+ throw new PermissionDeniedException(msg + ". Permission denied.");
+ }
+ }
+ }
+ }
+
+ return userId;
+ }
+
+ @Override
+ public TemplateProfile prepareDelete(DeleteTemplateCmd cmd) {
+ Long templateId = cmd.getId();
+ Long userId = CallContext.current().getCallingUserId();
+ Account account = CallContext.current().getCallingAccount();
+ Long zoneId = cmd.getZoneId();
+
+ VMTemplateVO template = _tmpltDao.findById(templateId);
+ if (template == null) {
+ throw new InvalidParameterValueException("unable to find template with id " + templateId);
+ }
+
+ userId = accountAndUserValidation(account, userId, null, template, "Unable to delete template ");
+
+ UserVO user = _userDao.findById(userId);
+ if (user == null) {
+ throw new InvalidParameterValueException("Please specify a valid user.");
+ }
+
+ if (template.getFormat() == ImageFormat.ISO) {
+ throw new InvalidParameterValueException("Please specify a valid template.");
+ }
+
+ return new TemplateProfile(userId, template, zoneId);
+ }
+
+ @Override
+ public TemplateProfile prepareExtractTemplate(ExtractTemplateCmd cmd) {
+ Long templateId = cmd.getId();
+ Long userId = CallContext.current().getCallingUserId();
+ Long zoneId = cmd.getZoneId();
+
+ VMTemplateVO template = _tmpltDao.findById(templateId);
+ if (template == null) {
+ throw new InvalidParameterValueException("unable to find template with id " + templateId);
+ }
+ return new TemplateProfile(userId, template, zoneId);
+ }
+
+ @Override
+ public TemplateProfile prepareDelete(DeleteIsoCmd cmd) {
+ Long templateId = cmd.getId();
+ Long userId = CallContext.current().getCallingUserId();
+ Account account = CallContext.current().getCallingAccount();
+ Long zoneId = cmd.getZoneId();
+
+ VMTemplateVO template = _tmpltDao.findById(templateId);
+ if (template == null) {
+ throw new InvalidParameterValueException("unable to find iso with id " + templateId);
+ }
+
+ userId = accountAndUserValidation(account, userId, null, template, "Unable to delete iso ");
+
+ UserVO user = _userDao.findById(userId);
+ if (user == null) {
+ throw new InvalidParameterValueException("Please specify a valid user.");
+ }
+
+ if (template.getFormat() != ImageFormat.ISO) {
+ throw new InvalidParameterValueException("Please specify a valid iso.");
+ }
+
+ return new TemplateProfile(userId, template, zoneId);
+ }
+
+ @Override
+ abstract public VMTemplateVO create(TemplateProfile profile);
+
+ @Override
+ abstract public boolean delete(TemplateProfile profile);
+}
--
To stop receiving notification emails like this one, please contact
rohit@apache.org.