From d864e9dc39b69e590e3df898a03a874a8173fcc6 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Thu, 6 Aug 2020 14:39:23 -0300 Subject: [PATCH] [VMware] Full OVF properties support --- .../agent/api/storage/OVFConfigurationTO.java | 61 ++ ...OVFProperty.java => OVFEulaSectionTO.java} | 42 +- .../cloud/agent/api/storage/OVFHelper.java | 811 ++++++++++++++---- .../agent/api/storage/OVFPropertyTO.java | 23 +- .../api/storage/OVFVirtualHardwareItemTO.java | 365 ++++++++ .../storage/OVFVirtualHardwareSectionTO.java | 34 +- .../com/cloud/agent/api/to/DatadiskTO.java | 21 +- .../cloud/agent/api/to/DeployAsIsInfoTO.java | 51 ++ .../cloud/agent/api/to/VirtualMachineTO.java | 16 +- .../java/com/cloud/storage/ImageStore.java | 7 + .../template/VirtualMachineTemplate.java | 2 + .../main/java/com/cloud/vm/NicProfile.java | 12 + .../java/com/cloud/vm/VmDetailConstants.java | 2 + .../apache/cloudstack/api/ApiConstants.java | 7 +- .../admin/vm/ImportUnmanagedInstanceCmd.java | 19 +- .../offering/ListServiceOfferingsCmd.java | 30 + .../template/ListTemplateOVFProperties.java | 68 -- .../user/template/ListTemplatesCmd.java | 29 + .../user/template/RegisterTemplateCmd.java | 11 + .../api/command/user/vm/DeployVMCmd.java | 55 +- .../api/net/NetworkPrerequisiteTO.java | 124 +++ .../response/TemplateOVFPropertyResponse.java | 43 +- .../api/response/TemplateResponse.java | 34 +- .../apache/cloudstack/query/QueryService.java | 4 - .../agent/api/storage/OVFHelperTest.java | 677 ++++++++++++++- core/pom.xml | 4 - .../agent/api/storage/DownloadAnswer.java | 43 + .../api/storage/GetDatadisksCommand.java | 7 +- .../com/cloud/resource/ServerResource.java | 1 + .../storage/resource/StorageProcessor.java | 3 + .../cloud/storage/template/OVAProcessor.java | 200 +++-- .../com/cloud/storage/template/Processor.java | 10 +- .../storage/to/TemplateObjectTO.java | 16 + .../agent/api/storage/DownloadAnswerTest.java | 58 ++ .../service/VolumeOrchestrationService.java | 8 +- .../service/api/OrchestrationService.java | 6 +- .../api/storage/PrimaryDataStore.java | 6 +- .../api/storage/TemplateDataFactory.java | 4 +- .../subsystem/api/storage/TemplateInfo.java | 4 + .../api/storage/TemplateService.java | 7 +- .../subsystem/api/storage/VolumeInfo.java | 4 + .../image/datastore/ImageStoreEntity.java | 2 +- .../com/cloud/template/TemplateManager.java | 3 + .../cloud/vm/VirtualMachineManagerImpl.java | 13 +- .../orchestration/CloudOrchestrator.java | 9 +- .../orchestration/NetworkOrchestrator.java | 279 +++--- .../orchestration/VolumeOrchestrator.java | 111 ++- .../cloud/storage/TemplateOVFPropertyVO.java | 167 ---- .../com/cloud/storage/VMTemplateDetailVO.java | 4 +- .../storage/VMTemplateStoragePoolVO.java | 16 +- .../java/com/cloud/storage/VMTemplateVO.java | 17 +- .../dao/TemplateOVFPropertiesDaoImpl.java | 78 -- .../storage/dao/VMTemplateDetailsDao.java | 14 + .../storage/dao/VMTemplateDetailsDaoImpl.java | 126 ++- .../cloud/storage/dao/VMTemplatePoolDao.java | 20 +- .../storage/dao/VMTemplatePoolDaoImpl.java | 23 +- .../java/com/cloud/vm/dao/UserVmDaoImpl.java | 15 +- ...spring-engine-schema-core-daos-context.xml | 1 - .../META-INF/db/schema-41400to41500.sql | 214 ++++- .../manager/StorageCacheManagerImpl.java | 2 +- ...vmNonManagedStorageDataMotionStrategy.java | 6 +- .../StorageSystemDataMotionStrategy.java | 8 +- ...NonManagedStorageSystemDataMotionTest.java | 9 +- .../image/TemplateDataFactoryImpl.java | 35 +- .../storage/image/TemplateServiceImpl.java | 60 +- .../storage/image/store/ImageStoreImpl.java | 4 +- .../storage/image/store/TemplateObject.java | 21 +- .../datastore/DataObjectManagerImpl.java | 2 +- .../datastore/ObjectInDataStoreManager.java | 4 +- .../ObjectInDataStoreManagerImpl.java | 22 +- .../image/BaseImageStoreDriverImpl.java | 290 +++++-- .../storage/image/ImageStoreDriver.java | 2 +- .../storage/image/TemplateEntityImpl.java | 314 ------- .../datastore/PrimaryDataStoreImpl.java | 28 +- .../storage/volume/VolumeObject.java | 31 +- .../storage/volume/VolumeServiceImpl.java | 59 +- .../com/cloud/hypervisor/guru/VMwareGuru.java | 4 +- .../hypervisor/guru/VmwareVmImplementer.java | 137 +-- .../manager/VmwareStorageManagerImpl.java | 4 +- .../vmware/resource/VmwareResource.java | 183 +++- .../resource/VmwareStorageProcessor.java | 193 +++-- .../driver/DateraPrimaryDataStoreDriver.java | 6 +- .../SolidFirePrimaryDataStoreDriver.java | 4 +- .../main/java/com/cloud/api/ApiDBUtils.java | 8 +- .../java/com/cloud/api/ApiResponseHelper.java | 4 +- .../com/cloud/api/query/QueryManagerImpl.java | 97 +-- .../cloud/api/query/ViewResponseHelper.java | 11 +- .../cloud/api/query/dao/TemplateJoinDao.java | 6 +- .../api/query/dao/TemplateJoinDaoImpl.java | 32 +- .../api/query/dao/UserVmJoinDaoImpl.java | 4 +- .../api/query/vo/ServiceOfferingJoinVO.java | 28 + .../cloud/api/query/vo/TemplateJoinVO.java | 7 + .../cloud/server/ManagementServerImpl.java | 2 - .../storage/ImageStoreUploadMonitorImpl.java | 4 +- .../com/cloud/storage/TemplateProfile.java | 8 +- .../storage/upload/params/UploadParams.java | 1 + .../upload/params/UploadParamsBase.java | 5 + .../template/HypervisorTemplateAdapter.java | 20 +- .../com/cloud/template/TemplateAdapter.java | 13 +- .../cloud/template/TemplateAdapterBase.java | 17 +- .../cloud/template/TemplateManagerImpl.java | 21 +- .../java/com/cloud/vm/UserVmManagerImpl.java | 303 +++++-- .../download/DirectDownloadManagerImpl.java | 4 +- .../query/dao/TemplateJoinDaoImplTest.java | 1 - .../template/TemplateManagerImplTest.java | 13 +- .../vm/DeploymentPlanningManagerImplTest.java | 14 + .../resource/NfsSecondaryStorageResource.java | 10 +- .../storage/template/DownloadManagerImpl.java | 62 +- test/integration/smoke/test_vm_life_cycle.py | 280 +++++- tools/marvin/marvin/config/test_data.py | 55 +- tools/marvin/marvin/lib/base.py | 12 +- tools/marvin/marvin/lib/common.py | 68 ++ tools/marvin/marvin/lib/vcenter.py | 6 + ui/l10n/en.js | 1 + ui/scripts/docs.js | 4 + ui/scripts/instanceWizard.js | 24 +- ui/scripts/templates.js | 97 +-- ui/scripts/ui-custom/instanceWizard.js | 16 +- utils/pom.xml | 4 + .../utils/compression/CompressionUtil.java | 58 ++ .../compression/CompressionUtilTest.java | 128 +++ .../cloud/hypervisor/vmware/mo/ClusterMO.java | 4 +- .../cloud/hypervisor/vmware/mo/HostMO.java | 8 +- .../vmware/mo/HypervisorHostHelper.java | 144 +++- .../vmware/mo/VirtualMachineMO.java | 26 + .../vmware/mo/VmwareHypervisorHost.java | 2 +- .../hypervisor/vmware/util/VmwareContext.java | 32 +- 127 files changed, 5346 insertions(+), 1787 deletions(-) create mode 100644 api/src/main/java/com/cloud/agent/api/storage/OVFConfigurationTO.java rename api/src/main/java/com/cloud/agent/api/storage/{OVFProperty.java => OVFEulaSectionTO.java} (55%) create mode 100644 api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareItemTO.java rename engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDao.java => api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareSectionTO.java (54%) create mode 100644 api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplateOVFProperties.java create mode 100644 api/src/main/java/org/apache/cloudstack/api/net/NetworkPrerequisiteTO.java create mode 100644 core/src/test/java/com/cloud/agent/api/storage/DownloadAnswerTest.java delete mode 100644 engine/schema/src/main/java/com/cloud/storage/TemplateOVFPropertyVO.java delete mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDaoImpl.java delete mode 100644 engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java create mode 100644 utils/src/main/java/com/cloud/utils/compression/CompressionUtil.java create mode 100644 utils/src/test/java/com/cloud/utils/compression/CompressionUtilTest.java diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFConfigurationTO.java b/api/src/main/java/com/cloud/agent/api/storage/OVFConfigurationTO.java new file mode 100644 index 00000000000..983a8b808f4 --- /dev/null +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFConfigurationTO.java @@ -0,0 +1,61 @@ +// +// 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.agent.api.storage; + +import java.util.List; + +public class OVFConfigurationTO { + + private final String id; + private final String label; + private final String description; + private List hardwareItems; + private int index; + + public OVFConfigurationTO(String id, String label, String description, int index) { + this.id = id; + this.label = label; + this.description = description; + this.index = index; + } + + public String getId() { + return id; + } + + public String getLabel() { + return label; + } + + public String getDescription() { + return description; + } + + public void setHardwareItems(List items) { + this.hardwareItems = items; + } + + public List getHardwareItems() { + return hardwareItems; + } + + public int getIndex() { + return index; + } +} \ No newline at end of file diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFProperty.java b/api/src/main/java/com/cloud/agent/api/storage/OVFEulaSectionTO.java similarity index 55% rename from api/src/main/java/com/cloud/agent/api/storage/OVFProperty.java rename to api/src/main/java/com/cloud/agent/api/storage/OVFEulaSectionTO.java index ac9ae7721b0..eff478c88b3 100644 --- a/api/src/main/java/com/cloud/agent/api/storage/OVFProperty.java +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFEulaSectionTO.java @@ -16,18 +16,36 @@ // specific language governing permissions and limitations // under the License. // - package com.cloud.agent.api.storage; -public interface OVFProperty { +import com.cloud.agent.api.LogLevel; - Long getTemplateId(); - String getKey(); - String getType(); - String getValue(); - String getQualifiers(); - Boolean isUserConfigurable(); - String getLabel(); - String getDescription(); - Boolean isPassword(); -} \ No newline at end of file +import java.io.Serializable; + +/** + * End-user licence agreement + */ +public class OVFEulaSectionTO implements Serializable { + private String info; + @LogLevel(LogLevel.Log4jLevel.Off) + private byte[] compressedLicense; + private int index; + + public OVFEulaSectionTO(String info, byte[] license, int eulaIndex) { + this.info = info; + this.compressedLicense = license; + this.index = eulaIndex; + } + + public String getInfo() { + return this.info; + } + + public byte[] getCompressedLicense() { + return this.compressedLicense; + } + + public int getIndex() { + return index; + } +} diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java b/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java index 15d63587490..bd58a189f76 100644 --- a/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java @@ -22,8 +22,15 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Transformer; @@ -34,13 +41,20 @@ import javax.xml.transform.stream.StreamResult; import com.cloud.configuration.Resource.ResourceType; import com.cloud.exception.InternalErrorException; +import com.cloud.utils.compression.CompressionUtil; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.w3c.dom.traversal.DocumentTraversal; +import org.w3c.dom.traversal.NodeFilter; +import org.w3c.dom.traversal.NodeIterator; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -73,10 +87,11 @@ public class OVFHelper { } /** - * Get the text value of a node's child with name "childNodeName", null if not present + * Get the text value of a node's child with name or suffix "childNodeName", null if not present * Example: * * Text value + * Text value * */ private String getChildNodeValue(Node node, String childNodeName) { @@ -84,7 +99,9 @@ public class OVFHelper { NodeList childNodes = node.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node value = childNodes.item(i); - if (value != null && value.getNodeName().equals(childNodeName)) { + // Also match if the child's name has a suffix: + // Example: + if (value != null && (value.getNodeName().equals(childNodeName)) || value.getNodeName().endsWith(":" + childNodeName)) { return value.getTextContent(); } } @@ -92,174 +109,320 @@ public class OVFHelper { return null; } + /** + * Check if the attribute is present on the element, otherwise check preprending ':' + */ + private String getNodeAttribute(Element element, String prefix, String attr) { + if (element == null) { + return null; + } + if (element.hasAttribute(prefix + ":" + attr)) { + return element.getAttribute(prefix + ":" + attr); + } + else if (element.hasAttribute(attr)) { + return element.getAttribute(attr); + } + + NamedNodeMap attributes = element.getAttributes(); + if (attributes == null || attributes.getLength() == 0) { + return null; + } + for (int i = 0; i < attributes.getLength(); i++) { + Node node = attributes.item(i); + if (node != null && node.getNodeName().endsWith(":" + attr)) { + return node.getTextContent(); + } + } + return null; + } + /** * Create OVFProperty class from the parsed node. Note that some fields may not be present. * The key attribute is required */ - protected OVFPropertyTO createOVFPropertyFromNode(Node node) { - Element property = (Element) node; - String key = property.getAttribute("ovf:key"); + protected OVFPropertyTO createOVFPropertyFromNode(Node node, int index, String category) { + Element element = (Element) node; + String key = getNodeAttribute(element, "ovf","key"); if (StringUtils.isBlank(key)) { return null; } - String value = property.getAttribute("ovf:value"); - String type = property.getAttribute("ovf:type"); - String qualifiers = property.getAttribute("ovf:qualifiers"); - String userConfigurableStr = property.getAttribute("ovf:userConfigurable"); + String value = getNodeAttribute(element, "ovf","value"); + String type = getNodeAttribute(element, "ovf","type"); + String qualifiers = getNodeAttribute(element, "ovf","qualifiers"); + String userConfigurableStr = getNodeAttribute(element, "ovf","userConfigurable"); boolean userConfigurable = StringUtils.isNotBlank(userConfigurableStr) && userConfigurableStr.equalsIgnoreCase("true"); - String passStr = property.getAttribute("ovf:password"); + String passStr = getNodeAttribute(element, "ovf","password"); boolean password = StringUtils.isNotBlank(passStr) && passStr.equalsIgnoreCase("true"); String label = getChildNodeValue(node, "Label"); String description = getChildNodeValue(node, "Description"); - return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable, label, description, password); + s_logger.debug("Creating OVF property index " + index + (category == null ? "" : " for category " + category) + + " with key = " + key); + return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable, + label, description, password, index, category); } /** - * Retrieve OVF properties from a parsed OVF file, with attribute 'ovf:userConfigurable' set to true + * Retrieve OVF properties from a parsed OVF file including its category (if available) and in-order, + * with attribute 'ovf:userConfigurable' set to true. */ - private List getConfigurableOVFPropertiesFromDocument(Document doc) { + public List getConfigurableOVFPropertiesFromDocument(Document doc) { List props = new ArrayList<>(); - NodeList properties = doc.getElementsByTagName("Property"); - if (properties != null) { - for (int i = 0; i < properties.getLength(); i++) { - Node node = properties.item(i); + if (doc == null) { + return props; + } + int propertyIndex = 0; + NodeList productSections = doc.getElementsByTagName("ProductSection"); + if (productSections != null) { + String lastCategoryFound = null; + for (int i = 0; i < productSections.getLength(); i++) { + Node node = productSections.item(i); if (node == null) { continue; } - OVFPropertyTO prop = createOVFPropertyFromNode(node); - if (prop != null && prop.isUserConfigurable()) { - props.add(prop); + NodeList childNodes = node.getChildNodes(); + for (int j = 0; j < childNodes.getLength(); j++) { + Node child = childNodes.item(j); + if (child == null) { + continue; + } + if (child.getNodeName().equalsIgnoreCase("Category")) { + lastCategoryFound = child.getTextContent(); + s_logger.info("Category found " + lastCategoryFound); + } else if (child.getNodeName().equalsIgnoreCase("Property")) { + OVFPropertyTO prop = createOVFPropertyFromNode(child, propertyIndex, lastCategoryFound); + if (prop != null && prop.isUserConfigurable()) { + props.add(prop); + propertyIndex++; + } + } } } } return props; } - /** - * Get properties from OVF file located on ovfFilePath - */ - public List getOVFPropertiesFromFile(String ovfFilePath) throws ParserConfigurationException, IOException, SAXException { - if (StringUtils.isBlank(ovfFilePath)) { - return new ArrayList<>(); - } - File ovfFile = new File(ovfFilePath); - final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(ovfFile); - return getConfigurableOVFPropertiesFromDocument(doc); - } - /** * Get properties from OVF XML string */ - protected List getOVFPropertiesXmlString(final String ovfFilePath) throws ParserConfigurationException, IOException, SAXException { - InputSource is = new InputSource(new StringReader(ovfFilePath)); + protected List getOVFPropertiesFromXmlString(final String ovfString) throws ParserConfigurationException, IOException, SAXException { + InputSource is = new InputSource(new StringReader(ovfString)); final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is); return getConfigurableOVFPropertiesFromDocument(doc); } - public List getOVFVolumeInfo(final String ovfFilePath) { + protected List getOVFDeploymentOptionsFromXmlString(final String ovfString) throws ParserConfigurationException, IOException, SAXException { + InputSource is = new InputSource(new StringReader(ovfString)); + final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is); + return getDeploymentOptionsFromDocumentTree(doc); + } + + protected List getOVFVirtualHardwareSectionFromXmlString(final String ovfString) throws ParserConfigurationException, IOException, SAXException { + InputSource is = new InputSource(new StringReader(ovfString)); + final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is); + return getVirtualHardwareItemsFromDocumentTree(doc); + } + + protected List getOVFEulaSectionFromXmlString(final String ovfString) throws ParserConfigurationException, IOException, SAXException { + InputSource is = new InputSource(new StringReader(ovfString)); + final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is); + return getEulaSectionsFromDocument(doc); + } + + public List getOVFVolumeInfoFromFile(final String ovfFilePath, final String configurationId) throws InternalErrorException { if (StringUtils.isBlank(ovfFilePath)) { - return new ArrayList(); + return new ArrayList<>(); + } + Document doc = getDocumentFromFile(ovfFilePath); + + return getOVFVolumeInfoFromFile(ovfFilePath, doc, configurationId); + } + + public List getOVFVolumeInfoFromFile(String ovfFilePath, Document doc, String configurationId) throws InternalErrorException { + if (org.apache.commons.lang.StringUtils.isBlank(ovfFilePath)) { + return null; } - ArrayList vf = new ArrayList(); - ArrayList vd = new ArrayList(); File ovfFile = new File(ovfFilePath); + List hardwareItems = getVirtualHardwareItemsFromDocumentTree(doc); + List files = extractFilesFromOvfDocumentTree(ovfFile, doc); + List disks = extractDisksFromOvfDocumentTree(doc); + + List diskHardwareItems = hardwareItems.stream() + .filter(x -> x.getResourceType() == OVFVirtualHardwareItemTO.HardwareResourceType.DiskDrive && + hardwareItemContainsConfiguration(x, configurationId)) + .collect(Collectors.toList()); + List diskTOs = matchHardwareItemsToDiskAndFilesInformation(diskHardwareItems, files, disks, ovfFile.getParent()); + return diskTOs; + } + + private String extractDiskIdFromDiskHostResource(String hostResource) { + if (hostResource.startsWith("ovf:/disk/")) { + return hostResource.replace("ovf:/disk/", ""); + } + String[] resourceParts = hostResource.split("/"); + return resourceParts[resourceParts.length - 1]; + } + + private OVFDisk getDiskDefinitionFromDiskId(String diskId, List disks) { + for (OVFDisk disk : disks) { + if (disk._diskId.equalsIgnoreCase(diskId)) { + return disk; + } + } + return null; + } + + private List matchHardwareItemsToDiskAndFilesInformation(List diskHardwareItems, + List files, List disks, + String ovfParentPath) throws InternalErrorException { + List diskTOs = new LinkedList<>(); + int diskNumber = 0; + for (OVFVirtualHardwareItemTO diskItem : diskHardwareItems) { + if (StringUtils.isBlank(diskItem.getHostResource())) { + s_logger.error("Missing disk information for hardware item " + diskItem.getElementName() + " " + diskItem.getInstanceId()); + continue; + } + String diskId = extractDiskIdFromDiskHostResource(diskItem.getHostResource()); + OVFDisk diskDefinition = getDiskDefinitionFromDiskId(diskId, disks); + if (diskDefinition == null) { + s_logger.error("Missing disk definition for disk ID " + diskId); + } + OVFFile fileDefinition = getFileDefinitionFromDiskDefinition(diskDefinition._fileRef, files); + DatadiskTO datadiskTO = generateDiskTO(fileDefinition, diskDefinition, ovfParentPath, diskNumber, diskItem); + diskTOs.add(datadiskTO); + diskNumber++; + } + List isoFiles = files.stream().filter(x -> x.isIso).collect(Collectors.toList()); + for (OVFFile isoFile : isoFiles) { + DatadiskTO isoTO = generateDiskTO(isoFile, null, ovfParentPath, diskNumber, null); + diskTOs.add(isoTO); + diskNumber++; + } + return diskTOs; + } + + private DatadiskTO generateDiskTO(OVFFile file, OVFDisk disk, String ovfParentPath, int diskNumber, + OVFVirtualHardwareItemTO diskItem) throws InternalErrorException { + String path = file != null ? ovfParentPath + File.separator + file._href : null; + if (StringUtils.isNotBlank(path)) { + File f = new File(path); + if (!f.exists() || f.isDirectory()) { + s_logger.error("One of the attached disk or iso does not exists " + path); + throw new InternalErrorException("One of the attached disk or iso as stated on OVF does not exists " + path); + } + } + Long capacity = disk != null ? disk._capacity : file._size; + Long fileSize = file != null ? file._size : 0L; + + String controller = ""; + String controllerSubType = ""; + if (disk != null) { + OVFDiskController cDiskController = disk._controller; + controller = cDiskController == null ? "" : disk._controller._name; + controllerSubType = cDiskController == null ? "" : disk._controller._subType; + } + + boolean isIso = file != null && file.isIso; + boolean bootable = file != null && file._bootable; + String diskId = disk == null ? file._id : disk._diskId; + String configuration = diskItem != null ? diskItem.getConfigurationIds() : null; + return new DatadiskTO(path, capacity, fileSize, diskId, + isIso, bootable, controller, controllerSubType, diskNumber, configuration); + } + + protected List extractDisksFromOvfDocumentTree(Document doc) { + NodeList disks = doc.getElementsByTagName("Disk"); + NodeList ovfDisks = doc.getElementsByTagName("ovf:Disk"); + NodeList items = doc.getElementsByTagName("Item"); + + int totalDisksLength = disks.getLength() + ovfDisks.getLength(); + ArrayList vd = new ArrayList<>(); + for (int i = 0; i < totalDisksLength; i++) { + Element disk; + if (i >= disks.getLength()) { + int pos = i - disks.getLength(); + disk = (Element) ovfDisks.item(pos); + } else { + disk = (Element) disks.item(i); + } + + if (disk == null) { + continue; + } + OVFDisk od = new OVFDisk(); + String virtualSize = getNodeAttribute(disk, "ovf", "capacity"); + od._capacity = NumberUtils.toLong(virtualSize, 0L); + String allocationUnits = getNodeAttribute(disk,"ovf","capacityAllocationUnits"); + od._diskId = getNodeAttribute(disk,"ovf","diskId"); + od._fileRef = getNodeAttribute(disk,"ovf","fileRef"); + od._populatedSize = NumberUtils.toLong(getNodeAttribute(disk,"ovf","populatedSize")); + + if ((od._capacity != 0) && (allocationUnits != null)) { + long units = 1; + if (allocationUnits.equalsIgnoreCase("KB") || allocationUnits.equalsIgnoreCase("KiloBytes") || allocationUnits.equalsIgnoreCase("byte * 2^10")) { + units = ResourceType.bytesToKiB; + } else if (allocationUnits.equalsIgnoreCase("MB") || allocationUnits.equalsIgnoreCase("MegaBytes") || allocationUnits.equalsIgnoreCase("byte * 2^20")) { + units = ResourceType.bytesToMiB; + } else if (allocationUnits.equalsIgnoreCase("GB") || allocationUnits.equalsIgnoreCase("GigaBytes") || allocationUnits.equalsIgnoreCase("byte * 2^30")) { + units = ResourceType.bytesToGiB; + } + od._capacity = od._capacity * units; + } + od._controller = getControllerType(items, od._diskId); + vd.add(od); + } + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("found %d disk definitions",vd.size())); + } + return vd; + } + + protected List extractFilesFromOvfDocumentTree(File ovfFile, Document doc) { + NodeList files = doc.getElementsByTagName("File"); + ArrayList vf = new ArrayList<>(); + boolean toggle = true; + for (int j = 0; j < files.getLength(); j++) { + Element file = (Element)files.item(j); + OVFFile of = new OVFFile(); + of._href = getNodeAttribute(file,"ovf","href"); + if (of._href.endsWith("vmdk") || of._href.endsWith("iso")) { + of._id = getNodeAttribute(file,"ovf","id"); + String size = getNodeAttribute(file,"ovf", "size"); + if (StringUtils.isNotBlank(size)) { + of._size = Long.parseLong(size); + } else { + String dataDiskPath = ovfFile.getParent() + File.separator + of._href; + File this_file = new File(dataDiskPath); + of._size = this_file.length(); + } + of.isIso = of._href.endsWith("iso"); + if (toggle && !of.isIso) { + of._bootable = true; + toggle = !toggle; + } + vf.add(of); + } + } + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("found %d file definitions in %s",vf.size(), ovfFile.getPath())); + } + return vf; + } + + public Document getDocumentFromFile(String ovfFilePath) { + if (org.apache.commons.lang.StringUtils.isBlank(ovfFilePath)) { + return null; + } + DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newDefaultInstance(); try { - final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(ovfFilePath)); - NodeList disks = doc.getElementsByTagName("Disk"); - NodeList files = doc.getElementsByTagName("File"); - NodeList items = doc.getElementsByTagName("Item"); - boolean toggle = true; - for (int j = 0; j < files.getLength(); j++) { - Element file = (Element)files.item(j); - OVFFile of = new OVFFile(); - of._href = file.getAttribute("ovf:href"); - if (of._href.endsWith("vmdk") || of._href.endsWith("iso")) { - of._id = file.getAttribute("ovf:id"); - String size = file.getAttribute("ovf:size"); - if (StringUtils.isNotBlank(size)) { - of._size = Long.parseLong(size); - } else { - String dataDiskPath = ovfFile.getParent() + File.separator + of._href; - File this_file = new File(dataDiskPath); - of._size = this_file.length(); - } - of.isIso = of._href.endsWith("iso"); - if (toggle && !of.isIso) { - of._bootable = true; - toggle = !toggle; - } - vf.add(of); - } - } - for (int i = 0; i < disks.getLength(); i++) { - Element disk = (Element)disks.item(i); - OVFDisk od = new OVFDisk(); - String virtualSize = disk.getAttribute("ovf:capacity"); - od._capacity = NumberUtils.toLong(virtualSize, 0L); - String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits"); - od._diskId = disk.getAttribute("ovf:diskId"); - od._fileRef = disk.getAttribute("ovf:fileRef"); - od._populatedSize = NumberUtils.toLong(disk.getAttribute("ovf:populatedSize")); - - if ((od._capacity != 0) && (allocationUnits != null)) { - - long units = 1; - if (allocationUnits.equalsIgnoreCase("KB") || allocationUnits.equalsIgnoreCase("KiloBytes") || allocationUnits.equalsIgnoreCase("byte * 2^10")) { - units = ResourceType.bytesToKiB; - } else if (allocationUnits.equalsIgnoreCase("MB") || allocationUnits.equalsIgnoreCase("MegaBytes") || allocationUnits.equalsIgnoreCase("byte * 2^20")) { - units = ResourceType.bytesToMiB; - } else if (allocationUnits.equalsIgnoreCase("GB") || allocationUnits.equalsIgnoreCase("GigaBytes") || allocationUnits.equalsIgnoreCase("byte * 2^30")) { - units = ResourceType.bytesToGiB; - } - od._capacity = od._capacity * units; - } - od._controller = getControllerType(items, od._diskId); - vd.add(od); - } - + DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder(); + return builder.parse(new File(ovfFilePath)); } catch (SAXException | IOException | ParserConfigurationException e) { s_logger.error("Unexpected exception caught while parsing ovf file:" + ovfFilePath, e); throw new CloudRuntimeException(e); } - - List disksTO = new ArrayList(); - for (OVFFile of : vf) { - if (StringUtils.isBlank(of._id)){ - s_logger.error("The ovf file info is incomplete file info"); - throw new CloudRuntimeException("The ovf file info has incomplete file info"); - } - OVFDisk cdisk = getDisk(of._id, vd); - if (cdisk == null && !of.isIso){ - s_logger.error("The ovf file info has incomplete disk info"); - throw new CloudRuntimeException("The ovf file info has incomplete disk info"); - } - Long capacity = cdisk == null ? of._size : cdisk._capacity; - String controller = ""; - String controllerSubType = ""; - if (cdisk != null) { - OVFDiskController cDiskController = cdisk._controller; - controller = cDiskController == null ? "" : cdisk._controller._name; - controllerSubType = cDiskController == null ? "" : cdisk._controller._subType; - } - - String dataDiskPath = ovfFile.getParent() + File.separator + of._href; - File f = new File(dataDiskPath); - if (!f.exists() || f.isDirectory()) { - s_logger.error("One of the attached disk or iso does not exists " + dataDiskPath); - throw new CloudRuntimeException("One of the attached disk or iso as stated on OVF does not exists " + dataDiskPath); - } - disksTO.add(new DatadiskTO(dataDiskPath, capacity, of._size, of._id, of.isIso, of._bootable, controller, controllerSubType)); - } - //check if first disk is an iso move it to the end - DatadiskTO fd = disksTO.get(0); - if (fd.isIso()) { - disksTO.remove(0); - disksTO.add(fd); - } - return disksTO; } private OVFDiskController getControllerType(final NodeList itemList, final String diskId) { @@ -330,55 +493,61 @@ public class OVFHelper { return dc; } - public void rewriteOVFFile(final String origOvfFilePath, final String newOvfFilePath, final String diskName) { - try { - final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(origOvfFilePath)); - NodeList disks = doc.getElementsByTagName("Disk"); - NodeList files = doc.getElementsByTagName("File"); - NodeList items = doc.getElementsByTagName("Item"); - String keepfile = null; - List toremove = new ArrayList(); - for (int j = 0; j < files.getLength(); j++) { - Element file = (Element)files.item(j); - String href = file.getAttribute("ovf:href"); - if (diskName.equals(href)) { - keepfile = file.getAttribute("ovf:id"); - } else { - toremove.add(file); - } + public void rewriteOVFFileForSingleDisk(final String origOvfFilePath, final String newOvfFilePath, final String diskName) { + final Document doc = getDocumentFromFile(origOvfFilePath); + + NodeList disks = doc.getElementsByTagName("Disk"); + NodeList files = doc.getElementsByTagName("File"); + NodeList items = doc.getElementsByTagName("Item"); + String keepfile = null; + List toremove = new ArrayList<>(); + for (int j = 0; j < files.getLength(); j++) { + Element file = (Element)files.item(j); + String href = getNodeAttribute(file,"ovf", "href"); + if (diskName.equals(href)) { + keepfile = getNodeAttribute(file,"ovf","id"); + } else { + toremove.add(file); } - String keepdisk = null; - for (int i = 0; i < disks.getLength(); i++) { - Element disk = (Element)disks.item(i); - String fileRef = disk.getAttribute("ovf:fileRef"); - if (keepfile == null) { - s_logger.info("FATAL: OVA format error"); - } else if (keepfile.equals(fileRef)) { - keepdisk = disk.getAttribute("ovf:diskId"); - } else { - toremove.add(disk); - } + } + String keepdisk = null; + for (int i = 0; i < disks.getLength(); i++) { + Element disk = (Element)disks.item(i); + String fileRef = getNodeAttribute(disk,"ovf","fileRef"); + if (keepfile == null) { + s_logger.info("FATAL: OVA format error"); + } else if (keepfile.equals(fileRef)) { + keepdisk = getNodeAttribute(disk,"ovf","diskId"); + } else { + toremove.add(disk); } - for (int k = 0; k < items.getLength(); k++) { - Element item = (Element)items.item(k); - NodeList cn = item.getChildNodes(); - for (int l = 0; l < cn.getLength(); l++) { - if (cn.item(l) instanceof Element) { - Element el = (Element)cn.item(l); - if ("rasd:HostResource".equals(el.getNodeName()) - && !(el.getTextContent().contains("ovf:/file/" + keepdisk) || el.getTextContent().contains("ovf:/disk/" + keepdisk))) { - toremove.add(item); - break; - } + } + for (int k = 0; k < items.getLength(); k++) { + Element item = (Element) items.item(k); + NodeList cn = item.getChildNodes(); + for (int l = 0; l < cn.getLength(); l++) { + if (cn.item(l) instanceof Element) { + Element el = (Element) cn.item(l); + if ("rasd:HostResource".equals(el.getNodeName()) + && !(el.getTextContent().contains("ovf:/file/" + keepdisk) || el.getTextContent().contains("ovf:/disk/" + keepdisk))) { + toremove.add(item); + break; } } } + } - for (Element rme : toremove) { - if (rme.getParentNode() != null) { - rme.getParentNode().removeChild(rme); - } + for (Element rme : toremove) { + if (rme.getParentNode() != null) { + rme.getParentNode().removeChild(rme); } + } + + writeDocumentToFile(newOvfFilePath, doc); + } + + private void writeDocumentToFile(String newOvfFilePath, Document doc) { + try { final StringWriter writer = new StringWriter(); final StreamResult result = new StreamResult(writer); @@ -389,21 +558,312 @@ public class OVFHelper { PrintWriter outfile = new PrintWriter(newOvfFilePath); outfile.write(writer.toString()); outfile.close(); - } catch (SAXException | IOException | ParserConfigurationException | TransformerException e) { - s_logger.info("Unexpected exception caught while removing network elements from OVF:" + e.getMessage(), e); + } catch (IOException | TransformerException e) { + s_logger.info("Unexpected exception caught while rewriting OVF:" + e.getMessage(), e); throw new CloudRuntimeException(e); } } - OVFDisk getDisk(String fileRef, List disks) { - for (OVFDisk disk : disks) { - if (disk._fileRef.equals(fileRef)) { - return disk; + OVFFile getFileDefinitionFromDiskDefinition(String fileRef, List files) { + for (OVFFile file : files) { + if (file._id.equals(fileRef)) { + return file; } } return null; } + public List getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException { + if (doc == null) { + if (s_logger.isTraceEnabled()) { + s_logger.trace("no document to parse; returning no prerequiste networks"); + } + return Collections.emptyList(); + } + + Map nets = getNetworksFromDocumentTree(doc); + + checkForOnlyOneSystemNode(doc); + + matchNicsToNets(nets, doc); + + return new ArrayList<>(nets.values()); + } + + private void matchNicsToNets(Map nets, Node systemElement) { + final DocumentTraversal traversal = (DocumentTraversal) systemElement; + final NodeIterator iterator = traversal.createNodeIterator(systemElement, NodeFilter.SHOW_ELEMENT, null, true); + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("starting out with %d network-prerequisites, parsing hardware",nets.size())); + } + int nicCount = 0; + for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) { + final Element e = (Element) n; + if ("rasd:Connection".equals(e.getTagName())) { + nicCount++; + String name = e.getTextContent(); // should be in our nets + if(nets.get(name) == null) { + if(s_logger.isInfoEnabled()) { + s_logger.info(String.format("found a nic definition without a network definition byname %s, adding it to the list.", name)); + } + nets.put(name, new NetworkPrerequisiteTO()); + } + NetworkPrerequisiteTO thisNet = nets.get(name); + if (e.getParentNode() != null) { + fillNicPrerequisites(thisNet,e.getParentNode()); + } + } + } + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("ending up with %d network-prerequisites, parsed %d nics", nets.size(), nicCount)); + } + } + + /** + * get all the stuff from parent node + * + * @param nic the object to carry through the system + * @param parentNode the xml container node for nic data + */ + private void fillNicPrerequisites(NetworkPrerequisiteTO nic, Node parentNode) { + String addressOnParentStr = getChildNodeValue(parentNode, "AddressOnParent"); + String automaticAllocationStr = getChildNodeValue(parentNode, "AutomaticAllocation"); + String description = getChildNodeValue(parentNode, "Description"); + String elementName = getChildNodeValue(parentNode, "ElementName"); + String instanceIdStr = getChildNodeValue(parentNode, "InstanceID"); + String resourceSubType = getChildNodeValue(parentNode, "ResourceSubType"); + String resourceType = getChildNodeValue(parentNode, "ResourceType"); + + try { + int addressOnParent = Integer.parseInt(addressOnParentStr); + nic.setAddressOnParent(addressOnParent); + } catch (NumberFormatException e) { + s_logger.warn("Encountered element of type \"AddressOnParent\", that could not be parse to an integer number: " + addressOnParentStr); + } + + boolean automaticAllocation = StringUtils.isNotBlank(automaticAllocationStr) && Boolean.parseBoolean(automaticAllocationStr); + nic.setAutomaticAllocation(automaticAllocation); + nic.setNicDescription(description); + nic.setElementName(elementName); + + try { + int instanceId = Integer.parseInt(instanceIdStr); + nic.setInstanceID(instanceId); + } catch (NumberFormatException e) { + s_logger.warn("Encountered element of type \"InstanceID\", that could not be parse to an integer number: " + instanceIdStr); + } + + nic.setResourceSubType(resourceSubType); + nic.setResourceType(resourceType); + } + + private void checkForOnlyOneSystemNode(Document doc) throws InternalErrorException { + // get hardware VirtualSystem, for now we support only one of those + NodeList systemElements = doc.getElementsByTagName("VirtualSystem"); + if (systemElements.getLength() != 1) { + String msg = "found " + systemElements.getLength() + " system definitions in OVA, can only handle exactly one."; + s_logger.warn(msg); + throw new InternalErrorException(msg); + } + } + + private Map getNetworksFromDocumentTree(Document doc) { + NodeList networkElements = doc.getElementsByTagName("Network"); + Map nets = new HashMap<>(); + for (int i = 0; i < networkElements.getLength(); i++) { + + Element networkElement = (Element)networkElements.item(i); + String networkName = getNodeAttribute(networkElement,"ovf","name"); + + String description = getChildNodeValue(networkElement, "Description"); + + NetworkPrerequisiteTO network = new NetworkPrerequisiteTO(); + network.setName(networkName); + network.setNetworkDescription(description); + + nets.put(networkName,network); + } + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("found %d networks in template", nets.size())); + } + return nets; + } + + private boolean hardwareItemContainsConfiguration(OVFVirtualHardwareItemTO item, String configurationId) { + if (StringUtils.isBlank(configurationId) || StringUtils.isBlank(item.getConfigurationIds())) { + return true; + } + String configurationIds = item.getConfigurationIds(); + if (StringUtils.isNotBlank(configurationIds)) { + String[] configurations = configurationIds.split(" "); + List confList = Arrays.asList(configurations); + return confList.contains(configurationId); + } + return false; + } + + /** + * Retrieve the virtual hardware section and its deployment options as configurations + */ + public OVFVirtualHardwareSectionTO getVirtualHardwareSectionFromDocument(Document doc) { + List configurations = getDeploymentOptionsFromDocumentTree(doc); + List items = getVirtualHardwareItemsFromDocumentTree(doc); + if (CollectionUtils.isNotEmpty(configurations)) { + for (OVFConfigurationTO configuration : configurations) { + List confItems = items.stream(). + filter(x -> StringUtils.isNotBlank(x.getConfigurationIds()) + && hardwareItemContainsConfiguration(x, configuration.getId())) + .collect(Collectors.toList()); + configuration.setHardwareItems(confItems); + } + } + List commonItems = null; + if (CollectionUtils.isNotEmpty(items)) { + commonItems = items.stream().filter(x -> StringUtils.isBlank(x.getConfigurationIds())).collect(Collectors.toList()); + } + return new OVFVirtualHardwareSectionTO(configurations, commonItems); + } + + private List getDeploymentOptionsFromDocumentTree(Document doc) { + List options = new ArrayList<>(); + if (doc == null) { + return options; + } + NodeList deploymentOptionSection = doc.getElementsByTagName("DeploymentOptionSection"); + if (deploymentOptionSection.getLength() == 0) { + return options; + } + Node hardwareSectionNode = deploymentOptionSection.item(0); + NodeList childNodes = hardwareSectionNode.getChildNodes(); + int index = 0; + for (int i = 0; i < childNodes.getLength(); i++) { + Node node = childNodes.item(i); + if (node != null && node.getNodeName().equals("Configuration")) { + Element configuration = (Element) node; + String configurationId = getNodeAttribute(configuration,"ovf","id"); + String description = getChildNodeValue(configuration, "Description"); + String label = getChildNodeValue(configuration, "Label"); + OVFConfigurationTO option = new OVFConfigurationTO(configurationId, label, description, index); + options.add(option); + index++; + } + } + return options; + } + + private List getVirtualHardwareItemsFromDocumentTree(Document doc) { + List items = new LinkedList<>(); + if (doc == null) { + return items; + } + NodeList hardwareSection = doc.getElementsByTagName("VirtualHardwareSection"); + if (hardwareSection.getLength() == 0) { + return items; + } + Node hardwareSectionNode = hardwareSection.item(0); + NodeList childNodes = hardwareSectionNode.getChildNodes(); + for (int i = 0; i < childNodes.getLength(); i++) { + Node node = childNodes.item(i); + if (node != null && node.getNodeName().equals("Item")) { + Element configuration = (Element) node; + String configurationIds = getNodeAttribute(configuration, "ovf", "configuration"); + String allocationUnits = getChildNodeValue(configuration, "AllocationUnits"); + String description = getChildNodeValue(configuration, "Description"); + String elementName = getChildNodeValue(configuration, "ElementName"); + String instanceID = getChildNodeValue(configuration, "InstanceID"); + String limit = getChildNodeValue(configuration, "Limit"); + String reservation = getChildNodeValue(configuration, "Reservation"); + String resourceType = getChildNodeValue(configuration, "ResourceType"); + String virtualQuantity = getChildNodeValue(configuration, "VirtualQuantity"); + String hostResource = getChildNodeValue(configuration, "HostResource"); + String addressOnParent = getChildNodeValue(configuration, "AddressOnParent"); + String parent = getChildNodeValue(configuration, "Parent"); + OVFVirtualHardwareItemTO item = new OVFVirtualHardwareItemTO(); + item.setConfigurationIds(configurationIds); + item.setAllocationUnits(allocationUnits); + item.setDescription(description); + item.setElementName(elementName); + item.setInstanceId(instanceID); + item.setLimit(getLongValueFromString(limit)); + item.setReservation(getLongValueFromString(reservation)); + Integer resType = getIntValueFromString(resourceType); + if (resType != null) { + item.setResourceType(OVFVirtualHardwareItemTO.getResourceTypeFromId(resType)); + } + item.setVirtualQuantity(getLongValueFromString(virtualQuantity)); + item.setHostResource(hostResource); + item.setAddressOnParent(addressOnParent); + item.setParent(parent); + items.add(item); + } + } + return items; + } + + private Long getLongValueFromString(String value) { + if (StringUtils.isNotBlank(value)) { + try { + return Long.parseLong(value); + } catch (NumberFormatException e) { + s_logger.debug("Could not parse the value: " + value + ", ignoring it"); + } + } + return null; + } + + private Integer getIntValueFromString(String value) { + if (StringUtils.isNotBlank(value)) { + try { + return Integer.parseInt(value); + } catch (NumberFormatException e) { + s_logger.debug("Could not parse the value: " + value + ", ignoring it"); + } + } + return null; + } + + protected byte[] compressOVFEula(String license) throws IOException { + CompressionUtil compressionUtil = new CompressionUtil(); + return compressionUtil.compressString(license); + } + + public List getEulaSectionsFromDocument(Document doc) { + List eulas = new LinkedList<>(); + if (doc == null) { + return eulas; + } + NodeList eulaSections = doc.getElementsByTagName("EulaSection"); + int eulaIndex = 0; + if (eulaSections.getLength() > 0) { + for (int index = 0; index < eulaSections.getLength(); index++) { + Node eulaNode = eulaSections.item(index); + NodeList eulaChildNodes = eulaNode.getChildNodes(); + String eulaInfo = null; + String eulaLicense = null; + for (int i = 0; i < eulaChildNodes.getLength(); i++) { + Node eulaItem = eulaChildNodes.item(i); + if (eulaItem.getNodeName().equalsIgnoreCase("Info")) { + eulaInfo = eulaItem.getTextContent(); + } else if (eulaItem.getNodeName().equalsIgnoreCase("License")) { + eulaLicense = eulaItem.getTextContent(); + } + } + byte[] compressedLicense = new byte[0]; + try { + compressedLicense = compressOVFEula(eulaLicense); + } catch (IOException e) { + s_logger.error("Could not compress the license for info " + eulaInfo); + continue; + } + OVFEulaSectionTO eula = new OVFEulaSectionTO(eulaInfo, compressedLicense, eulaIndex); + eulas.add(eula); + eulaIndex++; + } + } + + return eulas; + } + class OVFFile { // public String _href; @@ -417,7 +877,6 @@ public class OVFHelper { // public Long _capacity; - public String _capacityUnit; public String _diskId; public String _fileRef; public Long _populatedSize; diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFPropertyTO.java b/api/src/main/java/com/cloud/agent/api/storage/OVFPropertyTO.java index abf743ae713..24207e92821 100644 --- a/api/src/main/java/com/cloud/agent/api/storage/OVFPropertyTO.java +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFPropertyTO.java @@ -30,7 +30,7 @@ import com.cloud.agent.api.LogLevel; * Choose "Remote HTTP and SSH Client Routes" to route only traffic destined for the management client(s), when they are on remote networks. * */ -public class OVFPropertyTO implements OVFProperty { +public class OVFPropertyTO { private String key; private String type; @@ -41,18 +41,14 @@ public class OVFPropertyTO implements OVFProperty { private String label; private String description; private Boolean password; + private int index; + private String category; public OVFPropertyTO() { } - public OVFPropertyTO(String key, String value, boolean password) { - this.key = key; - this.value = value; - this.password = password; - } - public OVFPropertyTO(String key, String type, String value, String qualifiers, boolean userConfigurable, - String label, String description, boolean password) { + String label, String description, boolean password, int index, String category) { this.key = key; this.type = type; this.value = value; @@ -61,9 +57,10 @@ public class OVFPropertyTO implements OVFProperty { this.label = label; this.description = description; this.password = password; + this.index = index; + this.category = category; } - @Override public Long getTemplateId() { return null; } @@ -131,4 +128,12 @@ public class OVFPropertyTO implements OVFProperty { public void setPassword(Boolean password) { this.password = password; } + + public String getCategory() { + return category; + } + + public int getIndex() { + return index; + } } diff --git a/api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareItemTO.java b/api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareItemTO.java new file mode 100644 index 00000000000..365ef7d37b5 --- /dev/null +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareItemTO.java @@ -0,0 +1,365 @@ +// 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.agent.api.storage; + +// From: https://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData.xsd +public class OVFVirtualHardwareItemTO { + + //From: https://schemas.dmtf.org/wbem/cim-html/2/CIM_ResourceAllocationSettingData.html + public enum HardwareResourceType { + Other("Other", 1), + ComputerSystem ("Computer System", 2), + Processor("Processor", 3), + Memory("Memory", 4), + IDEController("IDE Controller", 5), + ParallelSCSIHBA("Parallel SCSI HBA", 6), + FC_HBA("FC HBA", 7), + iSCSI_HBA("iSCSI HBA", 8), + IB_HCA("IB HCA", 9), + EthernetAdapter("Ethernet Adaptor", 10), + OtherNetworkAdapter("Other Network Adaptor", 11), + IO_Slot("I/O Slot", 12), + IO_Device("I/O Device", 13), + FloppyDrive("Floppy Drive", 14), + CD_Drive("CD Drive", 15), + DVD_Drive("DVD Drive", 16), + DiskDrive("Disk Drive", 17), + TapeDrive("Tape Drive", 18), + StorageExtent("Storage Extent", 19), + OtherStorageDevice("Other Storage Device", 20), + SerialPort("Serial Port", 21), + ParallelPort("Parallel Port", 22), + USBController("USB Controller", 23), + GraphicsController("Graphics Controller", 24), + IEEE_1394_Controller("IEEE 1394 Controller", 25), + PartitionableUnit("Partitionable Unit", 26), + BasePartitionableUnit("base Partitionable Unit", 27), + PowerSupply("Power", 28), + CoolingCapacity("Cooling Capacity", 29), + EthernetSwitchPort("Ethernet Switch Port", 30), + LogicalDisk("Logical Disk", 31), + StorageVolume("Storage Volume", 32), + EthernetConnection("Ethernet Connection", 33), + DMTF_reserved("DMTF Reserved", 35), + VendorReserved("Vendor Reserved", 32768); + + private String name; + private int id; + + HardwareResourceType(String name, int id) { + this.name = name; + this.id = id; + } + + public String getName() { + return name; + } + } + + public static HardwareResourceType getResourceTypeFromId(int id) { + if (id <= 33) { + for (HardwareResourceType type : HardwareResourceType.values()) { + if (type.id == id) { + return type; + } + } + } else if (id <= 32767) { + return HardwareResourceType.DMTF_reserved; + } + return HardwareResourceType.VendorReserved; + } + + public enum CustomerVisibility { + Unknown, PassedThrough, Virtualized, NotRepresented, DMTFReserved, VendorReserved; + } + + public enum MappingBehavior { + Unknown, NotSupported, Dedicated, SoftAffinity, HardAffinity, DMTFReserved, VendorReserved; + } + + private String address; + private String addressOnParent; + private String allocationUnits; + private boolean automaticAllocation; + private boolean automaticDeallocation; + private String caption; + private String changeableType; + private String componentSetting; + private String configurationName; + private String connection; + private CustomerVisibility customerVisibility; + private String description; + private String elementName; + private Long generation; + private String hostResource; + private String instanceId; + private Long limit; + private MappingBehavior mappingBehavior; + private String otherResourceType; + private String parent; + private String poolId; + private Long reservation; + private String resourceSubtype; + private HardwareResourceType resourceType; + private String soId; + private String soOrgId; + private Long virtualQuantity; + private String virtualQuantityUnits; + private int weight; + + private String configurationIds; + + public String getConfigurationIds() { + return configurationIds; + } + + public void setConfigurationIds(String configurationIds) { + this.configurationIds = configurationIds; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAddressOnParent() { + return addressOnParent; + } + + public void setAddressOnParent(String addressOnParent) { + this.addressOnParent = addressOnParent; + } + + public String getAllocationUnits() { + return allocationUnits; + } + + public void setAllocationUnits(String allocationUnits) { + this.allocationUnits = allocationUnits; + } + + public boolean isAutomaticAllocation() { + return automaticAllocation; + } + + public void setAutomaticAllocation(boolean automaticAllocation) { + this.automaticAllocation = automaticAllocation; + } + + public boolean isAutomaticDeallocation() { + return automaticDeallocation; + } + + public void setAutomaticDeallocation(boolean automaticDeallocation) { + this.automaticDeallocation = automaticDeallocation; + } + + public String getCaption() { + return caption; + } + + public void setCaption(String caption) { + this.caption = caption; + } + + public String getChangeableType() { + return changeableType; + } + + public void setChangeableType(String changeableType) { + this.changeableType = changeableType; + } + + public String getComponentSetting() { + return componentSetting; + } + + public void setComponentSetting(String componentSetting) { + this.componentSetting = componentSetting; + } + + public String getConfigurationName() { + return configurationName; + } + + public void setConfigurationName(String configurationName) { + this.configurationName = configurationName; + } + + public String getConnection() { + return connection; + } + + public void setConnection(String connection) { + this.connection = connection; + } + + public CustomerVisibility getCustomerVisibility() { + return customerVisibility; + } + + public void setCustomerVisibility(CustomerVisibility customerVisibility) { + this.customerVisibility = customerVisibility; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getElementName() { + return elementName; + } + + public void setElementName(String elementName) { + this.elementName = elementName; + } + + public Long getGeneration() { + return generation; + } + + public void setGeneration(Long generation) { + this.generation = generation; + } + + public String getHostResource() { + return hostResource; + } + + public void setHostResource(String hostResource) { + this.hostResource = hostResource; + } + + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } + + public Long getLimit() { + return limit; + } + + public void setLimit(Long limit) { + this.limit = limit; + } + + public MappingBehavior getMappingBehavior() { + return mappingBehavior; + } + + public void setMappingBehavior(MappingBehavior mappingBehavior) { + this.mappingBehavior = mappingBehavior; + } + + public String getOtherResourceType() { + return otherResourceType; + } + + public void setOtherResourceType(String otherResourceType) { + this.otherResourceType = otherResourceType; + } + + public String getParent() { + return parent; + } + + public void setParent(String parent) { + this.parent = parent; + } + + public String getPoolId() { + return poolId; + } + + public void setPoolId(String poolId) { + this.poolId = poolId; + } + + public Long getReservation() { + return reservation; + } + + public void setReservation(Long reservation) { + this.reservation = reservation; + } + + public String getResourceSubtype() { + return resourceSubtype; + } + + public void setResourceSubtype(String resourceSubtype) { + this.resourceSubtype = resourceSubtype; + } + + public HardwareResourceType getResourceType() { + return resourceType; + } + + public void setResourceType(HardwareResourceType resourceType) { + this.resourceType = resourceType; + } + + public String getSoId() { + return soId; + } + + public void setSoId(String soId) { + this.soId = soId; + } + + public String getSoOrgId() { + return soOrgId; + } + + public void setSoOrgId(String soOrgId) { + this.soOrgId = soOrgId; + } + + public Long getVirtualQuantity() { + return virtualQuantity; + } + + public void setVirtualQuantity(Long virtualQuantity) { + this.virtualQuantity = virtualQuantity; + } + + public String getVirtualQuantityUnits() { + return virtualQuantityUnits; + } + + public void setVirtualQuantityUnits(String virtualQuantityUnits) { + this.virtualQuantityUnits = virtualQuantityUnits; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } +} \ No newline at end of file diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDao.java b/api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareSectionTO.java similarity index 54% rename from engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDao.java rename to api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareSectionTO.java index eb78f2023ac..9a3ae1244eb 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDao.java +++ b/api/src/main/java/com/cloud/agent/api/storage/OVFVirtualHardwareSectionTO.java @@ -1,3 +1,4 @@ +// // 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 @@ -14,18 +15,29 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. - -package com.cloud.storage.dao; - -import com.cloud.storage.TemplateOVFPropertyVO; -import com.cloud.utils.db.GenericDao; +// +package com.cloud.agent.api.storage; import java.util.List; -public interface TemplateOVFPropertiesDao extends GenericDao { +public class OVFVirtualHardwareSectionTO { - boolean existsOption(long templateId, String key); - TemplateOVFPropertyVO findByTemplateAndKey(long templateId, String key); - void saveOptions(List opts); - List listByTemplateId(long templateId); -} + public OVFVirtualHardwareSectionTO() { + } + + private List configurations; + private List commonHardwareItems; + + public OVFVirtualHardwareSectionTO(List configurations, List commonHardwareItems) { + this.configurations = configurations; + this.commonHardwareItems = commonHardwareItems; + } + + public List getConfigurations() { + return configurations; + } + + public List getCommonHardwareItems() { + return commonHardwareItems; + } +} \ No newline at end of file diff --git a/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java b/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java index 1d3f91e25db..31a02b0bec3 100644 --- a/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java +++ b/api/src/main/java/com/cloud/agent/api/to/DatadiskTO.java @@ -27,18 +27,14 @@ public class DatadiskTO { private boolean isIso; private String diskController; private String diskControllerSubType; + private int diskNumber; + private String configuration; public DatadiskTO() { } - public DatadiskTO(String path, long virtualSize, long fileSize, boolean bootable) { - this.path = path; - this.virtualSize = virtualSize; - this.fileSize = fileSize; - this.bootable = bootable; - } - - public DatadiskTO(String path, long virtualSize, long fileSize, String diskId, boolean isIso, boolean bootable, String controller, String controllerSubType) { + public DatadiskTO(String path, long virtualSize, long fileSize, String diskId, boolean isIso, boolean bootable, + String controller, String controllerSubType, int diskNumber, String configuration) { this.path = path; this.virtualSize = virtualSize; this.fileSize = fileSize; @@ -47,6 +43,8 @@ public class DatadiskTO { this.isIso = isIso; this.diskController = controller; this.diskControllerSubType = controllerSubType; + this.diskNumber = diskNumber; + this.configuration = configuration; } public String getPath() { @@ -105,4 +103,11 @@ public class DatadiskTO { this.diskControllerSubType = diskControllerSubType; } + public int getDiskNumber() { + return this.diskNumber; + } + + public String getConfiguration() { + return configuration; + } } \ No newline at end of file diff --git a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java new file mode 100644 index 00000000000..c51c2632137 --- /dev/null +++ b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java @@ -0,0 +1,51 @@ +// 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.agent.api.to; + +public class DeployAsIsInfoTO { + + private boolean deployAsIs; + private String templatePath; + private String deploymentConfiguration; + + public DeployAsIsInfoTO() { + } + + public boolean isDeployAsIs() { + return deployAsIs; + } + + public void setDeployAsIs(boolean deployAsIs) { + this.deployAsIs = deployAsIs; + } + + public String getTemplatePath() { + return templatePath; + } + + public void setTemplatePath(String templateInSecondaryPath) { + this.templatePath = templateInSecondaryPath; + } + + public String getDeploymentConfiguration() { + return deploymentConfiguration; + } + + public void setDeploymentConfiguration(String deploymentConfiguration) { + this.deploymentConfiguration = deploymentConfiguration; + } +} diff --git a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java index dceacf0e65b..7dbc70d6629 100644 --- a/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java +++ b/api/src/main/java/com/cloud/agent/api/to/VirtualMachineTO.java @@ -23,7 +23,6 @@ import java.util.HashMap; import com.cloud.agent.api.LogLevel; import com.cloud.agent.api.storage.OVFPropertyTO; import com.cloud.template.VirtualMachineTemplate.BootloaderType; -import com.cloud.utils.Pair; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Type; @@ -82,7 +81,8 @@ public class VirtualMachineTO { Map guestOsDetails = new HashMap(); Map extraConfig = new HashMap<>(); @LogLevel(LogLevel.Log4jLevel.Off) - Pair> ovfProperties; + List ovfProperties; + DeployAsIsInfoTO deployAsIsInfo; public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader, String os, boolean enableHA, boolean limitCpuUse, String vncPassword) { @@ -376,11 +376,11 @@ public class VirtualMachineTO { return extraConfig; } - public Pair> getOvfProperties() { + public List getOvfProperties() { return ovfProperties; } - public void setOvfProperties(Pair> ovfProperties) { + public void setOvfProperties(List ovfProperties) { this.ovfProperties = ovfProperties; } public String getBootType() { @@ -402,4 +402,12 @@ public class VirtualMachineTO { public void setEnterHardwareSetup(boolean enterHardwareSetup) { this.enterHardwareSetup = enterHardwareSetup; } + + public DeployAsIsInfoTO getDeployAsIsInfo() { + return deployAsIsInfo; + } + + public void setDeployAsIsInfo(DeployAsIsInfoTO deployAsIsInfo) { + this.deployAsIsInfo = deployAsIsInfo; + } } diff --git a/api/src/main/java/com/cloud/storage/ImageStore.java b/api/src/main/java/com/cloud/storage/ImageStore.java index c019b17421d..017f367c13e 100644 --- a/api/src/main/java/com/cloud/storage/ImageStore.java +++ b/api/src/main/java/com/cloud/storage/ImageStore.java @@ -21,6 +21,13 @@ import org.apache.cloudstack.api.InternalIdentity; public interface ImageStore extends Identity, InternalIdentity { + String ACS_PROPERTY_PREFIX = "ACS-property-"; + String REQUIRED_NETWORK_PREFIX = "ACS-network-"; + String DISK_DEFINITION_PREFIX = "ACS-disk-"; + String OVF_HARDWARE_CONFIGURATION_PREFIX = "ACS-configuration-"; + String OVF_HARDWARE_ITEM_PREFIX = "ACS-hardware-item-"; + String OVF_EULA_SECTION_PREFIX = "ACS-eula-"; + /** * @return name of the object store. */ diff --git a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java index 5177e51d401..95d1ebf0b87 100644 --- a/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java +++ b/api/src/main/java/com/cloud/template/VirtualMachineTemplate.java @@ -138,4 +138,6 @@ public interface VirtualMachineTemplate extends ControlledEntity, Identity, Inte void incrUpdatedCount(); Date getUpdated(); + + boolean isDeployAsIs(); } diff --git a/api/src/main/java/com/cloud/vm/NicProfile.java b/api/src/main/java/com/cloud/vm/NicProfile.java index 47021c85108..cd2215cf715 100644 --- a/api/src/main/java/com/cloud/vm/NicProfile.java +++ b/api/src/main/java/com/cloud/vm/NicProfile.java @@ -52,6 +52,8 @@ public class NicProfile implements InternalIdentity, Serializable { Integer networkRate; boolean isSecurityGroupEnabled; + Integer orderIndex; + // IPv4 String iPv4Address; String iPv4Netmask; @@ -381,6 +383,14 @@ public class NicProfile implements InternalIdentity, Serializable { this.requestedIPv6 = requestedIPv6; } + public Integer getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(Integer orderIndex) { + this.orderIndex = orderIndex; + } + // // OTHER METHODS // @@ -410,6 +420,8 @@ public class NicProfile implements InternalIdentity, Serializable { broadcastUri = null; isolationUri = null; + orderIndex = null; + } @Override diff --git a/api/src/main/java/com/cloud/vm/VmDetailConstants.java b/api/src/main/java/com/cloud/vm/VmDetailConstants.java index 3812aa21144..9991e1f35b4 100644 --- a/api/src/main/java/com/cloud/vm/VmDetailConstants.java +++ b/api/src/main/java/com/cloud/vm/VmDetailConstants.java @@ -63,4 +63,6 @@ public interface VmDetailConstants { String IP6_ADDRESS = "ip6Address"; String DISK = "disk"; String DISK_OFFERING = "diskOffering"; + + String DEPLOY_AS_IS_CONFIGURATION = "configurationId"; } diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 88f083b50e6..4751e312f92 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -185,6 +185,7 @@ public class ApiConstants { public static final String ICMP_TYPE = "icmptype"; public static final String ID = "id"; public static final String IDS = "ids"; + public static final String INDEX = "index"; public static final String PREVIOUS_ACL_RULE_ID = "previousaclruleid"; public static final String NEXT_ACL_RULE_ID = "nextaclruleid"; public static final String MOVE_ACL_CONSISTENCY_HASH = "aclconsistencyhash"; @@ -262,7 +263,7 @@ public class ApiConstants { public static final String OUTOFBANDMANAGEMENT_POWERSTATE = "outofbandmanagementpowerstate"; public static final String OUTOFBANDMANAGEMENT_ENABLED = "outofbandmanagementenabled"; public static final String OUTPUT = "output"; - public static final String OVF_PROPERTIES = "ovfproperties"; + public static final String PROPERTIES = "properties"; public static final String PARAMS = "params"; public static final String PARENT_ID = "parentid"; public static final String PARENT_DOMAIN_ID = "parentdomainid"; @@ -824,6 +825,10 @@ public class ApiConstants { public static final String BOOT_TYPE = "boottype"; public static final String BOOT_MODE = "bootmode"; public static final String BOOT_INTO_SETUP = "bootintosetup"; + public static final String DEPLOY_AS_IS = "deployasis"; + public static final String CROSS_ZONES = "crossZones"; + public static final String TEMPLATETYPE = "templatetype"; + public static final String SOURCETEMPLATEID = "sourcetemplateid"; public enum BootType { UEFI, BIOS; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java index 10321cc035d..5f924f213a0 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java @@ -204,6 +204,9 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd { for (Map entry : (Collection>)nicNetworkList.values()) { String nic = entry.get(VmDetailConstants.NIC); String networkUuid = entry.get(VmDetailConstants.NETWORK); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("nic, '%s', goes on net, '%s'", nic, networkUuid)); + } if (Strings.isNullOrEmpty(nic) || Strings.isNullOrEmpty(networkUuid) || _entityMgr.findByUuid(Network.class, networkUuid) == null) { throw new InvalidParameterValueException(String.format("Network ID: %s for NIC ID: %s is invalid", networkUuid, nic)); } @@ -219,11 +222,14 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd { for (Map entry : (Collection>)nicIpAddressList.values()) { String nic = entry.get(VmDetailConstants.NIC); String ipAddress = Strings.emptyToNull(entry.get(VmDetailConstants.IP4_ADDRESS)); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("nic, '%s', gets ip, '%s'", nic, ipAddress)); + } if (Strings.isNullOrEmpty(nic)) { throw new InvalidParameterValueException(String.format("NIC ID: '%s' is invalid for IP address mapping", nic)); } if (Strings.isNullOrEmpty(ipAddress)) { - throw new InvalidParameterValueException(String.format("IP address '%s' for NIC ID: %s is invalid", ipAddress, nic)); + throw new InvalidParameterValueException(String.format("Empty address for NIC ID: %s is invalid", nic)); } if (!Strings.isNullOrEmpty(ipAddress) && !ipAddress.equals("auto") && !NetUtils.isValidIp4(ipAddress)) { throw new InvalidParameterValueException(String.format("IP address '%s' for NIC ID: %s is invalid", ipAddress, nic)); @@ -239,12 +245,15 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd { Map dataDiskToDiskOfferingMap = new HashMap<>(); if (MapUtils.isNotEmpty(dataDiskToDiskOfferingList)) { for (Map entry : (Collection>)dataDiskToDiskOfferingList.values()) { - String nic = entry.get(VmDetailConstants.DISK); + String disk = entry.get(VmDetailConstants.DISK); String offeringUuid = entry.get(VmDetailConstants.DISK_OFFERING); - if (Strings.isNullOrEmpty(nic) || Strings.isNullOrEmpty(offeringUuid) || _entityMgr.findByUuid(DiskOffering.class, offeringUuid) == null) { - throw new InvalidParameterValueException(String.format("Disk offering ID: %s for disk ID: %s is invalid", offeringUuid, nic)); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("disk, '%s', gets offering, '%s'", disk, offeringUuid)); } - dataDiskToDiskOfferingMap.put(nic, _entityMgr.findByUuid(DiskOffering.class, offeringUuid).getId()); + if (Strings.isNullOrEmpty(disk) || Strings.isNullOrEmpty(offeringUuid) || _entityMgr.findByUuid(DiskOffering.class, offeringUuid) == null) { + throw new InvalidParameterValueException(String.format("Disk offering ID: %s for disk ID: %s is invalid", offeringUuid, disk)); + } + dataDiskToDiskOfferingMap.put(disk, _entityMgr.findByUuid(DiskOffering.class, offeringUuid).getId()); } } return dataDiskToDiskOfferingMap; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java index dcb1730cec6..91cac0937d4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java @@ -65,6 +65,24 @@ public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd { since = "4.13") private Long zoneId; + @Parameter(name = ApiConstants.CPU_NUMBER, + type = CommandType.INTEGER, + description = "the CPU number that listed offerings must support", + since = "4.15") + private Integer cpuNumber; + + @Parameter(name = ApiConstants.MEMORY, + type = CommandType.INTEGER, + description = "the RAM memory that listed offering must support", + since = "4.15") + private Integer memory; + + @Parameter(name = ApiConstants.CPU_SPEED, + type = CommandType.INTEGER, + description = "the CPU speed that listed offerings must support", + since = "4.15") + private Integer cpuSpeed; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -93,6 +111,18 @@ public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd { return zoneId; } + public Integer getCpuNumber() { + return cpuNumber; + } + + public Integer getMemory() { + return memory; + } + + public Integer getCpuSpeed() { + return cpuSpeed; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplateOVFProperties.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplateOVFProperties.java deleted file mode 100644 index 2a620c9abe5..00000000000 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplateOVFProperties.java +++ /dev/null @@ -1,68 +0,0 @@ -// 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 org.apache.cloudstack.api.command.user.template; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import org.apache.cloudstack.acl.RoleType; -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.TemplateOVFPropertyResponse; -import org.apache.cloudstack.api.response.TemplateResponse; -import org.apache.cloudstack.context.CallContext; - -@APICommand(name = ListTemplateOVFProperties.APINAME, - description = "List template OVF properties if available.", - responseObject = TemplateOVFPropertyResponse.class, - authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}) -public class ListTemplateOVFProperties extends BaseListCmd { - - public static final String APINAME = "listTemplateOvfProperties"; - - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, - description = "the template ID", required = true) - private Long templateId; - - public Long getTemplateId() { - return templateId; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - ListResponse response = _queryService.listTemplateOVFProperties(this); - response.setResponseName(getCommandName()); - setResponseObject(response); - } - - @Override - public String getCommandName() { - return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } -} diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java index 5630d7fba42..157118285fc 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java @@ -16,8 +16,12 @@ // under the License. package org.apache.cloudstack.api.command.user.template; +import com.cloud.exception.InvalidParameterValueException; +import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.EnumSet; import java.util.List; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiCommandJobType; @@ -82,10 +86,35 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User @Parameter(name = ApiConstants.PARENT_TEMPLATE_ID, type = CommandType.UUID, entityType = TemplateResponse.class, description = "list datadisk templates by parent template id", since = "4.4") private Long parentTemplateId; + @Parameter(name = ApiConstants.DETAILS, + type = CommandType.LIST, + collectionType = CommandType.STRING, + description = "comma separated list of template details requested, value can be a list of [ all, resource, min]") + private List viewDetails; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// + public EnumSet getDetails() throws InvalidParameterValueException { + EnumSet dv; + if (CollectionUtils.isEmpty(viewDetails)) { + dv = EnumSet.of(ApiConstants.DomainDetails.all); + } else { + try { + ArrayList dc = new ArrayList<>(); + for (String detail : viewDetails) { + dc.add(ApiConstants.DomainDetails.valueOf(detail)); + } + dv = EnumSet.copyOf(dc); + } catch (IllegalArgumentException e) { + throw new InvalidParameterValueException("The details parameter contains a non permitted value. The allowed values are " + + EnumSet.allOf(ApiConstants.DomainDetails.class)); + } + } + return dv; + } + public String getHypervisor() { return hypervisor; } diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java index 7e0002dbe99..ca08c2a5ded 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java @@ -162,6 +162,13 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd { description = "true if template should bypass Secondary Storage and be downloaded to Primary Storage on deployment") private Boolean directDownload; + @Parameter(name= ApiConstants.DEPLOY_AS_IS, + type = CommandType.BOOLEAN, + description = "VMware only: true if template should not strip and define disks and networks but leave those to the template definition", + since = "4.15" + ) + private Boolean deployAsIs; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -274,6 +281,10 @@ public class RegisterTemplateCmd extends BaseCmd implements UserCmd { return directDownload == null ? false : directDownload; } + public Boolean isDeployAsIs() { + return deployAsIs == null ? false : deployAsIs; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index b4514b1c759..09455d45dff 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -52,6 +52,7 @@ import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.context.CallContext; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.log4j.Logger; @@ -72,6 +73,8 @@ import com.cloud.uservm.UserVm; import com.cloud.utils.net.Dhcp; import com.cloud.utils.net.NetUtils; import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VmDetailConstants; +import com.google.common.base.Strings; @APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = {VirtualMachine.class}, requestHasSensitiveInfo = false, responseHasSensitiveInfo = true) @@ -221,10 +224,16 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG @Parameter(name = ApiConstants.COPY_IMAGE_TAGS, type = CommandType.BOOLEAN, since = "4.13", description = "if true the image tags (if any) will be copied to the VM, default value is false") private Boolean copyImageTags; - @Parameter(name = ApiConstants.OVF_PROPERTIES, type = CommandType.MAP, since = "4.13", - description = "used to specify the OVF properties.") + @Parameter(name = ApiConstants.PROPERTIES, type = CommandType.MAP, since = "4.15", + description = "used to specify the vApp properties.") @LogLevel(LogLevel.Log4jLevel.Off) - private Map vmOvfProperties; + private Map vAppProperties; + + @Parameter(name = ApiConstants.NIC_NETWORK_LIST, type = CommandType.MAP, since = "4.15", + description = "VMware only: used to specify network mapping of a vApp VMware template registered \"as-is\"." + + " Example nicnetworklist[0].ip=Nic-101&nicnetworklist[0].network=uuid") + @LogLevel(LogLevel.Log4jLevel.Off) + private Map vAppNetworks; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -311,11 +320,10 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG return null; } - - public Map getVmOVFProperties() { + public Map getVmProperties() { Map map = new HashMap<>(); - if (MapUtils.isNotEmpty(vmOvfProperties)) { - Collection parameterCollection = vmOvfProperties.values(); + if (MapUtils.isNotEmpty(vAppProperties)) { + Collection parameterCollection = vAppProperties.values(); Iterator iterator = parameterCollection.iterator(); while (iterator.hasNext()) { HashMap entry = (HashMap)iterator.next(); @@ -325,6 +333,32 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG return map; } + public Map getVmNetworkMap() { + Map map = new HashMap<>(); + if (MapUtils.isNotEmpty(vAppNetworks)) { + Collection parameterCollection = vAppNetworks.values(); + Iterator iterator = parameterCollection.iterator(); + while (iterator.hasNext()) { + HashMap entry = (HashMap) iterator.next(); + Integer nic; + try { + nic = Integer.valueOf(entry.get(VmDetailConstants.NIC)); + } catch (NumberFormatException nfe) { + nic = null; + } + String networkUuid = entry.get(VmDetailConstants.NETWORK); + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("nic, '%s', goes on net, '%s'", nic, networkUuid)); + } + if (nic == null || Strings.isNullOrEmpty(networkUuid) || _entityMgr.findByUuid(Network.class, networkUuid) == null) { + throw new InvalidParameterValueException(String.format("Network ID: %s for NIC ID: %s is invalid", networkUuid, nic)); + } + map.put(nic, _entityMgr.findByUuid(Network.class, networkUuid).getId()); + } + } + return map; + } + public String getGroup() { return group; } @@ -374,6 +408,13 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG } public List getNetworkIds() { + if (MapUtils.isNotEmpty(vAppNetworks)) { + if (CollectionUtils.isNotEmpty(networkIds) || ipAddress != null || getIp6Address() != null || MapUtils.isNotEmpty(ipToNetworkList)) { + throw new InvalidParameterValueException(String.format("%s can't be specified along with %s, %s, %s", ApiConstants.NIC_NETWORK_LIST, ApiConstants.NETWORK_IDS, ApiConstants.IP_ADDRESS, ApiConstants.IP_NETWORK_LIST)); + } else { + return new ArrayList<>(); + } + } if (ipToNetworkList != null && !ipToNetworkList.isEmpty()) { if ((networkIds != null && !networkIds.isEmpty()) || ipAddress != null || getIp6Address() != null) { throw new InvalidParameterValueException("ipToNetworkMap can't be specified along with networkIds or ipAddress"); diff --git a/api/src/main/java/org/apache/cloudstack/api/net/NetworkPrerequisiteTO.java b/api/src/main/java/org/apache/cloudstack/api/net/NetworkPrerequisiteTO.java new file mode 100644 index 00000000000..e39849685de --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/net/NetworkPrerequisiteTO.java @@ -0,0 +1,124 @@ +// 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 org.apache.cloudstack.api.net; + +/** + * container for the network prerequisites as found in the appliance template + * + * for OVA: + * {code} + * + * Management Network Interface + * + * {code} + * {code} + * + * 7 + * true + * Management0-0 + * E1000 Ethernet adapter on "Management Network" + * Network adapter 1 + * 6 + * E1000 + * 10 + * + * {code} + */ +public class NetworkPrerequisiteTO { + String name; + String networkDescription; + + int addressOnParent; + boolean automaticAllocation; + String nicDescription; + String elementName; + int InstanceID; + String resourceSubType; + String resourceType; + + public int getAddressOnParent() { + return addressOnParent; + } + + public void setAddressOnParent(int addressOnParent) { + this.addressOnParent = addressOnParent; + } + + public boolean isAutomaticAllocation() { + return automaticAllocation; + } + + public void setAutomaticAllocation(boolean automaticAllocation) { + this.automaticAllocation = automaticAllocation; + } + + public String getNicDescription() { + return nicDescription; + } + + public void setNicDescription(String nicDescription) { + this.nicDescription = nicDescription; + } + + public String getElementName() { + return elementName; + } + + public void setElementName(String elementName) { + this.elementName = elementName; + } + + public int getInstanceID() { + return InstanceID; + } + + public void setInstanceID(int instanceID) { + InstanceID = instanceID; + } + + public String getResourceSubType() { + return resourceSubType; + } + + public void setResourceSubType(String resourceSubType) { + this.resourceSubType = resourceSubType; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNetworkDescription() { + return networkDescription; + } + + public void setNetworkDescription(String networkDescription) { + this.networkDescription = networkDescription; + } +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TemplateOVFPropertyResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateOVFPropertyResponse.java index 83455a3fe6e..ebe0d1cfd0d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateOVFPropertyResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateOVFPropertyResponse.java @@ -16,14 +16,14 @@ // under the License. package org.apache.cloudstack.api.response; -import com.cloud.agent.api.storage.OVFProperty; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; -import org.apache.cloudstack.api.EntityReference; -@EntityReference(value = OVFProperty.class) +/** + * the placeholder of parameters to fill for deployment + */ public class TemplateOVFPropertyResponse extends BaseResponse { @SerializedName(ApiConstants.KEY) @@ -58,6 +58,27 @@ public class TemplateOVFPropertyResponse extends BaseResponse { @Param(description = "the ovf property label") private String description; + @SerializedName(ApiConstants.INDEX) + @Param(description = "the ovf property index") + private Integer index; + + @SerializedName(ApiConstants.CATEGORY) + @Param(description = "the ovf property category") + private String category; + + @Override + public boolean equals(Object other) { + if (!(other instanceof TemplateOVFPropertyResponse)) { + return false; + } + return key != null && key.equals(((TemplateOVFPropertyResponse)other).key); + } + + @Override + public int hashCode() { + return key.hashCode(); + } + public String getKey() { return key; } @@ -121,4 +142,20 @@ public class TemplateOVFPropertyResponse extends BaseResponse { public void setPassword(Boolean password) { this.password = password; } + + public Integer getIndex() { + return index; + } + + public void setIndex(Integer index) { + this.index = index; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java index 094fe2aa566..457d29c7ab1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -55,7 +56,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "the date this template was created") private Date created; - @SerializedName("removed") + @SerializedName(ApiConstants.REMOVED) @Param(description = "the date this template was removed") private Date removed; @@ -80,7 +81,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "true if this template is a featured template, false otherwise") private boolean featured; - @SerializedName("crossZones") + @SerializedName(ApiConstants.CROSS_ZONES) @Param(description = "true if the template is managed across all Zones, false otherwise") private boolean crossZones; @@ -122,7 +123,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "the physical size of the template") private Long physicalSize; - @SerializedName("templatetype") + @SerializedName(ApiConstants.TEMPLATETYPE) @Param(description = "the type of the template") private String templateType; @@ -146,7 +147,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "checksum of the template") private String checksum; - @SerializedName("sourcetemplateid") + @SerializedName(ApiConstants.SOURCETEMPLATEID) @Param(description = "the template ID of the parent template if present") private String sourcetemplateId; @@ -154,7 +155,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "the ID of the secondary storage host for the template") private String hostId; - @SerializedName("hostname") + @SerializedName(ApiConstants.HOST_NAME) @Param(description = "the name of the secondary storage host for the template") private String hostName; @@ -172,7 +173,7 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @SerializedName(ApiConstants.DETAILS) @Param(description = "additional key/value details tied with template") - private Map details; + private Map details; @SerializedName(ApiConstants.DOWNLOAD_DETAILS) @Param(description = "Lists the download progress of a template across all secondary storages") @@ -194,12 +195,18 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "KVM Only: true if template is directly downloaded to Primary Storage bypassing Secondary Storage") private Boolean directDownload; + @SerializedName(ApiConstants.DEPLOY_AS_IS) + @Param(description = "VMware only: true if template is deployed without orchestrating disks and networks but \"as-is\" defined in the template.") + private Boolean deployAsIs; + @SerializedName("parenttemplateid") @Param(description = "if Datadisk template, then id of the root disk template this template belongs to") + @Deprecated(since = "4.15") private String parentTemplateId; @SerializedName("childtemplates") @Param(description = "if root disk template, then ids of the datas disk templates this template owns") + @Deprecated(since = "4.15") private Set childTemplates; @SerializedName(ApiConstants.REQUIRES_HVM) @@ -360,14 +367,21 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements this.projectName = projectName; } - public Map getDetails() { + public Map getDetails() { return this.details; } - public void setDetails(Map details) { + public void setDetails(Map details) { this.details = details; } + public void addDetail(String key, String value) { + if (this.details == null) { + setDetails(new HashMap<>()); + } + this.details.put(key,value); + } + public void setTags(Set tags) { this.tags = tags; } @@ -396,6 +410,10 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements return directDownload; } + public void setDeployAsIs(Boolean deployAsIs) { + this.deployAsIs = deployAsIs; + } + public void setParentTemplateId(String parentTemplateId) { this.parentTemplateId = parentTemplateId; } diff --git a/api/src/main/java/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java index 0a400ed9ae3..717af5df8e9 100644 --- a/api/src/main/java/org/apache/cloudstack/query/QueryService.java +++ b/api/src/main/java/org/apache/cloudstack/query/QueryService.java @@ -44,7 +44,6 @@ import org.apache.cloudstack.api.command.user.project.ListProjectsCmd; import org.apache.cloudstack.api.command.user.resource.ListDetailOptionsCmd; import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; -import org.apache.cloudstack.api.command.user.template.ListTemplateOVFProperties; import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd; import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; @@ -74,7 +73,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.StorageTagResponse; -import org.apache.cloudstack.api.response.TemplateOVFPropertyResponse; import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; @@ -173,7 +171,5 @@ public interface QueryService { ListResponse listManagementServers(ListMgmtsCmd cmd); - ListResponse listTemplateOVFProperties(ListTemplateOVFProperties cmd); - List listRouterHealthChecks(GetRouterHealthCheckResultsCmd cmd); } diff --git a/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java b/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java index 8aa9852fb25..c4f71052496 100644 --- a/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java +++ b/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java @@ -40,16 +40,689 @@ public class OVFHelperTest { "" + ""; + private String ovfFileDeploymentOptionsSection = + "\n" + + " Deployment Configuration information\n" + + " \n" + + " \n" + + " Use this option to deploy an ASAv with a maximum throughput of 100 Mbps (uses 1 vCPU and 2 GB of memory).\n" + + " \n" + + " \n" + + " \n" + + " Use this option to deploy an ASAv with a maximum throughput of 1 Gbps (uses 1 vCPU and 2 GB of memory).\n" + + " \n" + + " \n" + + " \n" + + " Use this option to deploy an ASAv with a maximum throughput of 2 Gbps (uses 4 vCPUs and 8 GB of memory).\n" + + " \n" + + " "; + + private String ovfFileVirtualHardwareSection = + "\n" + + " Virtual hardware requirements\n" + + " \n" + + " Virtual Hardware Family\n" + + " 0\n" + + " ASAv\n" + + " vmx-08,vmx-09\n" + + " \n" + + " \n" + + " hertz * 10^6\n" + + " Number of Virtual CPUs\n" + + " 1 virtual CPU(s)\n" + + " 1\n" + + " 5000\n" + + " 1000\n" + + " 3\n" + + " 1\n" + + " \n" + + " \n" + + " hertz * 10^6\n" + + " Number of Virtual CPUs\n" + + " 4 virtual CPU(s)\n" + + " 1\n" + + " 20000\n" + + " 1000\n" + + " 3\n" + + " 4\n" + + " \n" + + " \n" + + " byte * 2^20\n" + + " Memory Size\n" + + " 2048MB of memory\n" + + " 2\n" + + " 2048\n" + + " 2048\n" + + " 4\n" + + " 2048\n" + + " \n" + + " \n" + + " byte * 2^20\n" + + " Memory Size\n" + + " 8192MB of memory\n" + + " 2\n" + + " 8192\n" + + " 8192\n" + + " 4\n" + + " 8192\n" + + " \n" + + " \n" + + " 0\n" + + " SCSI Controller\n" + + " SCSI controller 0\n" + + " 3\n" + + " lsilogic\n" + + " 6\n" + + " \n" + + " \n" + + " 0\n" + + " IDE Controller\n" + + " IDE 0\n" + + " 4\n" + + " 5\n" + + " \n" + + " \n" + + " 0\n" + + " true\n" + + " CD/DVD Drive\n" + + " 5\n" + + " 4\n" + + " 15\n" + + " \n" + + " \n" + + " 1\n" + + " true\n" + + " CD/DVD Drive\n" + + " ovf:/file/file3\n" + + " 18\n" + + " 4\n" + + " 15\n" + + " \n" + + " \n" + + " 7\n" + + " true\n" + + " Management0-0\n" + + " E1000 Ethernet adapter on \"Management Network\"\n" + + " Network adapter 1\n" + + " 6\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 0\n" + + " Hard disk 1\n" + + " ovf:/disk/vmdisk1\n" + + " 7\n" + + " 3\n" + + " 17\n" + + " \n" + + " \n" + + " 1\n" + + " Hard disk 2\n" + + " ovf:/disk/vmdisk2\n" + + " 8\n" + + " 3\n" + + " 17\n" + + " \n" + + " \n" + + " 8\n" + + " true\n" + + " GigabitEthernet0-0\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 2\n" + + " 9\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 9\n" + + " true\n" + + " GigabitEthernet0-1\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 3\n" + + " 10\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 10\n" + + " true\n" + + " GigabitEthernet0-2\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 4\n" + + " 11\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 11\n" + + " true\n" + + " GigabitEthernet0-3\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 5\n" + + " 12\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 12\n" + + " true\n" + + " GigabitEthernet0-4\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 6\n" + + " 13\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 13\n" + + " true\n" + + " GigabitEthernet0-5\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 7\n" + + " 14\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 14\n" + + " true\n" + + " GigabitEthernet0-6\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 8\n" + + " 15\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 15\n" + + " true\n" + + " GigabitEthernet0-7\n" + + " General purpose E1000 Ethernet adapter\n" + + " Network adapter 9\n" + + " 16\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " 16\n" + + " true\n" + + " GigabitEthernet0-8\n" + + " Default HA failover E1000 Ethernet adapter, or additional standalone general purpose adapter\n" + + " Network adapter 10\n" + + " 17\n" + + " E1000\n" + + " 10\n" + + " \n" + + " \n" + + " "; + + private String eulaSections = + "\n" + + "\n" + + " end-user license agreement\n" + + " END USER LICENSE AGREEMENT\n" + + "\n" + + "IMPORTANT: PLEASE READ THIS END USER LICENSE AGREEMENT CAREFULLY. IT IS VERY IMPORTANT THAT YOU CHECK THAT YOU ARE PURCHASING CISCO SOFTWARE OR EQUIPMENT FROM AN APPROVED SOURCE AND THAT YOU, OR THE ENTITY YOU REPRESENT (COLLECTIVELY, THE \"CUSTOMER\") HAVE BEEN REGISTERED AS THE END USER FOR THE PURPOSES OF THIS CISCO END USER LICENSE AGREEMENT. IF YOU ARE NOT REGISTERED AS THE END USER YOU HAVE NO LICENSE TO USE THE SOFTWARE AND THE LIMITED WARRANTY IN THIS END USER LICENSE AGREEMENT DOES NOT APPLY. ASSUMING YOU HAVE PURCHASED FROM AN APPROVED SOURCE, DOWNLOADING, INSTALLING OR USING CISCO OR CISCO-SUPPLIED SOFTWARE CONSTITUTES ACCEPTANCE OF THIS AGREEMENT.\n" + + "\n" + + "CISCO SYSTEMS, INC. OR ITS AFFILIATE LICENSING THE SOFTWARE (\"CISCO\") IS WILLING TO LICENSE THIS SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU PURCHASED THE SOFTWARE FROM AN APPROVED SOURCE AND THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS END USER LICENSE AGREEMENT PLUS ANY ADDITIONAL LIMITATIONS ON THE LICENSE SET FORTH IN A SUPPLEMENTAL LICENSE AGREEMENT ACCOMPANYING THE PRODUCT, MADE AVAILABLE AT THE TIME OF YOUR ORDER, OR POSTED ON THE CISCO WEBSITE AT www.cisco.com/go/terms (COLLECTIVELY THE \"AGREEMENT\"). TO THE EXTENT OF ANY CONFLICT BETWEEN THE TERMS OF THIS END USER LICENSE AGREEMENT AND ANY SUPPLEMENTAL LICENSE AGREEMENT, THE SUPPLEMENTAL LICENSE AGREEMENT SHALL APPLY. BY DOWNLOADING, INSTALLING, OR USING THE SOFTWARE, YOU ARE REPRESENTING THAT YOU PURCHASED THE SOFTWARE FROM AN APPROVED SOURCE AND BINDING YOURSELF TO THE AGREEMENT. IF YOU DO " + + "NOT AGREE TO ALL OF THE TERMS OF THE AGREEMENT, THEN CISCO IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND (A) YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE, AND (B) YOU MAY RETURN THE SOFTWARE (INCLUDING ANY UNOPENED CD PACKAGE AND ANY WRITTEN MATERIALS) FOR A FULL REFUND, OR, IF THE SOFTWARE AND WRITTEN MATERIALS ARE SUPPLIED AS PART OF ANOTHER PRODUCT, YOU MAY RETURN THE ENTIRE PRODUCT FOR A FULL REFUND. YOUR RIGHT TO RETURN AND REFUND EXPIRES 30 DAYS AFTER PURCHASE FROM AN APPROVED SOURCE, AND APPLIES ONLY IF YOU ARE THE ORIGINAL AND REGISTERED END USER PURCHASER. FOR THE PURPOSES OF THIS END USER LICENSE AGREEMENT, AN \"APPROVED SOURCE\" MEANS (A) CISCO; OR (B) A DISTRIBUTOR OR SYSTEMS INTEGRATOR AUTHORIZED BY CISCO TO DISTRIBUTE / SELL CISCO EQUIPMENT, SOFTWARE AND SERVICES WITHIN YOUR TERRITORY TO END " + + "USERS; OR (C) A RESELLER AUTHORIZED BY ANY SUCH DISTRIBUTOR OR SYSTEMS INTEGRATOR IN ACCORDANCE WITH THE TERMS OF THE DISTRIBUTOR'S AGREEMENT WITH CISCO TO DISTRIBUTE / SELL THE CISCO EQUIPMENT, SOFTWARE AND SERVICES WITHIN YOUR TERRITORY TO END USERS.\n" + + "\n" + + "THE FOLLOWING TERMS OF THE AGREEMENT GOVERN CUSTOMER'S USE OF THE SOFTWARE (DEFINED BELOW), EXCEPT TO THE EXTENT: (A) THERE IS A SEPARATE SIGNED CONTRACT BETWEEN CUSTOMER AND CISCO GOVERNING CUSTOMER'S USE OF THE SOFTWARE, OR (B) THE SOFTWARE INCLUDES A SEPARATE \"CLICK-ACCEPT\" LICENSE AGREEMENT OR THIRD PARTY LICENSE AGREEMENT AS PART OF THE INSTALLATION OR DOWNLOAD PROCESS GOVERNING CUSTOMER'S USE OF THE SOFTWARE. TO THE EXTENT OF A CONFLICT BETWEEN THE PROVISIONS OF THE FOREGOING DOCUMENTS, THE ORDER OF PRECEDENCE SHALL BE (1)THE SIGNED CONTRACT, (2) THE CLICK-ACCEPT AGREEMENT OR THIRD PARTY LICENSE AGREEMENT, AND (3) THE AGREEMENT. FOR PURPOSES OF THE AGREEMENT, \"SOFTWARE\" SHALL MEAN COMPUTER PROGRAMS, INCLUDING FIRMWARE AND COMPUTER PROGRAMS EMBEDDED IN CISCO EQUIPMENT, AS PROVIDED TO CUSTOMER BY AN APPROVED SOURCE, AND ANY UPGRADES, UPDATES, BUG FIXES " + + "OR MODIFIED VERSIONS THERETO (COLLECTIVELY, \"UPGRADES\"), ANY OF THE SAME WHICH HAS BEEN RELICENSED UNDER THE CISCO SOFTWARE TRANSFER AND RE-LICENSING POLICY (AS MAY BE AMENDED BY CISCO FROM TIME TO TIME) OR BACKUP COPIES OF ANY OF THE FOREGOING.\n" + + "\n" + + "License. Conditioned upon compliance with the terms and conditions of the Agreement, Cisco grants to Customer a nonexclusive and nontransferable license to use for Customer's internal business purposes the Software and the Documentation for which Customer has paid the required license fees to an Approved Source. \"Documentation\" means written information (whether contained in user or technical manuals, training materials, specifications or otherwise) pertaining to the Software and made available by an Approved Source with the Software in any manner (including on CD-Rom, or on-line). In order to use the Software, Customer may be required to input a registration number or product authorization key and register Customer's copy of the Software online at Cisco's website to obtain the necessary license key or license file.\n" + + "\n" + + "Customer's license to use the Software shall be limited to, and Customer shall not use the Software in excess of, a single hardware chassis or card or such other limitations as are set forth in the applicable Supplemental License Agreement or in the applicable purchase order which has been accepted by an Approved Source and for which Customer has paid to an Approved Source the required license fee (the \"Purchase Order\").\n" + + "\n" + + "Unless otherwise expressly provided in the Documentation or any applicable Supplemental License Agreement, Customer shall use the Software solely as embedded in, for execution on, or (where the applicable Documentation permits installation on non-Cisco equipment) for communication with Cisco equipment owned or leased by Customer and used for Customer's internal business purposes. No other licenses are granted by implication, estoppel or otherwise.\n" + + "\n" + + "For evaluation or beta copies for which Cisco does not charge a license fee, the above requirement to pay license fees does not apply.\n" + + "\n" + + "General Limitations. This is a license, not a transfer of title, to the Software and Documentation, and Cisco retains ownership of all copies of the Software and Documentation. Customer acknowledges that the Software and Documentation contain trade secrets of Cisco or its suppliers or licensors, including but not limited to the specific internal design and structure of individual programs and associated interface information. Except as otherwise expressly provided under the Agreement, Customer shall only use the Software in connection with the use of Cisco equipment purchased by the Customer from an Approved Source and Customer shall have no right, and Customer specifically agrees not to:\n" + + "\n" + + "(i) transfer, assign or sublicense its license rights to any other person or entity (other than in compliance with any Cisco relicensing/transfer policy then in force), or use the Software on Cisco equipment not purchased by the Customer from an Approved Source or on secondhand Cisco equipment, and Customer acknowledges that any attempted transfer, assignment, sublicense or use shall be void;\n" + + "\n" + + "(ii) make error corrections to or otherwise modify or adapt the Software or create derivative works based upon the Software, or permit third parties to do the same;\n" + + "\n" + + "(iii) reverse engineer or decompile, decrypt, disassemble or otherwise reduce the Software to human-readable form, except to the extent otherwise expressly permitted under applicable law notwithstanding this restriction or except to the extent that Cisco is legally required to permit such specific activity pursuant to any applicable open source license;\n" + + "\n" + + "(iv) publish any results of benchmark tests run on the Software;\n" + + "\n" + + "(v) use or permit the Software to be used to perform services for third parties, whether on a service bureau or time sharing basis or otherwise, without the express written authorization of Cisco; or\n" + + "\n" + + "(vi) disclose, provide, or otherwise make available trade secrets contained within the Software and Documentation in any form to any third party without the prior written consent of Cisco. Customer shall implement reasonable security measures to protect such trade secrets.\n" + + "\n" + + "To the extent required by applicable law, and at Customer's written request, Cisco shall provide Customer with the interface information needed to achieve interoperability between the Software and another independently created program, on payment of Cisco's applicable fee, if any. Customer shall observe strict obligations of confidentiality with respect to such information and shall use such information in compliance with any applicable terms and conditions upon which Cisco makes such information available.\n" + + "\n" + + "Software, Upgrades and Additional Copies. NOTWITHSTANDING ANY OTHER PROVISION OF THE AGREEMENT: (1) CUSTOMER HAS NO LICENSE OR RIGHT TO MAKE OR USE ANY ADDITIONAL COPIES OR UPGRADES UNLESS CUSTOMER, AT THE TIME OF MAKING OR ACQUIRING SUCH COPY OR UPGRADE, ALREADY HOLDS A VALID LICENSE TO THE ORIGINAL SOFTWARE AND HAS PAID THE APPLICABLE FEE TO AN APPROVED SOURCE FOR THE UPGRADE OR ADDITIONAL COPIES; (2) USE OF UPGRADES IS LIMITED TO CISCO EQUIPMENT SUPPLIED BY AN APPROVED SOURCE FOR WHICH CUSTOMER IS THE ORIGINAL END USER PURCHASER OR LESSEE OR OTHERWISE HOLDS A VALID LICENSE TO USE THE SOFTWARE WHICH IS BEING UPGRADED; AND (3) THE MAKING AND USE OF ADDITIONAL COPIES IS LIMITED TO NECESSARY BACKUP PURPOSES ONLY.\n" + + "\n" + + "Proprietary Notices. Customer agrees to maintain and reproduce all copyright, proprietary, and other notices on all copies, in any form, of the Software in the same form and manner that such copyright and other proprietary notices are included on the Software. Except as expressly authorized in the Agreement, Customer shall not make any copies or duplicates of any Software without the prior written permission of Cisco.\n" + + "\n" + + "Term and Termination. The Agreement and the license granted herein shall remain effective until terminated. Customer may terminate the Agreement and the license at any time by destroying all copies of Software and any Documentation. Customer's rights under the Agreement will terminate immediately without notice from Cisco if Customer fails to comply with any provision of the Agreement. Upon termination, Customer shall destroy all copies of Software and Documentation in its possession or control. All confidentiality obligations of Customer, all restrictions and limitations imposed on the Customer under the section titled \"General Limitations\" and all limitations of liability and disclaimers and restrictions of warranty shall survive termination of this Agreement. In addition, the provisions of the sections titled \"U.S. Government End User Purchasers\" and \"General Terms Applicable to the Limited Warranty Statement " + + "and End User License Agreement\" shall survive termination of the Agreement.\n" + + "\n" + + "Customer Records. Customer grants to Cisco and its independent accountants the right to examine Customer's books, records and accounts during Customer's normal business hours to verify compliance with this Agreement. In the event such audit discloses non-compliance with this Agreement, Customer shall promptly pay to Cisco the appropriate license fees, plus the reasonable cost of conducting the audit.\n" + + "\n" + + "Export, Re-Export, Transfer and Use Controls. The Software, Documentation and technology or direct products thereof (hereafter referred to as Software and Technology), supplied by Cisco under the Agreement are subject to export controls under the laws and regulations of the United States (\"U.S.\") and any other applicable countries' laws and regulations. Customer shall comply with such laws and regulations governing export, re-export, import, transfer and use of Cisco Software and Technology and will obtain all required U.S. and local authorizations, permits, or licenses. Cisco and Customer each agree to provide the other information, support documents, and assistance as may reasonably be required by the other in connection with securing authorizations or licenses. Information regarding compliance with export, re-export, transfer and use may be located at the following URL: " + + "www.cisco.com/web/about/doing_business/legal/global_export_trade/general_export/contract_compliance.html\n" + + "\n" + + "U.S. Government End User Purchasers. The Software and Documentation qualify as \"commercial items,\" as that term is defined at Federal Acquisition Regulation (\"FAR\") (48 C.F.R.) 2.101, consisting of \"commercial computer software\" and \"commercial computer software documentation\" as such terms are used in FAR 12.212. Consistent with FAR 12.212 and DoD FAR Supp. 227.7202-1 through 227.7202-4, and notwithstanding any other FAR or other contractual clause to the contrary in any agreement into which the Agreement may be incorporated, Customer may provide to Government end user or, if the Agreement is direct, Government end user will acquire, the Software and Documentation with only those rights set forth in the Agreement. Use of either the Software or Documentation or both constitutes agreement by the Government that the Software and Documentation are \"commercial computer software\" and \"commercial computer " + + "software documentation,\" and constitutes acceptance of the rights and restrictions herein.\n" + + "\n" + + "Identified Components; Additional Terms. The Software may contain or be delivered with one or more components, which may include third-party components, identified by Cisco in the Documentation, readme.txt file, third-party click-accept or elsewhere (e.g. on www.cisco.com) (the \"Identified Component(s)\") as being subject to different license agreement terms, disclaimers of warranties, limited warranties or other terms and conditions (collectively, \"Additional Terms\") than those set forth herein. You agree to the applicable Additional Terms for any such Identified Component(s).\n" + + "\n" + + "Limited Warranty\n" + + "\n" + + "Subject to the limitations and conditions set forth herein, Cisco warrants that commencing from the date of shipment to Customer (but in case of resale by an Approved Source other than Cisco, commencing not more than ninety (90) days after original shipment by Cisco), and continuing for a period of the longer of (a) ninety (90) days or (b) the warranty period (if any) expressly set forth as applicable specifically to software in the warranty card accompanying the product of which the Software is a part (the \"Product\") (if any): (a) the media on which the Software is furnished will be free of defects in materials and workmanship under normal use; and (b) the Software substantially conforms to the Documentation. The date of shipment of a Product by Cisco is set forth on the packaging material in which the Product is shipped. Except for the foregoing, the Software is provided \"AS IS\". This limited warranty extends only to the " + + "Software purchased from an Approved Source by a Customer who is the first registered end user. Customer's sole and exclusive remedy and the entire liability of Cisco and its suppliers under this limited warranty will be (i) replacement of defective media and/or (ii) at Cisco's option, repair, replacement, or refund of the purchase price of the Software, in both cases subject to the condition that any error or defect constituting a breach of this limited warranty is reported to the Approved Source supplying the Software to Customer, within the warranty period. Cisco or the Approved Source supplying the Software to Customer may, at its option, require return of the Software and/or Documentation as a condition to the remedy. In no event does Cisco warrant that the Software is error free or that Customer will be able to operate the Software without problems or interruptions. In addition, due to the continual development of new " + + "techniques for intruding upon and attacking networks, Cisco does not warrant that the Software or any equipment, system or network on which the Software is used will be free of vulnerability to intrusion or attack.\n" + + "\n" + + "Restrictions. This warranty does not apply if the Software, Product or any other equipment upon which the Software is authorized to be used (a) has been altered, except by Cisco or its authorized representative, (b) has not been installed, operated, repaired, or maintained in accordance with instructions supplied by Cisco, (c) has been subjected to abnormal physical or electrical stress, abnormal environmental conditions, misuse, negligence, or accident; or (d) is licensed for beta, evaluation, testing or demonstration purposes. The Software warranty also does not apply to (e) any temporary Software modules; (f) any Software not posted on Cisco's Software Center; (g) any Software that Cisco expressly provides on an \"AS IS\" basis on Cisco's Software Center; (h) any Software for which an Approved Source does not receive a license fee; and (i) Software supplied by any third party which is not an Approved Source.\n" + + "\n" + + "DISCLAIMER OF WARRANTY\n" + + "\n" + + "EXCEPT AS SPECIFIED IN THIS WARRANTY SECTION, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, SATISFACTORY QUALITY, NON-INTERFERENCE, ACCURACY OF INFORMATIONAL CONTENT, OR ARISING FROM A COURSE OF DEALING, LAW, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW AND ARE EXPRESSLY DISCLAIMED BY CISCO, ITS SUPPLIERS AND LICENSORS. TO THE EXTENT THAT ANY OF THE SAME CANNOT BE EXCLUDED, SUCH IMPLIED CONDITION, REPRESENTATION AND/OR WARRANTY IS LIMITED IN DURATION TO THE EXPRESS WARRANTY PERIOD REFERRED TO IN THE \"LIMITED WARRANTY\" SECTION ABOVE. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATIONS ON HOW LONG AN IMPLIED WARRANTY LASTS, THE ABOVE LIMITATION MAY NOT APPLY IN SUCH STATES. THIS WARRANTY GIVES CUSTOMER SPECIFIC LEGAL RIGHTS, " + + "AND CUSTOMER MAY ALSO HAVE OTHER RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION. This disclaimer and exclusion shall apply even if the express warranty set forth above fails of its essential purpose.\n" + + "\n" + + "Disclaimer of Liabilities-Limitation of Liability. IF YOU ACQUIRED THE SOFTWARE IN THE UNITED STATES, LATIN AMERICA, CANADA, JAPAN OR THE CARIBBEAN, NOTWITHSTANDING ANYTHING ELSE IN THE AGREEMENT TO THE CONTRARY, ALL LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS COLLECTIVELY, TO CUSTOMER, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), BREACH OF WARRANTY OR OTHERWISE, SHALL NOT EXCEED THE PRICE PAID BY CUSTOMER TO ANY APPROVED SOURCE FOR THE SOFTWARE THAT GAVE RISE TO THE CLAIM OR IF THE SOFTWARE IS PART OF ANOTHER PRODUCT, THE PRICE PAID FOR SUCH OTHER PRODUCT. THIS LIMITATION OF LIABILITY FOR SOFTWARE IS CUMULATIVE AND NOT PER INCIDENT (I.E. THE EXISTENCE OF TWO OR MORE CLAIMS WILL NOT ENLARGE THIS LIMIT).\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN EUROPE, THE MIDDLE EAST, AFRICA, ASIA OR OCEANIA, NOTWITHSTANDING ANYTHING ELSE IN THE AGREEMENT TO THE CONTRARY, ALL LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS COLLECTIVELY, TO CUSTOMER, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), BREACH OF WARRANTY OR OTHERWISE, SHALL NOT EXCEED THE PRICE PAID BY CUSTOMER TO CISCO FOR THE SOFTWARE THAT GAVE RISE TO THE CLAIM OR IF THE SOFTWARE IS PART OF ANOTHER PRODUCT, THE PRICE PAID FOR SUCH OTHER PRODUCT. THIS LIMITATION OF LIABILITY FOR SOFTWARE IS CUMULATIVE AND NOT PER INCIDENT (I.E. THE EXISTENCE OF TWO OR MORE CLAIMS WILL NOT ENLARGE THIS LIMIT). NOTHING IN THE AGREEMENT SHALL LIMIT (I) THE LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS TO CUSTOMER FOR PERSONAL INJURY OR DEATH CAUSED BY THEIR NEGLIGENCE, (II) CISCO'S LIABILITY FOR FRAUDULENT" + + " MISREPRESENTATION, OR (III) ANY LIABILITY OF CISCO WHICH CANNOT BE EXCLUDED UNDER APPLICABLE LAW.\n" + + "\n" + + "Disclaimer of Liabilities-Waiver of Consequential Damages and Other Losses. IF YOU ACQUIRED THE SOFTWARE IN THE UNITED STATES, LATIN AMERICA, THE CARIBBEAN OR CANADA, REGARDLESS OF WHETHER ANY REMEDY SET FORTH HEREIN FAILS OF ITS ESSENTIAL PURPOSE OR OTHERWISE, IN NO EVENT WILL CISCO OR ITS SUPPLIERS BE LIABLE FOR ANY LOST REVENUE, PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE OR OTHERWISE AND EVEN IF CISCO OR ITS SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATION OR EXCLUSION OF CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU.\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN JAPAN, EXCEPT FOR LIABILITY ARISING OUT OF OR IN CONNECTION WITH DEATH OR PERSONAL INJURY, FRAUDULENT MISREPRESENTATION, AND REGARDLESS OF WHETHER ANY REMEDY SET FORTH HEREIN FAILS OF ITS ESSENTIAL PURPOSE OR OTHERWISE, IN NO EVENT WILL CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE OR OTHERWISE AND EVEN IF CISCO OR ANY APPROVED SOURCE OR THEIR SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN EUROPE, THE MIDDLE EAST, AFRICA, ASIA OR OCEANIA, IN NO EVENT WILL CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS, BE LIABLE FOR ANY LOST REVENUE, LOST PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES, HOWSOEVER ARISING, INCLUDING, WITHOUT LIMITATION, IN CONTRACT, TORT (INCLUDING NEGLIGENCE) OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF, IN EACH CASE, CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS, HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATION OR EXCLUSION OF CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT FULLY APPLY TO YOU. THE FOREGOING EXCLUSION SHALL NOT APPLY TO ANY LIABILITY ARISING OUT OF OR IN " + + "CONNECTION WITH: (I) DEATH OR PERSONAL INJURY, (II) FRAUDULENT MISREPRESENTATION, OR (III) CISCO'S LIABILITY IN CONNECTION WITH ANY TERMS THAT CANNOT BE EXCLUDED UNDER APPLICABLE LAW.\n" + + "\n" + + "Customer acknowledges and agrees that Cisco has set its prices and entered into the Agreement in reliance upon the disclaimers of warranty and the limitations of liability set forth herein, that the same reflect an allocation of risk between the parties (including the risk that a contract remedy may fail of its essential purpose and cause consequential loss), and that the same form an essential basis of the bargain between the parties.\n" + + "\n" + + "Controlling Law, Jurisdiction. If you acquired, by reference to the address on the purchase order accepted by the Approved Source, the Software in the United States, Latin America, or the Caribbean, the Agreement and warranties (\"Warranties\") are controlled by and construed under the laws of the State of California, United States of America, notwithstanding any conflicts of law provisions; and the state and federal courts of California shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in Canada, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the Province of Ontario, Canada, notwithstanding any conflicts of law provisions; and the courts of the Province of Ontario shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in " + + "Europe, the Middle East, Africa, Asia or Oceania (excluding Australia), unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of England, notwithstanding any conflicts of law provisions; and the English courts shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. In addition, if the Agreement is controlled by the laws of England, no person who is not a party to the Agreement shall be entitled to enforce or take the benefit of any of its terms under the Contracts (Rights of Third Parties) Act 1999. If you acquired the Software in Japan, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of Japan, notwithstanding any conflicts of law provisions; and the Tokyo District Court of Japan shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. " + + "If you acquired the Software in Australia, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the State of New South Wales, Australia, notwithstanding any conflicts of law provisions; and the State and federal courts of New South Wales shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in any other country, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the State of California, United States of America, notwithstanding any conflicts of law provisions; and the state and federal courts of California shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties.\n" + + "\n" + + "For all countries referred to above, the parties specifically disclaim the application of the UN Convention on Contracts for the International Sale of Goods. Notwithstanding the foregoing, either party may seek interim injunctive relief in any court of appropriate jurisdiction with respect to any alleged breach of such party's intellectual property or proprietary rights. If any portion hereof is found to be void or unenforceable, the remaining provisions of the Agreement and Warranties shall remain in full force and effect. Except as expressly provided herein, the Agreement constitutes the entire agreement between the parties with respect to the license of the Software and Documentation and supersedes any conflicting or additional terms contained in any Purchase Order or elsewhere, all of which terms are excluded. The Agreement has been written in the English language, and the parties agree that the English version will govern.\n" + + "\n" + + "Product warranty terms and other information applicable to Cisco products are available at the following URL: www.cisco.com/go/warranty\n" + + "\n" + + "Cisco and the Cisco logo are trademarks or registered trademarks of Cisco and/or its affiliates in the U.S. and other countries. To view a list of Cisco trademarks, go to this URL: www.cisco.com/go/trademarks. Third-party trademarks mentioned are the property of their respective owners. The use of the word partner does not imply a partnership relationship between Cisco and any other company. (1110R)\n" + + "\n" + + "© 1998, 2001, 2003, 2008-2014 Cisco Systems, Inc. All rights reserved.\n" + + "\n" + + "\n" + + " supplemental end-user license agreement\n" + + " SUPPLEMENTAL END USER LICENSE AGREEMENT FOR VIRTUAL SOFTWARE PRODUCTS\n" + + "\n" + + "IMPORTANT: READ CAREFULLY\n" + + "\n" + + "This Supplemental End User License Agreement (\"SEULA\") contains additional terms and conditions for the Software licensed under the End User License Agreement (\"EULA\") between you and Cisco (collectively, the \"Agreement\"). Capitalized terms used in this SEULA but not defined will have the meanings assigned to them in the EULA. To the extent that there is a conflict between the terms and conditions of the EULA and this SEULA, the terms and conditions of this SEULA will take precedence. In addition to the limitations set forth in the EULA on your access and use of the Software, you agree to comply at all times with the terms and conditions provided in this SEULA.\n" + + "\n" + + "DOWNLOADING, INSTALLING, OR USING THE SOFTWARE CONSTITUTES ACCEPTANCE OF THE AGREEMENT, AND YOU ARE BINDING YOURSELF AND THE BUSINESS ENTITY THAT YOU REPRESENT (COLLECTIVELY, \"CUSTOMER\") TO THE AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THE AGREEMENT, THEN CISCO IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND (A) YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE, AND (B) YOU MAY RETURN THE SOFTWARE (INCLUDING ANY UNOPENED CD PACKAGE AND ANY WRITTEN MATERIALS) FOR A FULL REFUND, OR, IF THE SOFTWARE AND WRITTEN MATERIALS ARE SUPPLIED AS PART OF ANOTHER PRODUCT, YOU MAY RETURN THE ENTIRE PRODUCT FOR A FULL REFUND. YOUR RIGHT TO RETURN AND REFUND EXPIRES 30 DAYS AFTER PURCHASE FROM CISCO OR AN AUTHORIZED CISCO RESELLER, AND APPLIES ONLY IF YOU ARE THE ORIGINAL END USER PURCHASER.\n" + + "\n" + + "Definitions\n" + + "\"CPU\" means a central processing unit that encompasses part of a Server.\n" + + "\"Failover Pair\" means a primary Instance and a standby Instance with the same Software configuration where the standby Instance can take over in case of failure of the primary Instance.\n" + + "\"Instance\" means a single copy of the Software. Each copy of the Software loaded into memory is an Instance.\n" + + "\"Server\" means a single physical computer or device on a network that manages or provides network resources for multiple users.\n" + + "\"Service Provider\" means a company that provides information technology services to external end user customers.\n" + + "\"Software\" means Cisco's Adaptive Security Virtual Appliance (\"ASAv\"), Adaptive Security Appliance 1000V Cloud Firewall Software (\"ASA 1000V\"), Nexus 1000V series switch products, Virtual Security Gateway products, or other Cisco virtual software products that Cisco includes under this SEULA.\n" + + "\"vCPU\" means a virtual central processing resource assigned to the VM by the underlying virtualization technology.\n" + + "\"Virtual Machine\" or \"VM\" means a software container that can run its own operating system and execute applications like a Server.\n" + + "\n" + + "Additional License Terms and Conditions\n" + + "1. Cisco hereby grants Customer the right to install and use the Software on single or multiple Cisco or non-Cisco Servers or on Virtual Machines. In order to use the Software Customer may be required to input a registration number or product activation key and register each Instance online at Cisco's website in order to obtain the necessary entitlements.\n" + + "2. Customer shall pay a unit license fee to Cisco or an authorized Cisco reseller, as applicable, for each Instance installed on a Cisco or non-Cisco Server CPU, vCPU or Virtual Machine, as determined by Cisco.\n" + + "3. For the ASA 1000V, Customer is licensed the number of Instances equal to the number of CPUs covered by the unit license fee. If Customer deploys a Failover Pair, then the fee for the additional standby Instance is included in the fee for each primary Instance.\n" + + "4. If Customer is a Service Provider, Customer may use the Software under the terms of this Agreement for the purpose of delivering hosted information technology services to Customer's end user customers, subject to payment of the required license fee(s).\n" + + "5. Customer may also use the Software under the terms of this Agreement to deliver hosted information technology services to Customer affiliates, subject to payment of the required license fee(s).\n" + + "6. If the Software is subject to Cisco's Smart Licensing program, Cisco will be able to assess if Customer is using the Software within the limits and entitlements paid for by Customer. If the Smart Licensing program is applicable, Customer will be required to enter into a separate terms of service agreement relating to Smart Licensing.\n" + + "\n" + + ""; + + private String productSectionWithCategories = + "\n" + + "\n" + + " Appliance ISV branding information\n" + + " VMware vCenter Server Appliance\n" + + " VMware Inc.\n" + + " \n" + + "\n" + + "\n" + + " 6.7.0.44000\n" + + " 6.7.0.44000 build 16046470\n" + + " \n" + + " http://www.vmware.com\n" + + " https://${vami.ip0.VMware_vCenter_Server_Appliance}:5480/\n" + + " Application\n" + + " Networking Configuration\n" + + " \n" + + " \n" + + " Network IP address family (i.e., 'ipv4' or 'ipv6').\n" + + " \n" + + " \n" + + " \n" + + " Network mode (i.e., 'static', 'dhcp', or 'autoconf' (IPv6 only).\n" + + " \n" + + " \n" + + " \n" + + " Network IP address. Only provide this when mode is 'static'. Can be IPv4 or IPv6 based on specified address family.\n" + + " \n" + + " \n" + + " \n" + + " Network prefix length. Only provide this when mode is 'static'. 0-32 for IPv4. 0-128 for IPv6.\n" + + " \n" + + " \n" + + " \n" + + " IP address of default gateway. Can be 'default' when using IPv6.\n" + + " \n" + + " \n" + + " \n" + + " Comma separated list of IP addresses of DNS servers.\n" + + " \n" + + " \n" + + " \n" + + " Network identity (IP address or fully-qualified domain name) services should use when advertising themselves.\n" + + " \n" + + " \n" + + " \n" + + " A string encoding a JSON object mapping port names to port numbers.\n" + + " \n" + + " SSO Configuration\n" + + " \n" + + " \n" + + " For the first instance of the identity domain, this is the username with Administrator privileges. Otherwise, this is the username of the replication partner.\n" + + " \n" + + " \n" + + " \n" + + " For the first instance of the identity domain, this is the password given to the Administrator account. Otherwise, this is the password of the Administrator account of the replication partner.\n" + + " \n" + + " \n" + + " \n" + + " For the first instance of the identity domain, this is the name of the newly created domain.\n" + + " \n" + + " \n" + + " \n" + + " Name of site. Use 'Default-First-Site' to define a new site.\n" + + " \n" + + " \n" + + " \n" + + " If this parameter is set to True, the VMware directory instance is setup as the first instance of a new identity domain. Otherwise, the instance is setup as a replication partner.\n" + + " \n" + + " \n" + + " \n" + + " The hostname of the VMware directory replication partner. This value is ignored for the first instance of the identity domain.\n" + + " \n" + + " Database Configuration\n" + + " \n" + + " \n" + + " String indicating whether the database is 'embedded' or 'external'.\n" + + " \n" + + " \n" + + " \n" + + " String naming the account to use when connecting to external database (ignored when db.type is 'embedded').\n" + + " \n" + + " \n" + + " \n" + + " String providing the password to use when connecting to external database (ignored when db.type is 'embedded').\n" + + " \n" + + " \n" + + " \n" + + " String naming the the hostname of the server on which the external database is running (ignored when db.type is 'embedded').\n" + + " \n" + + " \n" + + " \n" + + " String describing the port on the host on which the external database is running (ignored when db.type is 'embedded').\n" + + " \n" + + " \n" + + " \n" + + " String describing the external database provider. The only supported value is 'oracle' (ignored when the db.type is 'embedded').\n" + + " \n" + + " \n" + + " \n" + + " String describing the external database instance. Values could be anything depending on what the database instance name the DBA creates in the external db. (ignored when the db.type is 'embedded').\n" + + " \n" + + " System Configuration\n" + + " \n" + + " \n" + + " Password to assign to root account. If blank, password can be set on the console.\n" + + " \n" + + " \n" + + " \n" + + " This property is not changeable.\n" + + " \n" + + " \n" + + " \n" + + " Set whether SSH-based remote login is enabled. This configuration can be changed after deployment.\n" + + " \n" + + " \n" + + " \n" + + " Set whether VMware tools based time synchronization should be used. This parameter is ignored if appliance.ntp.servers is not empty.\n" + + " \n" + + " \n" + + " \n" + + " A comma-seperated list of hostnames or IP addresses of NTP Servers\n" + + " \n" + + " \n" + + " \n" + + " Type of appliance to deploy (i.e. 'embedded', 'infrastructure' or 'management').\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " When deploying a vCenter Server Node, please provide the FQDN or IP address of a Platform Services Controller (leave blank otherwise). The choice of FQDN versus IP address is decided based on the Platform Services Controller's own notion of its network identity.\n" + + " \n" + + " \n" + + " \n" + + " When deploying a vCenter Server pointing to an external platform services controller, please provide the HTTPS port of the external platform services controller if a custom port number is being used. The default HTTPS port number is 443.\n" + + " \n" + + " Upgrade Configuration\n" + + " \n" + + " \n" + + " IP/hostname of the appliance to upgrade. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Port used by Migration Assistant on source vCenter Server.\n" + + " \n" + + " \n" + + " \n" + + " vCenter username for the appliance to upgrade. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " vCenter password for the appliance to upgrade. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Username for the appliance operating system to upgrade. Usually root. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Password for the appliance operating system to upgrade. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " URL that consists of the IP address or FQDN and https port of the vCenter Server instance or ESXi host that manages the appliance to upgrade. Https port is an optional parameter which by default is 443. Example: 10.10.10.10, //10.10.10.10:444, //[2001:db8:a0b:12f0::1]:444. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Username for the host that manages appliance to upgrade. Can be either vCenter or ESX host. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Password for the host that manages appliance to upgrade. Can be either vCenter or ESX host. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Thumbprint for the SSL certificate of the host that manages the appliance to upgrade. Set only for upgrade.\n" + + " \n" + + " \n" + + " \n" + + " Source host platform. Optional. Set only for upgrade\n" + + " \n" + + " \n" + + " \n" + + " Folder on the source appliance, where to store migrate data. Optional. Set only for upgrade\n" + + " \n" + + " \n" + + " \n" + + " Folder where exported source data will be stored in the appliance. Optional. Set only for upgrade\n" + + " \n" + + " \n" + + " \n" + + " Advanced upgrade settings specified in json format. Optional. Set only for upgrade\n" + + " \n" + + " \n" + + " \n" + + " Active Directory domain to join.\n" + + " \n" + + " \n" + + " \n" + + " Active Directory domain admin user. This username will be used to join the machine to the domain.\n" + + " \n" + + " \n" + + " \n" + + " Active Directory domain admin user password. This password will be used to join the machine to the domain.\n" + + " \n" + + " \n" + + " \n" + + " FQDN or IP address of the vCenter Server managing that target appliance. Used when upgrading a source appliance in VCHA cluster.\n" + + " \n" + + " \n" + + " \n" + + " Https port of the vCenter Server managing that target appliance. Used when upgrading a source appliance in VCHA cluster. If not specified, port 443 will be used by default.\n" + + " \n" + + " \n" + + " \n" + + " User able to authenticate in vCenter Server managing that target appliance. The user must have the privilege Global.VCServer. Used when upgrading a source appliance in VCHA cluster.\n" + + " \n" + + " \n" + + " \n" + + " Password for administrator user authenticating to the vCenter Server managing target appliance. Used when upgrading a source appliance in VCHA cluster.\n" + + " \n" + + " \n" + + " \n" + + " Thumbprint for the SSL certificate of the host that manages the appliance to upgrade. Used when upgrading a source appliance in VCHA cluster.\n" + + " \n" + + " \n" + + " \n" + + " Path to host/cluster/resource pool where target appliance will be deployed on management vCenter Server. Used when upgrading a source appliance in VCHA cluster. Example: /my_datacenter/my_folder/my_host_or_cluster/my_resource_pool\n" + + " \n" + + " Miscellaneous\n" + + " \n" + + " \n" + + " Set whether ESXi Dump Collector service is enabled. This configuration can be changed after deployment.\n" + + " \n" + + " \n" + + " \n" + + " If this parameter is set to True, no questions will be posted during install or upgrade. Otherwise, the install process will wait for a reply if there is a pending question.\n" + + " \n" + + " \n" + + " \n" + + " This parameter specifies the client locale. Supported locales are en, fr, ja, ko, zh_CN and zh_TW. English is assumed if locale is unknown.\n" + + " \n" + + " \n" + + " \n" + + " Specify feature switch states which need to be added or modified in feature switch state config file. Format: key1=value1, key2=value2\n" + + " \n" + + " \n" + + " \n" + + " VMware’s Customer Experience Improvement Program ("CEIP") provides VMware with information that enables VMware to improve its products and services, to fix problems, and to advise you on how best to deploy and use our products. As part of the CEIP, VMware collects technical information about your organization’s use of VMware products and services on a regular basis in association with your organization’s VMware license key(s). This information does not personally identify any individual. For more details about the Program and how VMware uses the information it collects through CEIP, please see the product documentation at http://www.vmware.com/info?id=1399. If you want to participate in VMware’s CEIP for this product, set this property to True. You may join or leave VMware’s CEIP for this product at any time.\n" + + " \n" + + " \n" + + " \n" + + " If this parameter is set to True, the appliance will be configured after deployment using the specified OVF configuration parameters. If set to False, the appliance should be configured post-deployment using the VMware Appliance Management Interface.\n" + + " \n" + + " \n" + + " \n" + + " If a valid MAC address prefix is provided, then all MAC addresses assigned by vCenter Server will begin with this prefix instead of the VMware OUI. This property cannot co-exist with mac-allocation-scheme.ranges\n" + + " \n" + + " \n" + + " \n" + + " This property is mandatory whenever a custom MAC prefix is provided.\n" + + " \n" + + " \n" + + " \n" + + " If valid MAC address range is provided, then vCenter Server will assign MAC addresses from this range instead of allocating VMware OUI based MAC address. The address range must be provided in the format "BeginAddress1-EndAddress1,...,BeginAddressN-EndAddressN". This property cannot co-exist with mac-allocation-scheme.prefix.\n" + + " \n" + + "\n" + + "\n" + + " VAMI Properties\n" + + " Networking Properties\n" + + " \n" + + " \n" + + " The domain name of this VM. Leave blank if DHCP is desired.\n" + + " \n" + + " \n" + + " \n" + + " The domain search path (comma or space separated domain names) for this VM. Leave blank if DHCP is desired.\n" + + " \n" + + "\n" + + "\n" + + " VM specific properties\n" + + " \n" + + "\n" + + ""; + private OVFHelper ovfHelper = new OVFHelper(); @Test public void testGetOVFPropertiesValidOVF() throws IOException, SAXException, ParserConfigurationException { - List props = ovfHelper.getOVFPropertiesXmlString(ovfFileProductSection); + List props = ovfHelper.getOVFPropertiesFromXmlString(ovfFileProductSection); Assert.assertEquals(2, props.size()); } @Test(expected = SAXParseException.class) public void testGetOVFPropertiesInvalidOVF() throws IOException, SAXException, ParserConfigurationException { - ovfHelper.getOVFPropertiesXmlString(ovfFileProductSection + "xxxxxxxxxxxxxxxxx"); + ovfHelper.getOVFPropertiesFromXmlString(ovfFileProductSection + "xxxxxxxxxxxxxxxxx"); + } + + @Test + public void testGetOVFDeploymentOptionsValidOVF() throws IOException, SAXException, ParserConfigurationException { + List options = ovfHelper.getOVFDeploymentOptionsFromXmlString(ovfFileDeploymentOptionsSection); + Assert.assertEquals(3, options.size()); + } + + @Test + public void testGetOVFVirtualHardwareSectionValidOVF() throws IOException, SAXException, ParserConfigurationException { + List items = ovfHelper.getOVFVirtualHardwareSectionFromXmlString(ovfFileVirtualHardwareSection); + Assert.assertEquals(20, items.size()); + } + + @Test + public void testGetOVFEulaSectionValidOVF() throws IOException, SAXException, ParserConfigurationException { + List eulas = ovfHelper.getOVFEulaSectionFromXmlString(eulaSections); + Assert.assertEquals(2, eulas.size()); + } + + @Test + public void testGetOVFPropertiesWithCategories() throws IOException, SAXException, ParserConfigurationException { + List props = ovfHelper.getOVFPropertiesFromXmlString(productSectionWithCategories); + Assert.assertEquals(18, props.size()); } } diff --git a/core/pom.xml b/core/pom.xml index ff63e50c4a0..d33d6866f7f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -51,9 +51,5 @@ commons-codec commons-codec - - org.apache.commons - commons-compress - diff --git a/core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java b/core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java index 9859c3f83d0..a7b9179e200 100644 --- a/core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java +++ b/core/src/main/java/com/cloud/agent/api/storage/DownloadAnswer.java @@ -25,8 +25,10 @@ import java.util.List; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.LogLevel; +import com.cloud.agent.api.to.DatadiskTO; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; public class DownloadAnswer extends Answer { private String jobId; @@ -38,8 +40,17 @@ public class DownloadAnswer extends Answer { private long templateSize = 0L; private long templatePhySicalSize = 0L; private String checkSum; + @LogLevel(LogLevel.Log4jLevel.Off) private List ovfProperties; + @LogLevel(LogLevel.Log4jLevel.Off) + private List networkRequirements; + @LogLevel(LogLevel.Log4jLevel.Off) + private List disks; + @LogLevel(LogLevel.Log4jLevel.Off) + private OVFVirtualHardwareSectionTO ovfHardwareSection; + @LogLevel(LogLevel.Log4jLevel.Off) + private List eulaSections; public String getCheckSum() { return checkSum; @@ -157,4 +168,36 @@ public class DownloadAnswer extends Answer { public void setOvfProperties(List ovfProperties) { this.ovfProperties = ovfProperties; } + + public List getNetworkRequirements() { + return networkRequirements; + } + + public void setNetworkRequirements(List networkRequirements) { + this.networkRequirements = networkRequirements; + } + + public List getDisks() { + return disks; + } + + public void setDisks(List disks) { + this.disks = disks; + } + + public OVFVirtualHardwareSectionTO getOvfHardwareSection() { + return ovfHardwareSection; + } + + public void setOvfHardwareSection(OVFVirtualHardwareSectionTO ovfHardwareSection) { + this.ovfHardwareSection = ovfHardwareSection; + } + + public List getEulaSections() { + return eulaSections; + } + + public void setEulaSections(List eulaSections) { + this.eulaSections = eulaSections; + } } diff --git a/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java b/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java index 0e22ea25e78..a6dfbfef99a 100644 --- a/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java +++ b/core/src/main/java/com/cloud/agent/api/storage/GetDatadisksCommand.java @@ -21,10 +21,12 @@ import com.cloud.agent.api.to.DataTO; public final class GetDatadisksCommand extends Command { private DataTO data; + private String configurationId; - public GetDatadisksCommand(DataTO data) { + public GetDatadisksCommand(DataTO data, String configurationId) { super(); this.data = data; + this.configurationId = configurationId; } protected GetDatadisksCommand() { @@ -40,4 +42,7 @@ public final class GetDatadisksCommand extends Command { return data; } + public String getConfigurationId() { + return configurationId; + } } \ No newline at end of file diff --git a/core/src/main/java/com/cloud/resource/ServerResource.java b/core/src/main/java/com/cloud/resource/ServerResource.java index 9030db72f00..16ac00ed176 100644 --- a/core/src/main/java/com/cloud/resource/ServerResource.java +++ b/core/src/main/java/com/cloud/resource/ServerResource.java @@ -31,6 +31,7 @@ import com.cloud.utils.component.Manager; * ServerResource is a generic container to execute commands sent */ public interface ServerResource extends Manager { + /** * @return Host.Type type of the computing server we have. */ diff --git a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java index 4b2438ea102..d86a1a619a9 100644 --- a/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java +++ b/core/src/main/java/com/cloud/storage/resource/StorageProcessor.java @@ -34,6 +34,9 @@ import org.apache.cloudstack.storage.command.SnapshotAndCopyCommand; import com.cloud.agent.api.Answer; public interface StorageProcessor { + + String REQUEST_TEMPLATE_RELOAD = "request template reload"; + public Answer copyTemplateToPrimaryStorage(CopyCommand cmd); public Answer cloneVolumeFromBaseTemplate(CopyCommand cmd); diff --git a/core/src/main/java/com/cloud/storage/template/OVAProcessor.java b/core/src/main/java/com/cloud/storage/template/OVAProcessor.java index d771c67acec..794ac48c904 100644 --- a/core/src/main/java/com/cloud/storage/template/OVAProcessor.java +++ b/core/src/main/java/com/cloud/storage/template/OVAProcessor.java @@ -20,13 +20,20 @@ package com.cloud.storage.template; import java.io.File; +import java.io.IOException; import java.util.List; import java.util.Map; import javax.naming.ConfigurationException; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import com.cloud.agent.api.storage.OVFConfigurationTO; +import com.cloud.agent.api.storage.OVFEulaSectionTO; import com.cloud.agent.api.storage.OVFPropertyTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareItemTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareSectionTO; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.w3c.dom.Document; @@ -41,9 +48,13 @@ import com.cloud.storage.StorageLayer; import com.cloud.utils.Pair; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.script.Script; +import org.xml.sax.SAXException; +/** + * processes the content of an OVA for registration of a template + */ public class OVAProcessor extends AdapterBase implements Processor { - private static final Logger s_logger = Logger.getLogger(OVAProcessor.class); + private static final Logger LOGGER = Logger.getLogger(OVAProcessor.class); StorageLayer _storage; @Override @@ -53,73 +64,137 @@ public class OVAProcessor extends AdapterBase implements Processor { @Override public FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException { - if (format != null) { - if (s_logger.isInfoEnabled()) { - s_logger.info("We currently don't handle conversion from " + format + " to OVA."); - } + if (! conversionChecks(format)){ return null; } - s_logger.info("Template processing. templatePath: " + templatePath + ", templateName: " + templateName); + LOGGER.info("Template processing. templatePath: " + templatePath + ", templateName: " + templateName); String templateFilePath = templatePath + File.separator + templateName + "." + ImageFormat.OVA.getFileExtension(); if (!_storage.exists(templateFilePath)) { - if (s_logger.isInfoEnabled()) { - s_logger.info("Unable to find the vmware template file: " + templateFilePath); + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Unable to find the vmware template file: " + templateFilePath); } return null; } - s_logger.info("Template processing - untar OVA package. templatePath: " + templatePath + ", templateName: " + templateName); + String templateFileFullPath = unpackOva(templatePath, templateName, processTimeout); + + setFileSystemAccessRights(templatePath); + + FormatInfo info = createFormatInfo(templatePath, templateName, templateFilePath, templateFileFullPath); + + return info; + } + + private FormatInfo createFormatInfo(String templatePath, String templateName, String templateFilePath, String templateFileFullPath) throws InternalErrorException { + FormatInfo info = new FormatInfo(); + info.format = ImageFormat.OVA; + info.filename = templateName + "." + ImageFormat.OVA.getFileExtension(); + info.size = _storage.getSize(templateFilePath); + info.virtualSize = getTemplateVirtualSize(templatePath, info.filename); + validateOva(templateFileFullPath, info); + + return info; + } + + /** + * side effect; properties are added to the info + * + * @throws InternalErrorException on an invalid ova contents + */ + private void validateOva(String templateFileFullPath, FormatInfo info) throws InternalErrorException { + String ovfFilePath = getOVFFilePath(templateFileFullPath); + OVFHelper ovfHelper = new OVFHelper(); + Document doc = ovfHelper.getDocumentFromFile(ovfFilePath); + + List disks = ovfHelper.getOVFVolumeInfoFromFile(ovfFilePath, doc, null); + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("Found %d disks in template %s", CollectionUtils.isNotEmpty(disks) ? disks.size() : 0, ovfFilePath)); + } + if (CollectionUtils.isNotEmpty(disks)) { + info.disks = disks; + } + + List nets = ovfHelper.getNetPrerequisitesFromDocument(doc); + if (CollectionUtils.isNotEmpty(nets)) { + LOGGER.info("Found " + nets.size() + " prerequisite networks"); + info.networks = nets; + } else if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("no net prerequisites found in template %s", ovfFilePath)); + } + + List ovfProperties = ovfHelper.getConfigurableOVFPropertiesFromDocument(doc); + if (CollectionUtils.isNotEmpty(ovfProperties)) { + LOGGER.info("Found " + ovfProperties.size() + " configurable OVF properties"); + info.ovfProperties = ovfProperties; + } else if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("no ovf properties found in template %s", ovfFilePath)); + } + + OVFVirtualHardwareSectionTO hardwareSection = ovfHelper.getVirtualHardwareSectionFromDocument(doc); + List configurations = hardwareSection.getConfigurations(); + if (CollectionUtils.isNotEmpty(configurations)) { + LOGGER.info("Found " + configurations.size() + " deployment option configurations"); + } + List hardwareItems = hardwareSection.getCommonHardwareItems(); + if (CollectionUtils.isNotEmpty(hardwareItems)) { + LOGGER.info("Found " + hardwareItems.size() + " virtual hardware items"); + } + info.hardwareSection = hardwareSection; + List eulaSections = ovfHelper.getEulaSectionsFromDocument(doc); + if (CollectionUtils.isNotEmpty(eulaSections)) { + LOGGER.info("Found " + eulaSections.size() + " license agreements"); + info.eulaSections = eulaSections; + } + } + + private void setFileSystemAccessRights(String templatePath) { + Script command; + String result; + + command = new Script("chmod", 0, LOGGER); + command.add("-R"); + command.add("666", templatePath); + result = command.execute(); + if (result != null) { + LOGGER.warn("Unable to set permissions for files in " + templatePath + " due to " + result); + } + command = new Script("chmod", 0, LOGGER); + command.add("777", templatePath); + result = command.execute(); + if (result != null) { + LOGGER.warn("Unable to set permissions for " + templatePath + " due to " + result); + } + } + + private String unpackOva(String templatePath, String templateName, long processTimeout) throws InternalErrorException { + LOGGER.info("Template processing - untar OVA package. templatePath: " + templatePath + ", templateName: " + templateName); String templateFileFullPath = templatePath + File.separator + templateName + "." + ImageFormat.OVA.getFileExtension(); File templateFile = new File(templateFileFullPath); - Script command = new Script("tar", processTimeout, s_logger); + Script command = new Script("tar", processTimeout, LOGGER); command.add("--no-same-owner"); command.add("--no-same-permissions"); command.add("-xf", templateFileFullPath); command.setWorkDir(templateFile.getParent()); String result = command.execute(); if (result != null) { - s_logger.info("failed to untar OVA package due to " + result + ". templatePath: " + templatePath + ", templateName: " + templateName); + LOGGER.info("failed to untar OVA package due to " + result + ". templatePath: " + templatePath + ", templateName: " + templateName); throw new InternalErrorException("failed to untar OVA package"); } + return templateFileFullPath; + } - command = new Script("chmod", 0, s_logger); - command.add("-R"); - command.add("666", templatePath); - result = command.execute(); - if (result != null) { - s_logger.warn("Unable to set permissions for files in " + templatePath + " due to " + result); - } - command = new Script("chmod", 0, s_logger); - command.add("777", templatePath); - result = command.execute(); - if (result != null) { - s_logger.warn("Unable to set permissions for " + templatePath + " due to " + result); - } - - FormatInfo info = new FormatInfo(); - info.format = ImageFormat.OVA; - info.filename = templateName + "." + ImageFormat.OVA.getFileExtension(); - info.size = _storage.getSize(templateFilePath); - info.virtualSize = getTemplateVirtualSize(templatePath, info.filename); - - //vaidate ova - String ovfFile = getOVFFilePath(templateFileFullPath); - try { - OVFHelper ovfHelper = new OVFHelper(); - List disks = ovfHelper.getOVFVolumeInfo(ovfFile); - List ovfProperties = ovfHelper.getOVFPropertiesFromFile(ovfFile); - if (CollectionUtils.isNotEmpty(ovfProperties)) { - s_logger.info("Found " + ovfProperties.size() + " configurable OVF properties"); - info.ovfProperties = ovfProperties; + private boolean conversionChecks(ImageFormat format) { + if (format != null) { + if (LOGGER.isInfoEnabled()) { + LOGGER.info("We currently don't handle conversion from " + format + " to OVA."); } - } catch (Exception e) { - s_logger.info("The ovf file " + ovfFile + " is invalid ", e); - throw new InternalErrorException("OVA package has bad ovf file " + e.getMessage(), e); + return false; } - // delete original OVA file - // templateFile.delete(); - return info; + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("We are handling format " + format + "."); + } + return true; } @Override @@ -128,34 +203,43 @@ public class OVAProcessor extends AdapterBase implements Processor { long size = getTemplateVirtualSize(file.getParent(), file.getName()); return size; } catch (Exception e) { - s_logger.info("[ignored]" + LOGGER.info("[ignored]" + "failed to get virtual template size for ova: " + e.getLocalizedMessage()); } return file.length(); } + /** + * gets the virtual size from the OVF file meta data. + * + * @return the accumulative virtual size of the disk definitions in the OVF + * @throws InternalErrorException + */ public long getTemplateVirtualSize(String templatePath, String templateName) throws InternalErrorException { - // get the virtual size from the OVF file meta data long virtualSize = 0; String templateFileFullPath = templatePath.endsWith(File.separator) ? templatePath : templatePath + File.separator; templateFileFullPath += templateName.endsWith(ImageFormat.OVA.getFileExtension()) ? templateName : templateName + "." + ImageFormat.OVA.getFileExtension(); String ovfFileName = getOVFFilePath(templateFileFullPath); if (ovfFileName == null) { String msg = "Unable to locate OVF file in template package directory: " + templatePath; - s_logger.error(msg); + LOGGER.error(msg); throw new InternalErrorException(msg); } try { Document ovfDoc = null; ovfDoc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(ovfFileName)); - Element disk = (Element)ovfDoc.getElementsByTagName("Disk").item(0); - virtualSize = Long.parseLong(disk.getAttribute("ovf:capacity")); - String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits"); - virtualSize = OVFHelper.getDiskVirtualSize(virtualSize, allocationUnits, ovfFileName); + NodeList diskElements = ovfDoc.getElementsByTagName("Disk"); + for (int i = 0; i < diskElements.getLength(); i++) { + Element disk = (Element)diskElements.item(i); + long diskSize = Long.parseLong(disk.getAttribute("ovf:capacity")); + String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits"); + diskSize = OVFHelper.getDiskVirtualSize(diskSize, allocationUnits, ovfFileName); + virtualSize += diskSize; + } return virtualSize; - } catch (Exception e) { + } catch (InternalErrorException | IOException | NumberFormatException | ParserConfigurationException | SAXException e) { String msg = "getTemplateVirtualSize: Unable to parse OVF XML document " + templatePath + " to get the virtual disk " + templateName + " size due to " + e; - s_logger.error(msg); + LOGGER.error(msg); throw new InternalErrorException(msg); } } @@ -187,9 +271,9 @@ public class OVAProcessor extends AdapterBase implements Processor { } } return new Pair(virtualSize, fileSize); - } catch (Exception e) { + } catch (InternalErrorException | IOException | NumberFormatException | ParserConfigurationException | SAXException e) { String msg = "getDiskDetails: Unable to parse OVF XML document " + ovfFilePath + " to get the virtual disk " + diskName + " size due to " + e; - s_logger.error(msg); + LOGGER.error(msg); throw new InternalErrorException(msg); } } @@ -218,4 +302,4 @@ public class OVAProcessor extends AdapterBase implements Processor { return true; } -} +} \ No newline at end of file diff --git a/core/src/main/java/com/cloud/storage/template/Processor.java b/core/src/main/java/com/cloud/storage/template/Processor.java index 4bb714a7ab9..53fa6b76d04 100644 --- a/core/src/main/java/com/cloud/storage/template/Processor.java +++ b/core/src/main/java/com/cloud/storage/template/Processor.java @@ -23,10 +23,14 @@ import java.io.File; import java.io.IOException; import java.util.List; +import com.cloud.agent.api.storage.OVFEulaSectionTO; import com.cloud.agent.api.storage.OVFPropertyTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareSectionTO; +import com.cloud.agent.api.to.DatadiskTO; import com.cloud.exception.InternalErrorException; import com.cloud.storage.Storage.ImageFormat; import com.cloud.utils.component.Adapter; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; /** * Generic interface to process different types of image formats @@ -48,13 +52,17 @@ public interface Processor extends Adapter { FormatInfo process(String templatePath, ImageFormat format, String templateName, long processTimeout) throws InternalErrorException; - public static class FormatInfo { + class FormatInfo { public ImageFormat format; public long size; public long virtualSize; public String filename; public boolean isCorrupted; public List ovfProperties; + public List networks; + public List disks; + public OVFVirtualHardwareSectionTO hardwareSection; + public List eulaSections; } long getVirtualSize(File file) throws IOException; diff --git a/core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java b/core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java index cc2eaadea07..b184a74312b 100644 --- a/core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java +++ b/core/src/main/java/org/apache/cloudstack/storage/to/TemplateObjectTO.java @@ -47,6 +47,8 @@ public class TemplateObjectTO implements DataTO { private boolean bootable; private String uniqueName; private boolean directDownload; + private boolean deployAsIs; + private String deployAsIsConfiguration; public TemplateObjectTO() { @@ -82,6 +84,8 @@ public class TemplateObjectTO implements DataTO { this.imageDataStore = template.getDataStore().getTO(); } this.hypervisorType = template.getHypervisorType(); + this.deployAsIs = template.isDeployAsIs(); + this.deployAsIsConfiguration = template.getDeployAsIsConfiguration(); } @Override @@ -244,6 +248,18 @@ public class TemplateObjectTO implements DataTO { this.directDownload = directDownload; } + public boolean isDeployAsIs() { + return deployAsIs; + } + + public String getDeployAsIsConfiguration() { + return deployAsIsConfiguration; + } + + public void setDeployAsIsConfiguration(String deployAsIsConfiguration) { + this.deployAsIsConfiguration = deployAsIsConfiguration; + } + @Override public String toString() { return new StringBuilder("TemplateTO[id=").append(id).append("|origUrl=").append(origUrl).append("|name").append(name).append("]").toString(); diff --git a/core/src/test/java/com/cloud/agent/api/storage/DownloadAnswerTest.java b/core/src/test/java/com/cloud/agent/api/storage/DownloadAnswerTest.java new file mode 100644 index 00000000000..62bb3d65c83 --- /dev/null +++ b/core/src/test/java/com/cloud/agent/api/storage/DownloadAnswerTest.java @@ -0,0 +1,58 @@ +// 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.agent.api.storage; + +import com.cloud.agent.api.Answer; +import com.cloud.serializer.GsonHelper; +import com.cloud.storage.VMTemplateStorageResourceAssoc; +import com.google.gson.Gson; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + +public class DownloadAnswerTest { + Gson gson = GsonHelper.getGson(); + + VMTemplateStorageResourceAssoc.Status status = VMTemplateStorageResourceAssoc.Status.DOWNLOADED; + DownloadAnswer answer = new DownloadAnswer("nothin wrong", status); + + @Test + public void redeserialise () + { + String json = gson.toJson(answer); + DownloadAnswer received = gson.fromJson(json, DownloadAnswer.class); + Assert.assertEquals(received,answer); + } + @Test + public void properties () + { + List properties = new ArrayList<>(); + properties.add(new OVFPropertyTO()); + List networks = new ArrayList<>(); + networks.add(new NetworkPrerequisiteTO()); + + answer.setOvfProperties(properties); + answer.setNetworkRequirements(networks); + + String json = gson.toJson(answer); + Answer received = gson.fromJson(json, Answer.class); + Assert.assertEquals(received,answer); + } +} \ No newline at end of file diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java index db13c1f48a8..9baea60f29f 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java @@ -18,6 +18,7 @@ */ package org.apache.cloudstack.engine.orchestration.service; +import java.util.List; import java.util.Map; import java.util.Set; @@ -119,8 +120,11 @@ public interface VolumeOrchestrationService { boolean canVmRestartOnAnotherServer(long vmId); - DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm, - Account owner); + /** + * Allocate a volume or multiple volumes in case of template is registered with the 'deploy-as-is' option, allowing multiple disks + */ + List allocateTemplatedVolumes(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm, + Account owner); String getVmNameFromVolumeId(long volumeId); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java index 5a18b3cab9e..82c3dd14cf3 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/service/api/OrchestrationService.java @@ -55,7 +55,7 @@ public interface OrchestrationService { * @param memory memory to allocate in bytes * @param computeTags tags for the compute * @param rootDiskTags tags for the root disk - * @param networks networks that this VM should join + * @param networkNicMap map networks to nic profiles that this VM should join * @param rootDiskSize size the root disk in case of templates. * @return VirtualMachineEntity */ @@ -65,7 +65,7 @@ public interface OrchestrationService { @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, @QueryParam("compute-tags") List computeTags, @QueryParam("root-disk-tags") List rootDiskTags, - @QueryParam("network-nic-map") Map networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan, + @QueryParam("network-nic-map") Map> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan, @QueryParam("root-disk-size") Long rootDiskSize, @QueryParam("extra-dhcp-option-map") Map> extraDhcpOptionMap, @QueryParam("datadisktemplate-diskoffering-map") Map datadiskTemplateToDiskOfferingMap) throws InsufficientCapacityException; @@ -74,7 +74,7 @@ public interface OrchestrationService { @QueryParam("host-name") String hostName, @QueryParam("display-name") String displayName, @QueryParam("hypervisor") String hypervisor, @QueryParam("os") String os, @QueryParam("cpu") int cpu, @QueryParam("speed") int speed, @QueryParam("ram") long memory, @QueryParam("disk-size") Long diskSize, @QueryParam("compute-tags") List computeTags, @QueryParam("root-disk-tags") List rootDiskTags, - @QueryParam("network-nic-map") Map networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan, @QueryParam("extra-dhcp-option-map") Map> extraDhcpOptionMap) throws InsufficientCapacityException; + @QueryParam("network-nic-map") Map> networkNicMap, @QueryParam("deploymentplan") DeploymentPlan plan, @QueryParam("extra-dhcp-option-map") Map> extraDhcpOptionMap) throws InsufficientCapacityException; @POST NetworkEntity createNetwork(String id, String name, String domainName, String cidr, String gateway); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java index a399758217b..5546571ba6b 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStore.java @@ -23,7 +23,9 @@ import java.util.List; import org.apache.cloudstack.engine.subsystem.api.storage.disktype.DiskFormat; public interface PrimaryDataStore extends DataStore, PrimaryDataStoreInfo { - DataObject create(DataObject dataObject, boolean createEntryInTempSpoolRef); + DataObject create(DataObject dataObject, String configuration); + + DataObject create(DataObject dataObject, boolean createEntryInTempSpoolRef, String configuration); VolumeInfo getVolume(long id); @@ -31,7 +33,7 @@ public interface PrimaryDataStore extends DataStore, PrimaryDataStoreInfo { boolean exists(DataObject data); - TemplateInfo getTemplate(long templateId); + TemplateInfo getTemplate(long templateId, String configuration); SnapshotInfo getSnapshot(long snapshotId); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java index b213625efad..4d258f3b6d0 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java @@ -27,7 +27,7 @@ public interface TemplateDataFactory { TemplateInfo getReadyTemplateOnImageStore(long templateId, Long zoneId); - TemplateInfo getTemplate(DataObject obj, DataStore store); + TemplateInfo getTemplate(DataObject obj, DataStore store, String configuration); TemplateInfo getTemplate(long templateId, DataStoreRole storeRole); @@ -40,4 +40,6 @@ public interface TemplateDataFactory { TemplateInfo getReadyBypassedTemplateOnPrimaryStore(long templateId, Long poolId, Long hostId); boolean isTemplateMarkedForDirectDownload(long templateId); + + TemplateInfo getTemplateOnPrimaryStorage(long templateId, DataStore store, String configuration); } diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java index 0f7cc6f9de5..1e4a1b7373a 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateInfo.java @@ -27,4 +27,8 @@ public interface TemplateInfo extends DataObject, VirtualMachineTemplate { String getInstallPath(); boolean isDirectDownload(); + + boolean isDeployAsIs(); + + String getDeployAsIsConfiguration(); } diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java index f70a7813ae0..df13f951a44 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java @@ -18,6 +18,7 @@ */ package org.apache.cloudstack.engine.subsystem.api.storage; +import com.cloud.agent.api.to.DatadiskTO; import org.apache.cloudstack.framework.async.AsyncCallFuture; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.command.CommandResult; @@ -25,6 +26,8 @@ import org.apache.cloudstack.storage.command.CommandResult; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.StoragePool; +import java.util.List; + public interface TemplateService { class TemplateApiResult extends CommandResult { @@ -47,7 +50,7 @@ public interface TemplateService { AsyncCallFuture createTemplateFromVolumeAsync(VolumeInfo volume, TemplateInfo template, DataStore store); - boolean createOvaDataDiskTemplates(TemplateInfo parentTemplate); + boolean createOvaDataDiskTemplates(TemplateInfo parentTemplate, boolean deployAsIs); AsyncCallFuture deleteTemplateAsync(TemplateInfo template); @@ -72,4 +75,6 @@ public interface TemplateService { void associateCrosszoneTemplatesToZone(long dcId); AsyncCallFuture createDatadiskTemplateAsync(TemplateInfo parentTemplate, TemplateInfo dataDiskTemplate, String path, String diskId, long fileSize, boolean bootable); + + List getTemplateDatadisksOnImageStore(TemplateInfo templateInfo, String configurationId); } diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java index f4a73810901..06bda51a092 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeInfo.java @@ -83,4 +83,8 @@ public interface VolumeInfo extends DataObject, Volume { boolean isDirectDownload(); void setDirectDownload(boolean directDownload); + + boolean isDeployAsIs(); + + String getDeployAsIsConfiguration(); } diff --git a/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java b/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java index 5a0be952b39..88d908d7874 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java +++ b/engine/api/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreEntity.java @@ -51,7 +51,7 @@ public interface ImageStoreEntity extends DataStore, ImageStore { void deleteExtractUrl(String installPath, String url, Upload.Type volume); - List getDataDiskTemplates(DataObject obj); + List getDataDiskTemplates(DataObject obj, String configurationId); Void createDataDiskTemplateAsync(TemplateInfo dataDiskTemplate, String path, String diskId, long fileSize, boolean bootable, AsyncCompletionCallback callback); } diff --git a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java index 2dc6296fc51..35fed56ac8e 100644 --- a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java +++ b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java @@ -18,7 +18,9 @@ package com.cloud.template; import java.util.List; +import com.cloud.agent.api.to.DatadiskTO; import com.cloud.deploy.DeployDestination; +import com.cloud.storage.DataStoreRole; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.framework.config.ConfigKey; @@ -133,4 +135,5 @@ public interface TemplateManager { public static final String MESSAGE_REGISTER_PUBLIC_TEMPLATE_EVENT = "Message.RegisterPublicTemplate.Event"; public static final String MESSAGE_RESET_TEMPLATE_PERMISSION_EVENT = "Message.ResetTemplatePermission.Event"; + List getTemplateDisksOnImageStore(Long templateId, DataStoreRole role, String configurationId); } diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index ffd5878bbf6..fb4fadd9500 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -414,6 +414,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac final LinkedHashMap> auxiliaryNetworks, final DeploymentPlan plan, final HypervisorType hyperType, final Map> extraDhcpOptions, final Map datadiskTemplateToDiskOfferingMap) throws InsufficientCapacityException { + s_logger.info(String.format("allocating virtual machine from template:%s with hostname:%s and %d networks", template.getUuid(), vmInstanceName, auxiliaryNetworks.size())); + final VMInstanceVO vm = _vmDao.findVMByInstanceName(vmInstanceName); final Account owner = _entityMgr.findById(Account.class, vm.getAccountId()); @@ -455,7 +457,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } else if (template.getFormat() == ImageFormat.BAREMETAL) { // Do nothing } else { - volumeMgr.allocateTemplatedVolume(Type.ROOT, "ROOT-" + vmFinal.getId(), rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(), + volumeMgr.allocateTemplatedVolumes(Type.ROOT, "ROOT-" + vmFinal.getId(), rootDiskOfferingInfo.getDiskOffering(), rootDiskOfferingInfo.getSize(), rootDiskOfferingInfo.getMinIops(), rootDiskOfferingInfo.getMaxIops(), template, vmFinal, owner); } @@ -1104,7 +1106,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (dest != null) { avoids.addHost(dest.getHost().getId()); - journal.record("Deployment found ", vmProfile, dest); + if (!template.isDeployAsIs()) { + journal.record("Deployment found ", vmProfile, dest); + } } long destHostId = dest.getHost().getId(); @@ -1468,6 +1472,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (disk.getType() != Volume.Type.ISO) { final VolumeObjectTO vol = (VolumeObjectTO)disk.getData(); final VolumeVO volume = _volsDao.findById(vol.getId()); + if (vmSpec.getDeployAsIsInfo() != null && vmSpec.getDeployAsIsInfo().isDeployAsIs() + && StringUtils.isNotBlank(vol.getPath())) { + volume.setPath(vol.getPath()); + _volsDao.update(volume.getId(), volume); + } // Use getPath() from VolumeVO to get a fresh copy of what's in the DB. // Before doing this, in a certain situation, getPath() from VolumeObjectTO diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java index 91e9b6f57bd..c6f8e418642 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java @@ -20,7 +20,6 @@ package org.apache.cloudstack.engine.orchestration; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -156,7 +155,7 @@ public class CloudOrchestrator implements OrchestrationService { @Override public VirtualMachineEntity createVirtualMachine(String id, String owner, String templateId, String hostName, String displayName, String hypervisor, int cpu, - int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan, + int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map> networkNicMap, DeploymentPlan plan, Long rootDiskSize, Map> extraDhcpOptionMap, Map dataDiskTemplateToDiskOfferingMap) throws InsufficientCapacityException { // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, @@ -166,7 +165,7 @@ public class CloudOrchestrator implements OrchestrationService { for (String uuid : networkNicMap.keySet()) { NetworkVO network = _networkDao.findByUuid(uuid); if(network != null){ - networkIpMap.put(network, new ArrayList(Arrays.asList(networkNicMap.get(uuid)))); + networkIpMap.put(network, networkNicMap.get(uuid)); } } @@ -255,7 +254,7 @@ public class CloudOrchestrator implements OrchestrationService { @Override public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os, - int cpu, int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan, Map> extraDhcpOptionMap) + int cpu, int speed, long memory, Long diskSize, List computeTags, List rootDiskTags, Map> networkNicMap, DeploymentPlan plan, Map> extraDhcpOptionMap) throws InsufficientCapacityException { // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager); @@ -307,7 +306,7 @@ public class CloudOrchestrator implements OrchestrationService { for (String uuid : networkNicMap.keySet()) { NetworkVO network = _networkDao.findByUuid(uuid); if(network != null){ - networkIpMap.put(network, new ArrayList(Arrays.asList(networkNicMap.get(uuid)))); + networkIpMap.put(network, networkNicMap.get(uuid)); } } diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index e12dca04e31..5b635bd2255 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.engine.orchestration; +import static org.apache.commons.lang.StringUtils.isNotBlank; + import java.net.URI; import java.util.ArrayList; import java.util.Arrays; @@ -38,12 +40,9 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.event.EventTypes; -import com.cloud.event.UsageEventUtils; -import com.cloud.network.dao.NetworkDetailVO; -import com.cloud.network.dao.NetworkDetailsDao; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO; import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMNetworkMapDao; @@ -88,6 +87,8 @@ import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.domain.Domain; +import com.cloud.event.EventTypes; +import com.cloud.event.UsageEventUtils; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ConnectionException; import com.cloud.exception.InsufficientAddressCapacityException; @@ -129,6 +130,8 @@ import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkAccountDao; import com.cloud.network.dao.NetworkAccountVO; import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkDetailVO; +import com.cloud.network.dao.NetworkDetailsDao; import com.cloud.network.dao.NetworkDomainDao; import com.cloud.network.dao.NetworkDomainVO; import com.cloud.network.dao.NetworkServiceMapDao; @@ -178,6 +181,7 @@ import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offerings.dao.NetworkOfferingDetailsDao; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; +import com.cloud.storage.dao.VMTemplateDetailsDao; import com.cloud.user.Account; import com.cloud.user.ResourceLimitService; import com.cloud.user.User; @@ -231,8 +235,6 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; import com.google.common.base.Strings; -import static org.apache.commons.lang.StringUtils.isNotBlank; - /** * NetworkManagerImpl implements NetworkManager. */ @@ -301,6 +303,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra VpcVirtualNetworkApplianceService _routerService; @Inject UserVmManager _userVmMgr; + @Inject + VMTemplateDetailsDao templateDetailsDao; List networkGurus; @@ -645,8 +649,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override @DB public List setupNetwork(final Account owner, final NetworkOffering offering, final Network predefined, final DeploymentPlan plan, final String name, - final String displayText, final boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess, final Long vpcId, - final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException { + final String displayText, final boolean errorIfAlreadySetup, final Long domainId, final ACLType aclType, final Boolean subdomainAccess, final Long vpcId, + final Boolean isDisplayNetworkEnabled) throws ConcurrentOperationException { final Account locked = _accountDao.acquireInLockTable(owner.getId()); if (locked == null) { @@ -656,8 +660,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (predefined == null || offering.getTrafficType() != TrafficType.Guest && predefined.getCidr() == null && predefined.getBroadcastUri() == null && !(predefined - .getBroadcastDomainType() == BroadcastDomainType.Vlan || predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined - .getBroadcastDomainType() == BroadcastDomainType.Vxlan)) { + .getBroadcastDomainType() == BroadcastDomainType.Vlan || predefined.getBroadcastDomainType() == BroadcastDomainType.Lswitch || predefined + .getBroadcastDomainType() == BroadcastDomainType.Vxlan)) { final List configs = _networksDao.listBy(owner.getId(), offering.getId(), plan.getDataCenterId()); if (configs.size() > 0) { if (s_logger.isDebugEnabled()) { @@ -747,12 +751,129 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override @DB public void allocate(final VirtualMachineProfile vm, final LinkedHashMap> networks, final Map> extraDhcpOptions) throws InsufficientCapacityException, - ConcurrentOperationException { + ConcurrentOperationException { Transaction.execute(new TransactionCallbackWithExceptionNoReturn() { @Override public void doInTransactionWithoutResult(final TransactionStatus status) throws InsufficientCapacityException { + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("allocating networks for %s(template %s); %d networks",vm.getInstanceName(), vm.getTemplate().getUuid(), networks.size())); + } int deviceId = 0; + int size; + size = determineNumberOfNicsRequired(); + + final boolean[] deviceIds = new boolean[size]; + Arrays.fill(deviceIds, false); + + List> profilesList = getOrderedNetworkNicProfileMapping(networks); + final List nics = new ArrayList(size); + NicProfile defaultNic = null; + Network nextNetwork = null; + for (Pair networkNicPair : profilesList) { + nextNetwork = networkNicPair.first(); + Pair newDeviceInfo = addRequestedNicToNicListWithDeviceNumberAndRetrieveDefaultDevice(networkNicPair.second(), deviceIds, deviceId, nextNetwork, nics, defaultNic); + defaultNic = newDeviceInfo.first(); + deviceId = newDeviceInfo.second(); + } + createExtraNics(size, nics, nextNetwork); + + if (nics.size() == 1) { + nics.get(0).setDefaultNic(true); + } + } + + /** + * private transaction method to check and add devices to the nic list and update the info + */ + Pair addRequestedNicToNicListWithDeviceNumberAndRetrieveDefaultDevice(NicProfile requested, boolean[] deviceIds, int deviceId, Network nextNetwork, List nics, NicProfile defaultNic) + throws InsufficientAddressCapacityException, InsufficientVirtualNetworkCapacityException { + Pair rc = new Pair<>(null,null); + Boolean isDefaultNic = false; + if (vm != null && requested != null && requested.isDefaultNic()) { + isDefaultNic = true; + } + + while (deviceIds[deviceId] && deviceId < deviceIds.length) { + deviceId++; + } + + final Pair vmNicPair = allocateNic(requested, nextNetwork, isDefaultNic, deviceId, vm); + NicProfile vmNic = null; + if (vmNicPair != null) { + vmNic = vmNicPair.first(); + if (vmNic == null) { + return rc; + } + deviceId = vmNicPair.second(); + } + + final int devId = vmNic.getDeviceId(); + if (devId >= deviceIds.length) { + throw new IllegalArgumentException("Device id for nic is too large: " + vmNic); + } + if (deviceIds[devId]) { + throw new IllegalArgumentException("Conflicting device id for two different nics: " + vmNic); + } + + deviceIds[devId] = true; + + if (vmNic.isDefaultNic()) { + if (defaultNic != null) { + throw new IllegalArgumentException("You cannot specify two nics as default nics: nic 1 = " + defaultNic + "; nic 2 = " + vmNic); + } + defaultNic = vmNic; + } + + nics.add(vmNic); + vm.addNic(vmNic); + saveExtraDhcpOptions(nextNetwork.getUuid(), vmNic.getId(), extraDhcpOptions); + rc.first(defaultNic); + rc.second(deviceId); + return rc; + } + + /** + * private transaction method to get oredered list of Network and NicProfile pair + * @return ordered list of Network and NicProfile pair + * @param networks the map od networks to nic profiles list + */ + private List> getOrderedNetworkNicProfileMapping(final LinkedHashMap> networks) { + List> profilesList = new ArrayList<>(); + for (final Map.Entry> network : networks.entrySet()) { + List requestedProfiles = network.getValue(); + if (requestedProfiles == null) { + requestedProfiles = new ArrayList(); + } + if (requestedProfiles.isEmpty()) { + requestedProfiles.add(null); + } + for (final NicProfile requested : requestedProfiles) { + profilesList.add(new Pair(network.getKey(), requested)); + } + } + profilesList.sort(new Comparator>() { + @Override + public int compare(Pair pair1, Pair pair2) { + int profile1Order = Integer.MAX_VALUE; + int profile2Order = Integer.MAX_VALUE; + if (pair1 != null && pair1.second() != null && pair1.second().getOrderIndex() != null) { + profile1Order = pair1.second().getOrderIndex(); + } + if (pair2 != null && pair2.second() != null && pair2.second().getOrderIndex() != null) { + profile2Order = pair2.second().getOrderIndex(); + } + return profile1Order - profile2Order; + } + }); + return profilesList; + } + + /** + * private transaction method to run over the objects and determine nic requirements + * @return the total numer of nics required + */ + private int determineNumberOfNicsRequired() { int size = 0; for (final Network ntwk : networks.keySet()) { final List profiles = networks.get(ntwk); @@ -763,71 +884,35 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } } - final boolean[] deviceIds = new boolean[size]; - Arrays.fill(deviceIds, false); - - final List nics = new ArrayList(size); - NicProfile defaultNic = null; - - for (final Map.Entry> network : networks.entrySet()) { - final Network config = network.getKey(); - List requestedProfiles = network.getValue(); - if (requestedProfiles == null) { - requestedProfiles = new ArrayList(); - } - if (requestedProfiles.isEmpty()) { - requestedProfiles.add(null); - } - - for (final NicProfile requested : requestedProfiles) { - Boolean isDefaultNic = false; - if (vm != null && requested != null && requested.isDefaultNic()) { - isDefaultNic = true; - } - - while (deviceIds[deviceId] && deviceId < deviceIds.length) { - deviceId++; - } - - final Pair vmNicPair = allocateNic(requested, config, isDefaultNic, deviceId, vm); - NicProfile vmNic = null; - if (vmNicPair != null) { - vmNic = vmNicPair.first(); - if (vmNic == null) { - continue; - } - deviceId = vmNicPair.second(); - } - - final int devId = vmNic.getDeviceId(); - if (devId >= deviceIds.length) { - throw new IllegalArgumentException("Device id for nic is too large: " + vmNic); - } - if (deviceIds[devId]) { - throw new IllegalArgumentException("Conflicting device id for two different nics: " + vmNic); - } - - deviceIds[devId] = true; - - if (vmNic.isDefaultNic()) { - if (defaultNic != null) { - throw new IllegalArgumentException("You cannot specify two nics as default nics: nic 1 = " + defaultNic + "; nic 2 = " + vmNic); - } - defaultNic = vmNic; - } - - nics.add(vmNic); - vm.addNic(vmNic); - saveExtraDhcpOptions(config.getUuid(), vmNic.getId(), extraDhcpOptions); - } + List netprereqs = templateDetailsDao.listNetworkRequirementsByTemplateId(vm.getTemplate().getId()); + if (size < netprereqs.size()) { + size = netprereqs.size(); } + return size; + } + + /** + * private transaction method to add nics as required + * @param size the number needed + * @param nics the list of nics present + * @param finalNetwork the network to add the nics to + * @throws InsufficientVirtualNetworkCapacityException great + * @throws InsufficientAddressCapacityException also magnificent, as the name sugests + */ + private void createExtraNics(int size, List nics, Network finalNetwork) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException { if (nics.size() != size) { s_logger.warn("Number of nics " + nics.size() + " doesn't match number of requested nics " + size); - throw new CloudRuntimeException("Number of nics " + nics.size() + " doesn't match number of requested networks " + size); - } - - if (nics.size() == 1) { - nics.get(0).setDefaultNic(true); + if (nics.size() > size) { + throw new CloudRuntimeException("Number of nics " + nics.size() + " doesn't match number of requested networks " + size); + } else { + if (finalNetwork == null) { + throw new CloudRuntimeException(String.format("can not assign network to %d remaining required NICs", size - nics.size())); + } + // create extra + for ( int extraNicNum = nics.size() ; extraNicNum < size; extraNicNum ++) { + final Pair vmNicPair = allocateNic(new NicProfile(), finalNetwork, false, extraNicNum, vm); + } + } } } }); @@ -1085,7 +1170,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } Pair implementNetwork(final long networkId, final DeployDestination dest, final ReservationContext context, final boolean isRouter) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + ResourceUnavailableException, InsufficientCapacityException { Pair implemented = null; if (!isRouter) { implemented = implementNetwork(networkId, dest, context); @@ -1105,7 +1190,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override @DB public Pair implementNetwork(final long networkId, final DeployDestination dest, final ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { + ResourceUnavailableException, InsufficientCapacityException { final Pair implemented = new Pair(null, null); NetworkVO network = _networksDao.findById(networkId); @@ -1396,7 +1481,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } protected boolean prepareElement(final NetworkElement element, final Network network, final NicProfile profile, final VirtualMachineProfile vmProfile, final DeployDestination dest, - final ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { + final ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { element.prepare(network, profile, vmProfile, dest, context); if (vmProfile.getType() == Type.User && element.getProvider() != null) { if (_networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp) @@ -1582,11 +1667,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (element instanceof RedundantResource) { resourceCount= ((RedundantResource) element).getResourceCount(network); break; - } } } - return resourceCount; } + return resourceCount; + } @Override public void configureExtraDhcpOptions(Network network, long nicId, Map extraDhcpOptions) { @@ -1628,12 +1713,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra _networkModel.getNetworkTag(vm.getHypervisorType(), network)); for (final NetworkElement element : networkElements) { if (_networkModel.areServicesSupportedInNetwork(network.getId(), Service.UserData) && element instanceof UserDataServiceProvider) { - if (element instanceof ConfigDriveNetworkElement && !migrationSuccessful || element instanceof VirtualRouterElement && migrationSuccessful) { - final UserDataServiceProvider sp = (UserDataServiceProvider) element; - if (!sp.saveHypervisorHostname(profile, network, vm, dest)) { - throw new CloudRuntimeException("Failed to Add hypervisor hostname"); - } + if (element instanceof ConfigDriveNetworkElement && !migrationSuccessful || element instanceof VirtualRouterElement && migrationSuccessful) { + final UserDataServiceProvider sp = (UserDataServiceProvider) element; + if (!sp.saveHypervisorHostname(profile, network, vm, dest)) { + throw new CloudRuntimeException("Failed to Add hypervisor hostname"); } + } } } } @@ -1661,7 +1746,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override public void prepare(final VirtualMachineProfile vmProfile, final DeployDestination dest, final ReservationContext context) throws InsufficientCapacityException, ConcurrentOperationException, - ResourceUnavailableException { + ResourceUnavailableException { final List nics = _nicDao.listByVmId(vmProfile.getId()); // we have to implement default nics first - to ensure that default network elements start up first in multiple @@ -2246,9 +2331,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @DB private Network createGuestNetwork(final long networkOfferingId, final String name, final String displayText, final String gateway, final String cidr, String vlanId, - boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk, - final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr, - final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, final Boolean isPrivateNetwork) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { + boolean bypassVlanOverlapCheck, String networkDomain, final Account owner, final Long domainId, final PhysicalNetwork pNtwk, + final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr, + final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, final Boolean isPrivateNetwork) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException { final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId); final DataCenterVO zone = _dcDao.findById(zoneId); @@ -2364,12 +2449,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra URI secondaryUri = isNotBlank(isolatedPvlan) ? BroadcastDomainType.fromString(isolatedPvlan) : null; //don't allow to specify vlan tag used by physical network for dynamic vlan allocation if (!(bypassVlanOverlapCheck && ntwkOff.getGuestType() == GuestType.Shared) && _dcDao.findVnet(zoneId, pNtwk.getId(), BroadcastDomainType.getValue(uri)).size() > 0) { - throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " + throw new InvalidParameterValueException("The VLAN tag to use for new guest network, " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " + zone.getName()); } if (secondaryUri != null && !(bypassVlanOverlapCheck && ntwkOff.getGuestType() == GuestType.Shared) && _dcDao.findVnet(zoneId, pNtwk.getId(), BroadcastDomainType.getValue(secondaryUri)).size() > 0) { - throw new InvalidParameterValueException("The VLAN tag " + isolatedPvlan + " is already being used for dynamic vlan allocation for the guest network in zone " + throw new InvalidParameterValueException("The VLAN tag for isolated PVLAN " + isolatedPvlan + " is already being used for dynamic vlan allocation for the guest network in zone " + zone.getName()); } if (! UuidUtils.validateUUID(vlanId)){ @@ -2605,7 +2690,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra return bypassVlanOverlapCheck && (ntwkOff.getGuestType() != GuestType.Isolated || isPrivateNetwork); } - /** + /** * Checks for L2 network offering services. Only 2 cases allowed: * - No services * - User Data service only, provided by ConfigDrive @@ -3033,7 +3118,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override public boolean startNetwork(final long networkId, final DeployDestination dest, final ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + InsufficientCapacityException { // Check if network exists final NetworkVO network = _networksDao.findById(networkId); @@ -3056,7 +3141,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override public boolean restartNetwork(final Long networkId, final Account callerAccount, final User callerUser, final boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { + InsufficientCapacityException { boolean status = true; boolean restartRequired = false; final NetworkVO network = _networksDao.findById(networkId); @@ -3308,10 +3393,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra final NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); if (networkOffering.getGuestType() == Network.GuestType.Shared && (_networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.SourceNat) - || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) - || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) - || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( - networkOfferingId, Service.Lb))) { + || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.StaticNat) + || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Firewall) + || _networkModel.areServicesSupportedByNetworkOffering(networkOfferingId, Service.PortForwarding) || _networkModel.areServicesSupportedByNetworkOffering( + networkOfferingId, Service.Lb))) { return true; } return false; @@ -4183,4 +4268,4 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra GuestDomainSuffix, NetworkThrottlingRate, MinVRVersion, PromiscuousMode, MacAddressChanges, ForgedTransmits, RollingRestartEnabled}; } -} +} \ No newline at end of file diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java index 958771c561d..a51aae7c8f4 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.engine.orchestration; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -26,10 +27,18 @@ import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.naming.ConfigurationException; +import com.cloud.agent.api.to.DatadiskTO; +import com.cloud.storage.VolumeDetailVO; +import com.cloud.storage.dao.VMTemplateDetailsDao; +import com.cloud.utils.StringUtils; +import com.cloud.vm.UserVmDetailVO; +import com.cloud.vm.VmDetailConstants; +import com.cloud.vm.dao.UserVmDetailsDao; import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd; import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin; import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; @@ -51,6 +60,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService; @@ -68,6 +78,7 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; +import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import com.cloud.agent.api.to.DataTO; @@ -141,6 +152,8 @@ import com.cloud.vm.dao.UserVmCloneSettingDao; import com.cloud.vm.dao.UserVmDao; import static com.cloud.utils.NumbersUtil.toHumanReadableSize; +import static com.cloud.storage.resource.StorageProcessor.REQUEST_TEMPLATE_RELOAD; + public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrationService, Configurable { public enum UserVmCloneType { @@ -197,6 +210,12 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati protected UserVmCloneSettingDao _vmCloneSettingDao; @Inject StorageStrategyFactory _storageStrategyFactory; + @Inject + VMTemplateDetailsDao templateDetailsDao; + @Inject + TemplateService templateService; + @Inject + UserVmDetailsDao userVmDetailsDao; private final StateMachine2 _volStateMachine; protected List _storagePoolAllocators; @@ -512,7 +531,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati @DB public VolumeInfo copyVolumeFromSecToPrimary(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, ServiceOffering offering, - DiskOffering diskOffering, List avoids, long size, HypervisorType hyperType) throws NoTransitionException { + DiskOffering diskOffering, List avoids, long size, HypervisorType hyperType) throws NoTransitionException { final HashSet avoidPools = new HashSet(avoids); DiskProfile dskCh = createDiskCharacteristics(volume, template, dc, diskOffering); @@ -545,7 +564,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati @DB public VolumeInfo createVolume(VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate template, DataCenter dc, Pod pod, Long clusterId, ServiceOffering offering, DiskOffering diskOffering, - List avoids, long size, HypervisorType hyperType) { + List avoids, long size, HypervisorType hyperType) { // update the volume's hv_ss_reserve (hypervisor snapshot reserve) from a disk offering (used for managed storage) volume = volService.updateHypervisorSnapshotReserveForVolume(diskOffering, volume.getId(), hyperType); @@ -591,7 +610,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati try { VolumeApiResult result = future.get(); if (result.isFailed()) { - if (result.getResult().contains("request template reload") && (i == 0)) { + if (result.getResult().contains(REQUEST_TEMPLATE_RELOAD) && (i == 0)) { s_logger.debug("Retry template re-deploy for vmware"); continue; } else { @@ -687,7 +706,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati @Override public DiskProfile allocateRawVolume(Type type, String name, DiskOffering offering, Long size, Long minIops, Long maxIops, VirtualMachine vm, VirtualMachineTemplate template, Account owner, - Long deviceId) { + Long deviceId) { if (size == null) { size = offering.getDiskSize(); } else { @@ -734,19 +753,23 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati return toDiskProfile(vol, offering); } - @Override - public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm, - Account owner) { + private DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm, + Account owner, long deviceId, String configurationId) { assert (template.getFormat() != ImageFormat.ISO) : "ISO is not a template really...."; Long size = _tmpltMgr.getTemplateSize(template.getId(), vm.getDataCenterId()); if (rootDisksize != null) { - rootDisksize = rootDisksize * 1024 * 1024 * 1024; - if (rootDisksize > size) { - s_logger.debug("Using root disk size of " + toHumanReadableSize(rootDisksize) + " Bytes for volume " + name); + if (template.isDeployAsIs()) { + // Volume size specified from template deploy-as-is size = rootDisksize; } else { - s_logger.debug("Using root disk size of " + toHumanReadableSize(size) + " Bytes for volume " + name + "since specified root disk size of " + toHumanReadableSize(rootDisksize) + " Bytes is smaller than template"); + rootDisksize = rootDisksize * 1024 * 1024 * 1024; + if (rootDisksize > size) { + s_logger.debug("Using root disk size of " + toHumanReadableSize(rootDisksize) + " Bytes for volume " + name); + size = rootDisksize; + } else { + s_logger.debug("Using root disk size of " + toHumanReadableSize(rootDisksize) + " Bytes for volume " + name + "since specified root disk size of " + rootDisksize + " Bytes is smaller than template"); + } } } @@ -760,13 +783,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } vol.setTemplateId(template.getId()); - if (type.equals(Type.ROOT)) { - vol.setDeviceId(0l); - if (!vm.getType().equals(VirtualMachine.Type.User)) { - vol.setRecreatable(true); - } - } else { - vol.setDeviceId(1l); + vol.setDeviceId(deviceId); + if (type.equals(Type.ROOT) && !vm.getType().equals(VirtualMachine.Type.User)) { + vol.setRecreatable(true); } if (vm.getType() == VirtualMachine.Type.User) { @@ -776,6 +795,11 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati vol = _volsDao.persist(vol); + if (StringUtils.isNotBlank(configurationId)) { + VolumeDetailVO deployConfigurationDetail = new VolumeDetailVO(vol.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION, configurationId, false); + _volDetailDao.persist(deployConfigurationDetail); + } + // Create event and update resource count for volumes if vm is a user vm if (vm.getType() == VirtualMachine.Type.User) { @@ -794,6 +818,51 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati return toDiskProfile(vol, offering); } + @Override + public List allocateTemplatedVolumes(Type type, String name, DiskOffering offering, Long rootDisksize, Long minIops, Long maxIops, VirtualMachineTemplate template, VirtualMachine vm, + Account owner) { + int volumesNumber = 1; + List templateAsIsDisks = null; + String configurationId = null; + if (template.isDeployAsIs()) { + UserVmDetailVO configurationDetail = userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION); + if (configurationDetail != null) { + configurationId = configurationDetail.getValue(); + } + templateAsIsDisks = _tmpltMgr.getTemplateDisksOnImageStore(template.getId(), DataStoreRole.Image, configurationId); + if (CollectionUtils.isNotEmpty(templateAsIsDisks)) { + templateAsIsDisks = templateAsIsDisks.stream() + .filter(x -> !x.isIso()) + .sorted(Comparator.comparing(DatadiskTO::getDiskNumber)) + .collect(Collectors.toList()); + } + volumesNumber = templateAsIsDisks.size(); + } + + if (volumesNumber < 1) { + throw new CloudRuntimeException("Unable to create any volume from template " + template.getName()); + } + + List profiles = new ArrayList<>(); + + for (int number = 0; number < volumesNumber; number++) { + String volumeName = name; + Long volumeSize = rootDisksize; + long deviceId = type.equals(Type.ROOT) ? 0L : 1L; + if (template.isDeployAsIs()) { + int volumeNameSuffix = templateAsIsDisks.get(number).getDiskNumber(); + volumeName = String.format("%s-%d", volumeName, volumeNameSuffix); + volumeSize = templateAsIsDisks.get(number).getVirtualSize(); + deviceId = templateAsIsDisks.get(number).getDiskNumber(); + } + s_logger.info(String.format("adding disk object %s to %s", volumeName, vm.getInstanceName())); + DiskProfile diskProfile = allocateTemplatedVolume(type, volumeName, offering, volumeSize, minIops, maxIops, + template, vm, owner, deviceId, configurationId); + profiles.add(diskProfile); + } + return profiles; + } + private ImageFormat getSupportedImageFormatForCluster(HypervisorType hyperType) { if (hyperType == HypervisorType.XenServer) { return ImageFormat.VHD; @@ -824,7 +893,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } private VolumeInfo copyVolume(StoragePool rootDiskPool, VolumeInfo volume, VirtualMachine vm, VirtualMachineTemplate rootDiskTmplt, DataCenter dcVO, Pod pod, DiskOffering diskVO, - ServiceOffering svo, HypervisorType rootDiskHyperType) throws NoTransitionException { + ServiceOffering svo, HypervisorType rootDiskHyperType) throws NoTransitionException { if (!isSupportedImageFormatForCluster(volume, rootDiskHyperType)) { throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " + volume.getFormat().getFileExtension() + " is not compatible with the vm hypervisor type"); @@ -1356,7 +1425,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati try { result = future.get(); if (result.isFailed()) { - if (result.getResult().contains("request template reload") && (i == 0)) { + if (result.getResult().contains(REQUEST_TEMPLATE_RELOAD) && (i == 0)) { s_logger.debug("Retry template re-deploy for vmware"); continue; } else { @@ -1732,4 +1801,4 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } }); } -} +} \ No newline at end of file diff --git a/engine/schema/src/main/java/com/cloud/storage/TemplateOVFPropertyVO.java b/engine/schema/src/main/java/com/cloud/storage/TemplateOVFPropertyVO.java deleted file mode 100644 index 425b1f22e45..00000000000 --- a/engine/schema/src/main/java/com/cloud/storage/TemplateOVFPropertyVO.java +++ /dev/null @@ -1,167 +0,0 @@ -// 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.storage; - -import com.cloud.agent.api.storage.OVFProperty; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "template_ovf_properties") -public class TemplateOVFPropertyVO implements OVFProperty { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "template_id") - private Long templateId; - - @Column(name = "key") - private String key; - - @Column(name = "type") - private String type; - - @Column(name = "value") - private String value; - - @Column(name = "qualifiers") - private String qualifiers; - - @Column(name = "password") - private Boolean password; - - @Column(name = "user_configurable") - private Boolean userConfigurable; - - @Column(name = "label") - private String label; - - @Column(name = "description") - private String description; - - public TemplateOVFPropertyVO() { - } - - public TemplateOVFPropertyVO(Long templateId, String key, String type, String value, String qualifiers, - Boolean userConfigurable, String label, String description, Boolean password) { - this.templateId = templateId; - this.key = key; - this.type = type; - this.value = value; - this.qualifiers = qualifiers; - this.userConfigurable = userConfigurable; - this.label = label; - this.description = description; - this.password = password; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public Long getTemplateId() { - return templateId; - } - - public void setTemplateId(Long templateId) { - this.templateId = templateId; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getQualifiers() { - return qualifiers; - } - - public void setQualifiers(String qualifiers) { - this.qualifiers = qualifiers; - } - - @Override - public Boolean isUserConfigurable() { - return userConfigurable; - } - - public void setUserConfigurable(Boolean userConfigurable) { - this.userConfigurable = userConfigurable; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Boolean isPassword() { - return password; - } - - public void setPassword(Boolean password) { - this.password = password; - } - - @Override - public String toString() { - return String.format("PROP - templateId=%s> key=%s value=%s type=%s qual=%s conf=%s label=%s desc=%s password=%s", - templateId, key, value, type, qualifiers, userConfigurable, label, description, password); - } -} diff --git a/engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java index 5010edfa762..574f4fc500e 100755 --- a/engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VMTemplateDetailVO.java @@ -21,6 +21,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Lob; import javax.persistence.Table; import org.apache.cloudstack.api.ResourceDetail; @@ -39,7 +40,8 @@ public class VMTemplateDetailVO implements ResourceDetail { @Column(name = "name") private String name; - @Column(name = "value", length = 1024) + @Lob + @Column(name = "value", length = 65535) private String value; @Column(name = "display") diff --git a/engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java index 6dfe6eb3e87..69c9c85ab5a 100644 --- a/engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VMTemplateStoragePoolVO.java @@ -95,6 +95,9 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc, @Enumerated(EnumType.STRING) ObjectInDataStoreStateMachine.State state; + @Column(name = "deployment_option") + private String deploymentOption; + @Override public String getInstallPath() { return installPath; @@ -168,17 +171,18 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc, return downloadState; } - public VMTemplateStoragePoolVO(long poolId, long templateId) { + public VMTemplateStoragePoolVO(long poolId, long templateId, String configuration) { super(); this.poolId = poolId; this.templateId = templateId; this.downloadState = Status.NOT_DOWNLOADED; this.state = ObjectInDataStoreStateMachine.State.Allocated; this.markedForGC = false; + this.deploymentOption = configuration; } public VMTemplateStoragePoolVO(long poolId, long templateId, Date lastUpdated, int downloadPercent, Status downloadState, String localDownloadPath, - String errorString, String jobId, String installPath, long templateSize) { + String errorString, String jobId, String installPath, long templateSize, String configuration) { super(); this.poolId = poolId; this.templateId = templateId; @@ -190,6 +194,7 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc, this.jobId = jobId; this.installPath = installPath; this.templateSize = templateSize; + this.deploymentOption = configuration; } protected VMTemplateStoragePoolVO() { @@ -300,4 +305,11 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc, return this.state; } + public String getDeploymentOption() { + return deploymentOption; + } + + public void setDeploymentOption(String deploymentOption) { + this.deploymentOption = deploymentOption; + } } diff --git a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java index af04099f9a2..61df40e50d8 100644 --- a/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java +++ b/engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java @@ -152,6 +152,9 @@ public class VMTemplateVO implements VirtualMachineTemplate { @Column(name = "parent_template_id") private Long parentTemplateId; + @Column(name = "deploy_as_is") + private boolean deployAsIs; + @Override public String getUniqueName() { return uniqueName; @@ -192,9 +195,9 @@ public class VMTemplateVO implements VirtualMachineTemplate { uuid = UUID.randomUUID().toString(); } - public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, - boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, - HypervisorType hyperType, String templateTag, Map details, boolean sshKeyEnabled, boolean isDynamicallyScalable, boolean directDownload) { + public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, + HypervisorType hyperType, String templateTag, Map details, boolean sshKeyEnabled, boolean isDynamicallyScalable, boolean directDownload, + boolean deployAsIs) { this(id, name, format, @@ -219,6 +222,7 @@ public class VMTemplateVO implements VirtualMachineTemplate { dynamicallyScalable = isDynamicallyScalable; state = State.Active; this.directDownload = directDownload; + this.deployAsIs = deployAsIs; } public static VMTemplateVO createPreHostIso(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, TemplateType type, @@ -637,4 +641,11 @@ public class VMTemplateVO implements VirtualMachineTemplate { this.parentTemplateId = parentTemplateId; } + @Override public boolean isDeployAsIs() { + return deployAsIs; + } + + public void setDeployAsIs(boolean deployAsIs) { + this.deployAsIs = deployAsIs; + } } diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDaoImpl.java deleted file mode 100644 index cf6a280b034..00000000000 --- a/engine/schema/src/main/java/com/cloud/storage/dao/TemplateOVFPropertiesDaoImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -// 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.storage.dao; - -import com.cloud.storage.TemplateOVFPropertyVO; -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.TransactionLegacy; -import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public class TemplateOVFPropertiesDaoImpl extends GenericDaoBase implements TemplateOVFPropertiesDao { - - private final static Logger s_logger = Logger.getLogger(TemplateOVFPropertiesDaoImpl.class); - - SearchBuilder OptionsSearchBuilder; - - public TemplateOVFPropertiesDaoImpl() { - super(); - OptionsSearchBuilder = createSearchBuilder(); - OptionsSearchBuilder.and("templateid", OptionsSearchBuilder.entity().getTemplateId(), SearchCriteria.Op.EQ); - OptionsSearchBuilder.and("key", OptionsSearchBuilder.entity().getKey(), SearchCriteria.Op.EQ); - OptionsSearchBuilder.done(); - } - - @Override - public boolean existsOption(long templateId, String key) { - return findByTemplateAndKey(templateId, key) != null; - } - - @Override - public TemplateOVFPropertyVO findByTemplateAndKey(long templateId, String key) { - SearchCriteria sc = OptionsSearchBuilder.create(); - sc.setParameters("templateid", templateId); - sc.setParameters("key", key); - return findOneBy(sc); - } - - @Override - public void saveOptions(List opts) { - if (CollectionUtils.isEmpty(opts)) { - return; - } - TransactionLegacy txn = TransactionLegacy.currentTxn(); - txn.start(); - for (TemplateOVFPropertyVO opt : opts) { - persist(opt); - } - txn.commit(); - } - - @Override - public List listByTemplateId(long templateId) { - SearchCriteria sc = OptionsSearchBuilder.create(); - sc.setParameters("templateid", templateId); - return listBy(sc); - } -} diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java index fe69630ae2e..51c9cbbbb40 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java +++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDao.java @@ -16,11 +16,25 @@ // under the License. package com.cloud.storage.dao; +import com.cloud.agent.api.storage.OVFPropertyTO; +import com.cloud.agent.api.to.DatadiskTO; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; import org.apache.cloudstack.resourcedetail.ResourceDetailsDao; import com.cloud.storage.VMTemplateDetailVO; import com.cloud.utils.db.GenericDao; +import java.util.List; + public interface VMTemplateDetailsDao extends GenericDao, ResourceDetailsDao { + boolean existsOption(long templateId, String key); + OVFPropertyTO findPropertyByTemplateAndKey(long templateId, String key); + void saveOptions(List opts); + List listPropertiesByTemplateId(long templateId); + List listNetworkRequirementsByTemplateId(long templateId); + List listDisksByTemplateId(long templateId); + + List listDetailsByTemplateIdMatchingPrefix(long templateId, String prefix); + String getTemplateEulaSectionsUrl(long templateId); } diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java index 3e7072f6bf0..d904e1a6de7 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDetailsDaoImpl.java @@ -17,17 +17,137 @@ package com.cloud.storage.dao; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; +import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; +import org.apache.commons.collections.CollectionUtils; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase; - +import com.cloud.agent.api.storage.OVFPropertyTO; +import com.cloud.agent.api.to.DatadiskTO; +import com.cloud.storage.ImageStore; import com.cloud.storage.VMTemplateDetailVO; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.TransactionLegacy; +import com.google.gson.Gson; @Component public class VMTemplateDetailsDaoImpl extends ResourceDetailsDaoBase implements VMTemplateDetailsDao { + private final static Logger LOGGER = Logger.getLogger(VMTemplateDetailsDaoImpl.class); + + Gson gson = new Gson(); + + SearchBuilder OptionsSearchBuilder; + + public VMTemplateDetailsDaoImpl() { + super(); + OptionsSearchBuilder = createSearchBuilder(); + OptionsSearchBuilder.and("resourceId", OptionsSearchBuilder.entity().getResourceId(), SearchCriteria.Op.EQ); + OptionsSearchBuilder.and("name", OptionsSearchBuilder.entity().getName(), SearchCriteria.Op.EQ); + OptionsSearchBuilder.done(); + } + @Override public void addDetail(long resourceId, String key, String value, boolean display) { super.addDetail(new VMTemplateDetailVO(resourceId, key, value, display)); } -} + + @Override + public boolean existsOption(long templateId, String key) { + return findPropertyByTemplateAndKey(templateId, key) != null; + } + + @Override + public OVFPropertyTO findPropertyByTemplateAndKey(long templateId, String key) { + SearchCriteria sc = OptionsSearchBuilder.create(); + sc.setParameters("resourceId", templateId); + sc.setParameters("name", key.startsWith(ImageStore.ACS_PROPERTY_PREFIX) ? key : ImageStore.ACS_PROPERTY_PREFIX + key); + OVFPropertyTO property = null; + VMTemplateDetailVO detail = findOneBy(sc); + if (detail != null) { + property = gson.fromJson(detail.getValue(), OVFPropertyTO.class); + } + return property; + } + + @Override + public void saveOptions(List opts) { + if (CollectionUtils.isEmpty(opts)) { + return; + } + TransactionLegacy txn = TransactionLegacy.currentTxn(); + txn.start(); + for (OVFPropertyTO opt : opts) { + String json = gson.toJson(opt); + VMTemplateDetailVO templateDetailVO = new VMTemplateDetailVO(opt.getTemplateId(), ImageStore.ACS_PROPERTY_PREFIX + opt.getKey(), json, opt.isUserConfigurable()); + persist(templateDetailVO); + } + txn.commit(); + } + + @Override + public List listPropertiesByTemplateId(long templateId) { + List ovfProperties = listDetailsByTemplateIdMatchingPrefix(templateId, ImageStore.ACS_PROPERTY_PREFIX); + List properties = new ArrayList<>(); + for (VMTemplateDetailVO property : ovfProperties) { + OVFPropertyTO ovfPropertyTO = gson.fromJson(property.getValue(), OVFPropertyTO.class); + properties.add(ovfPropertyTO); + } + return properties; + } + + @Override + public List listNetworkRequirementsByTemplateId(long templateId) { + List networkDetails = listDetailsByTemplateIdMatchingPrefix(templateId, ImageStore.REQUIRED_NETWORK_PREFIX); + List networkPrereqs = new ArrayList<>(); + for (VMTemplateDetailVO property : networkDetails) { + NetworkPrerequisiteTO ovfPropertyTO = gson.fromJson(property.getValue(), NetworkPrerequisiteTO.class); + networkPrereqs.add(ovfPropertyTO); + } + networkPrereqs.sort(new Comparator() { + @Override + public int compare(NetworkPrerequisiteTO o1, NetworkPrerequisiteTO o2) { + return o1.getInstanceID() - o2.getInstanceID(); + } + }); + return networkPrereqs; + } + + @Override + public List listDisksByTemplateId(long templateId) { + List diskDefinitions = listDetailsByTemplateIdMatchingPrefix(templateId, ImageStore.DISK_DEFINITION_PREFIX); + List disks = new ArrayList<>(); + for (VMTemplateDetailVO detail : diskDefinitions) { + DatadiskTO datadiskTO = gson.fromJson(detail.getValue(), DatadiskTO.class); + disks.add(datadiskTO); + } + return disks; + } + + @Override + public List listDetailsByTemplateIdMatchingPrefix(long templateId, String prefix) { + SearchCriteria ssc = createSearchCriteria(); + ssc.addAnd("resourceId", SearchCriteria.Op.EQ, templateId); + ssc.addAnd("name", SearchCriteria.Op.LIKE, prefix + "%"); + + return search(ssc, null); + } + + @Override + public String getTemplateEulaSectionsUrl(long templateId) { + List details = findDetails(templateId, ImageStore.OVF_EULA_SECTION_PREFIX); + if (CollectionUtils.isEmpty(details)) { + return null; + } + if (details.size() > 1) { + LOGGER.error("Multiple details for EULA sections for template " + templateId + " returning one"); + } + return details.get(0).getValue(); + } +} \ No newline at end of file diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java index 05afad67655..d00eeceec7c 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java +++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDao.java @@ -27,27 +27,27 @@ import com.cloud.utils.fsm.StateDao; public interface VMTemplatePoolDao extends GenericDao, StateDao { - public List listByPoolId(long id); + List listByPoolId(long id); - public List listByTemplateId(long templateId); + List listByTemplateId(long templateId); - public VMTemplateStoragePoolVO findByPoolTemplate(long poolId, long templateId); + VMTemplateStoragePoolVO findByPoolTemplate(long poolId, long templateId, String configuration); - public List listByPoolIdAndState(long poolId, ObjectInDataStoreStateMachine.State state); + List listByPoolIdAndState(long poolId, ObjectInDataStoreStateMachine.State state); - public List listByTemplateStatus(long templateId, VMTemplateStoragePoolVO.Status downloadState); + List listByTemplateStatus(long templateId, VMTemplateStoragePoolVO.Status downloadState); - public List listByTemplateStatus(long templateId, VMTemplateStoragePoolVO.Status downloadState, long poolId); + List listByTemplateStatus(long templateId, VMTemplateStoragePoolVO.Status downloadState, long poolId); - public List listByTemplateStatus(long templateId, long datacenterId, VMTemplateStoragePoolVO.Status downloadState); + List listByTemplateStatus(long templateId, long datacenterId, VMTemplateStoragePoolVO.Status downloadState); - public List listByTemplateStatus(long templateId, long datacenterId, long podId, VMTemplateStoragePoolVO.Status downloadState); + List listByTemplateStatus(long templateId, long datacenterId, long podId, VMTemplateStoragePoolVO.Status downloadState); - public List listByTemplateStates(long templateId, VMTemplateStoragePoolVO.Status... states); + List listByTemplateStates(long templateId, VMTemplateStoragePoolVO.Status... states); boolean templateAvailable(long templateId, long poolId); - public VMTemplateStoragePoolVO findByHostTemplate(Long hostId, Long templateId); + VMTemplateStoragePoolVO findByHostTemplate(Long hostId, Long templateId, String configuration); VMTemplateStoragePoolVO findByPoolPath(Long poolId, String path); diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java index 32874701128..998df5e7987 100644 --- a/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java @@ -28,6 +28,7 @@ import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -73,7 +74,7 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase sc = PoolTemplateSearch.create(); sc.setParameters("pool_id", poolId); sc.setParameters("template_id", templateId); + if (StringUtils.isNotBlank(configuration)) { + sc.setParameters("configuration", configuration); + } return findOneIncludingRemovedBy(sc); } @@ -219,13 +224,17 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase listByHostTemplate(long hostId, long templateId) { + public List listByHostTemplate(long hostId, long templateId, String configuration) { TransactionLegacy txn = TransactionLegacy.currentTxn(); List result = new ArrayList(); String sql = HOST_TEMPLATE_SEARCH; + sql += StringUtils.isBlank(configuration) ? "IS NULL" : "= ?"; try(PreparedStatement pstmt = txn.prepareStatement(sql);) { pstmt.setLong(1, hostId); pstmt.setLong(2, templateId); + if (StringUtils.isNotBlank(configuration)) { + pstmt.setString(3, configuration); + } try(ResultSet rs = pstmt.executeQuery();) { while (rs.next()) { // result.add(toEntityBean(rs, false)); TODO: this is buggy in @@ -245,7 +254,7 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase result = listByHostTemplate(hostId, templateId); - return (result.size() == 0) ? null : result.get(1); + public VMTemplateStoragePoolVO findByHostTemplate(Long hostId, Long templateId, String configuration) { + List result = listByHostTemplate(hostId, templateId, configuration); + return (result.size() == 0) ? null : result.get(0); } @Override diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java index 25479d6658a..6bf0dc23168 100644 --- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java @@ -30,6 +30,7 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; +import com.cloud.storage.ImageStore; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; @@ -382,13 +383,25 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use List details = new ArrayList(); for (Map.Entry entry : detailsStr.entrySet()) { - boolean display = visibilityMap.getOrDefault(entry.getKey(), true); + boolean display = visibilityMap.getOrDefault(entry.getKey(), true) && displayOVFDetails(entry.getKey()); details.add(new UserVmDetailVO(vm.getId(), entry.getKey(), entry.getValue(), display)); } _detailsDao.saveDetails(details); } + /* + Do not display VM properties parsed from OVF, handled internally + */ + private boolean displayOVFDetails(String key) { + if (key.startsWith(ImageStore.ACS_PROPERTY_PREFIX) || key.startsWith(ImageStore.OVF_HARDWARE_ITEM_PREFIX) || + key.startsWith(ImageStore.OVF_HARDWARE_CONFIGURATION_PREFIX) || key.startsWith(ImageStore.DISK_DEFINITION_PREFIX) || + key.startsWith(ImageStore.REQUIRED_NETWORK_PREFIX) || key.startsWith(ImageStore.OVF_EULA_SECTION_PREFIX)) { + return false; + } + return true; + } + @Override public List listPodIdsHavingVmsforAccount(long zoneId, long accountId) { TransactionLegacy txn = TransactionLegacy.currentTxn(); diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml index 052a3dfc205..cde3518e7d2 100644 --- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml +++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml @@ -293,7 +293,6 @@ - diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql index 4c7c7c994da..b7e94cc0e86 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql @@ -260,6 +260,218 @@ CREATE VIEW `cloud`.`storage_pool_view` AS LEFT JOIN `async_job` ON (((`async_job`.`instance_id` = `storage_pool`.`id`) AND (`async_job`.`instance_type` = 'StoragePool') AND (`async_job`.`job_status` = 0)))); +-- Add passthrough instruction for appliance deployments +ALTER TABLE `cloud`.`vm_template` ADD COLUMN `deploy_as_is` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the template should be deployed with disks and networks as defined by OVF'; + +-- Extend the template details value field +ALTER TABLE `cloud`.`vm_template_details` MODIFY COLUMN `value` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; + +-- Changes to template_view for both deploying multidisk OVA/vApp as is +DROP VIEW IF EXISTS `cloud`.`template_view`; +CREATE VIEW `cloud`.`template_view` AS + SELECT + `vm_template`.`id` AS `id`, + `vm_template`.`uuid` AS `uuid`, + `vm_template`.`unique_name` AS `unique_name`, + `vm_template`.`name` AS `name`, + `vm_template`.`public` AS `public`, + `vm_template`.`featured` AS `featured`, + `vm_template`.`type` AS `type`, + `vm_template`.`hvm` AS `hvm`, + `vm_template`.`bits` AS `bits`, + `vm_template`.`url` AS `url`, + `vm_template`.`format` AS `format`, + `vm_template`.`created` AS `created`, + `vm_template`.`checksum` AS `checksum`, + `vm_template`.`display_text` AS `display_text`, + `vm_template`.`enable_password` AS `enable_password`, + `vm_template`.`dynamically_scalable` AS `dynamically_scalable`, + `vm_template`.`state` AS `template_state`, + `vm_template`.`guest_os_id` AS `guest_os_id`, + `guest_os`.`uuid` AS `guest_os_uuid`, + `guest_os`.`display_name` AS `guest_os_name`, + `vm_template`.`bootable` AS `bootable`, + `vm_template`.`prepopulate` AS `prepopulate`, + `vm_template`.`cross_zones` AS `cross_zones`, + `vm_template`.`hypervisor_type` AS `hypervisor_type`, + `vm_template`.`extractable` AS `extractable`, + `vm_template`.`template_tag` AS `template_tag`, + `vm_template`.`sort_key` AS `sort_key`, + `vm_template`.`removed` AS `removed`, + `vm_template`.`enable_sshkey` AS `enable_sshkey`, + `parent_template`.`id` AS `parent_template_id`, + `parent_template`.`uuid` AS `parent_template_uuid`, + `source_template`.`id` AS `source_template_id`, + `source_template`.`uuid` AS `source_template_uuid`, + `account`.`id` AS `account_id`, + `account`.`uuid` AS `account_uuid`, + `account`.`account_name` AS `account_name`, + `account`.`type` AS `account_type`, + `domain`.`id` AS `domain_id`, + `domain`.`uuid` AS `domain_uuid`, + `domain`.`name` AS `domain_name`, + `domain`.`path` AS `domain_path`, + `projects`.`id` AS `project_id`, + `projects`.`uuid` AS `project_uuid`, + `projects`.`name` AS `project_name`, + `data_center`.`id` AS `data_center_id`, + `data_center`.`uuid` AS `data_center_uuid`, + `data_center`.`name` AS `data_center_name`, + `launch_permission`.`account_id` AS `lp_account_id`, + `template_store_ref`.`store_id` AS `store_id`, + `image_store`.`scope` AS `store_scope`, + `template_store_ref`.`state` AS `state`, + `template_store_ref`.`download_state` AS `download_state`, + `template_store_ref`.`download_pct` AS `download_pct`, + `template_store_ref`.`error_str` AS `error_str`, + `template_store_ref`.`size` AS `size`, + `template_store_ref`.physical_size AS `physical_size`, + `template_store_ref`.`destroyed` AS `destroyed`, + `template_store_ref`.`created` AS `created_on_store`, + `vm_template_details`.`name` AS `detail_name`, + `vm_template_details`.`value` AS `detail_value`, + `resource_tags`.`id` AS `tag_id`, + `resource_tags`.`uuid` AS `tag_uuid`, + `resource_tags`.`key` AS `tag_key`, + `resource_tags`.`value` AS `tag_value`, + `resource_tags`.`domain_id` AS `tag_domain_id`, + `domain`.`uuid` AS `tag_domain_uuid`, + `domain`.`name` AS `tag_domain_name`, + `resource_tags`.`account_id` AS `tag_account_id`, + `account`.`account_name` AS `tag_account_name`, + `resource_tags`.`resource_id` AS `tag_resource_id`, + `resource_tags`.`resource_uuid` AS `tag_resource_uuid`, + `resource_tags`.`resource_type` AS `tag_resource_type`, + `resource_tags`.`customer` AS `tag_customer`, + CONCAT(`vm_template`.`id`, + '_', + IFNULL(`data_center`.`id`, 0)) AS `temp_zone_pair`, + `vm_template`.`direct_download` AS `direct_download`, + `vm_template`.`deploy_as_is` AS `deploy_as_is` + FROM + (((((((((((((`vm_template` + JOIN `guest_os` ON ((`guest_os`.`id` = `vm_template`.`guest_os_id`))) + JOIN `account` ON ((`account`.`id` = `vm_template`.`account_id`))) + JOIN `domain` ON ((`domain`.`id` = `account`.`domain_id`))) + LEFT JOIN `projects` ON ((`projects`.`project_account_id` = `account`.`id`))) + LEFT JOIN `vm_template_details` ON ((`vm_template_details`.`template_id` = `vm_template`.`id`))) + LEFT JOIN `vm_template` `source_template` ON ((`source_template`.`id` = `vm_template`.`source_template_id`))) + LEFT JOIN `template_store_ref` ON (((`template_store_ref`.`template_id` = `vm_template`.`id`) + AND (`template_store_ref`.`store_role` = 'Image') + AND (`template_store_ref`.`destroyed` = 0)))) + LEFT JOIN `vm_template` `parent_template` ON ((`parent_template`.`id` = `vm_template`.`parent_template_id`))) + LEFT JOIN `image_store` ON ((ISNULL(`image_store`.`removed`) + AND (`template_store_ref`.`store_id` IS NOT NULL) + AND (`image_store`.`id` = `template_store_ref`.`store_id`)))) + LEFT JOIN `template_zone_ref` ON (((`template_zone_ref`.`template_id` = `vm_template`.`id`) + AND ISNULL(`template_store_ref`.`store_id`) + AND ISNULL(`template_zone_ref`.`removed`)))) + LEFT JOIN `data_center` ON (((`image_store`.`data_center_id` = `data_center`.`id`) + OR (`template_zone_ref`.`zone_id` = `data_center`.`id`)))) + LEFT JOIN `launch_permission` ON ((`launch_permission`.`template_id` = `vm_template`.`id`))) + LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` = `vm_template`.`id`) + AND ((`resource_tags`.`resource_type` = 'Template') + OR (`resource_tags`.`resource_type` = 'ISO'))))); + +-- Add mincpu, maxcpu, minmemory and maxmemory to the view supporting constrained offerings +DROP VIEW IF EXISTS `cloud`.`service_offering_view`; +CREATE VIEW `cloud`.`service_offering_view` AS + SELECT + `service_offering`.`id` AS `id`, + `disk_offering`.`uuid` AS `uuid`, + `disk_offering`.`name` AS `name`, + `disk_offering`.`display_text` AS `display_text`, + `disk_offering`.`provisioning_type` AS `provisioning_type`, + `disk_offering`.`created` AS `created`, + `disk_offering`.`tags` AS `tags`, + `disk_offering`.`removed` AS `removed`, + `disk_offering`.`use_local_storage` AS `use_local_storage`, + `disk_offering`.`system_use` AS `system_use`, + `disk_offering`.`customized_iops` AS `customized_iops`, + `disk_offering`.`min_iops` AS `min_iops`, + `disk_offering`.`max_iops` AS `max_iops`, + `disk_offering`.`hv_ss_reserve` AS `hv_ss_reserve`, + `disk_offering`.`bytes_read_rate` AS `bytes_read_rate`, + `disk_offering`.`bytes_read_rate_max` AS `bytes_read_rate_max`, + `disk_offering`.`bytes_read_rate_max_length` AS `bytes_read_rate_max_length`, + `disk_offering`.`bytes_write_rate` AS `bytes_write_rate`, + `disk_offering`.`bytes_write_rate_max` AS `bytes_write_rate_max`, + `disk_offering`.`bytes_write_rate_max_length` AS `bytes_write_rate_max_length`, + `disk_offering`.`iops_read_rate` AS `iops_read_rate`, + `disk_offering`.`iops_read_rate_max` AS `iops_read_rate_max`, + `disk_offering`.`iops_read_rate_max_length` AS `iops_read_rate_max_length`, + `disk_offering`.`iops_write_rate` AS `iops_write_rate`, + `disk_offering`.`iops_write_rate_max` AS `iops_write_rate_max`, + `disk_offering`.`iops_write_rate_max_length` AS `iops_write_rate_max_length`, + `disk_offering`.`cache_mode` AS `cache_mode`, + `service_offering`.`cpu` AS `cpu`, + `service_offering`.`speed` AS `speed`, + `service_offering`.`ram_size` AS `ram_size`, + `service_offering`.`nw_rate` AS `nw_rate`, + `service_offering`.`mc_rate` AS `mc_rate`, + `service_offering`.`ha_enabled` AS `ha_enabled`, + `service_offering`.`limit_cpu_use` AS `limit_cpu_use`, + `service_offering`.`host_tag` AS `host_tag`, + `service_offering`.`default_use` AS `default_use`, + `service_offering`.`vm_type` AS `vm_type`, + `service_offering`.`sort_key` AS `sort_key`, + `service_offering`.`is_volatile` AS `is_volatile`, + `service_offering`.`deployment_planner` AS `deployment_planner`, + GROUP_CONCAT(DISTINCT(domain.id)) AS domain_id, + GROUP_CONCAT(DISTINCT(domain.uuid)) AS domain_uuid, + GROUP_CONCAT(DISTINCT(domain.name)) AS domain_name, + GROUP_CONCAT(DISTINCT(domain.path)) AS domain_path, + GROUP_CONCAT(DISTINCT(zone.id)) AS zone_id, + GROUP_CONCAT(DISTINCT(zone.uuid)) AS zone_uuid, + GROUP_CONCAT(DISTINCT(zone.name)) AS zone_name, + IFNULL(`min_compute_details`.`value`, `cpu`) AS min_cpu, + IFNULL(`max_compute_details`.`value`, `cpu`) AS max_cpu, + IFNULL(`min_memory_details`.`value`, `ram_size`) AS min_memory, + IFNULL(`max_memory_details`.`value`, `ram_size`) AS max_memory + FROM + `cloud`.`service_offering` + INNER JOIN + `cloud`.`disk_offering_view` AS `disk_offering` ON service_offering.id = disk_offering.id + LEFT JOIN + `cloud`.`service_offering_details` AS `domain_details` ON `domain_details`.`service_offering_id` = `disk_offering`.`id` AND `domain_details`.`name`='domainid' + LEFT JOIN + `cloud`.`domain` AS `domain` ON FIND_IN_SET(`domain`.`id`, `domain_details`.`value`) + LEFT JOIN + `cloud`.`service_offering_details` AS `zone_details` ON `zone_details`.`service_offering_id` = `disk_offering`.`id` AND `zone_details`.`name`='zoneid' + LEFT JOIN + `cloud`.`data_center` AS `zone` ON FIND_IN_SET(`zone`.`id`, `zone_details`.`value`) + LEFT JOIN + `cloud`.`service_offering_details` AS `min_compute_details` ON `min_compute_details`.`service_offering_id` = `disk_offering`.`id` + AND `min_compute_details`.`name` = 'mincpunumber' + LEFT JOIN + `cloud`.`service_offering_details` AS `max_compute_details` ON `max_compute_details`.`service_offering_id` = `disk_offering`.`id` + AND `max_compute_details`.`name` = 'maxcpunumber' + LEFT JOIN + `cloud`.`service_offering_details` AS `min_memory_details` ON `min_memory_details`.`service_offering_id` = `disk_offering`.`id` + AND `min_memory_details`.`name` = 'minmemory' + LEFT JOIN + `cloud`.`service_offering_details` AS `max_memory_details` ON `max_memory_details`.`service_offering_id` = `disk_offering`.`id` + AND `max_memory_details`.`name` = 'maxmemory' + WHERE + `disk_offering`.`state`='Active' + GROUP BY + `service_offering`.`id`; + +ALTER TABLE `cloud`.`template_spool_ref` +DROP FOREIGN KEY `fk_template_spool_ref__template_id`; + +ALTER TABLE `cloud`.`template_spool_ref` +ADD COLUMN `deployment_option` VARCHAR(255) NULL DEFAULT NULL AFTER `updated`, +ADD INDEX `fk_template_spool_ref__template_id_idx` (`template_id` ASC), +ADD UNIQUE INDEX `index_template_spool_configuration` (`pool_id` ASC, `template_id` ASC, `deployment_option` ASC), +DROP INDEX `i_template_spool_ref__template_id__pool_id` ; + +ALTER TABLE `cloud`.`template_spool_ref` +ADD CONSTRAINT `fk_template_spool_ref__template_id` + FOREIGN KEY (`template_id`) + REFERENCES `cloud`.`vm_template` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION; ALTER TABLE `cloud`.`image_store` ADD COLUMN `readonly` boolean DEFAULT false COMMENT 'defines status of image store'; @@ -285,4 +497,4 @@ ALTER VIEW `cloud`.`image_store_view` AS left join `cloud`.`data_center` ON image_store.data_center_id = data_center.id left join - `cloud`.`image_store_details` ON image_store_details.store_id = image_store.id; + `cloud`.`image_store_details` ON image_store_details.store_id = image_store.id; \ No newline at end of file diff --git a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java index 278c80d3247..40eeafef692 100644 --- a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java +++ b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java @@ -291,7 +291,7 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager { if (st == ObjectInDataStoreStateMachine.State.Ready) { s_logger.debug("there is already one in the cache store"); - DataObject dataObj = objectInStoreMgr.get(data, store); + DataObject dataObj = objectInStoreMgr.get(data, store, null); dataObj.incRefCount(); existingDataObj = dataObj; } diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java index e6b5c85b924..971859685ff 100644 --- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java +++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageDataMotionStrategy.java @@ -195,7 +195,7 @@ public class KvmNonManagedStorageDataMotionStrategy extends StorageSystemDataMot @Override protected void copyTemplateToTargetFilesystemStorageIfNeeded(VolumeInfo srcVolumeInfo, StoragePool srcStoragePool, DataStore destDataStore, StoragePool destStoragePool, Host destHost) { - VMTemplateStoragePoolVO sourceVolumeTemplateStoragePoolVO = vmTemplatePoolDao.findByPoolTemplate(destStoragePool.getId(), srcVolumeInfo.getTemplateId()); + VMTemplateStoragePoolVO sourceVolumeTemplateStoragePoolVO = vmTemplatePoolDao.findByPoolTemplate(destStoragePool.getId(), srcVolumeInfo.getTemplateId(), null); if (sourceVolumeTemplateStoragePoolVO == null && destStoragePool.getPoolType() == StoragePoolType.Filesystem) { DataStore sourceTemplateDataStore = dataStoreManagerImpl.getRandomImageStore(srcVolumeInfo.getDataCenterId()); if (sourceTemplateDataStore != null) { @@ -220,8 +220,8 @@ public class KvmNonManagedStorageDataMotionStrategy extends StorageSystemDataMot * Update the template reference on table "template_spool_ref" (VMTemplateStoragePoolVO). */ protected void updateTemplateReferenceIfSuccessfulCopy(VolumeInfo srcVolumeInfo, StoragePool srcStoragePool, TemplateInfo destTemplateInfo, DataStore destDataStore) { - VMTemplateStoragePoolVO srcVolumeTemplateStoragePoolVO = vmTemplatePoolDao.findByPoolTemplate(srcStoragePool.getId(), srcVolumeInfo.getTemplateId()); - VMTemplateStoragePoolVO destVolumeTemplateStoragePoolVO = new VMTemplateStoragePoolVO(destDataStore.getId(), srcVolumeInfo.getTemplateId()); + VMTemplateStoragePoolVO srcVolumeTemplateStoragePoolVO = vmTemplatePoolDao.findByPoolTemplate(srcStoragePool.getId(), srcVolumeInfo.getTemplateId(), null); + VMTemplateStoragePoolVO destVolumeTemplateStoragePoolVO = new VMTemplateStoragePoolVO(destDataStore.getId(), srcVolumeInfo.getTemplateId(), null); destVolumeTemplateStoragePoolVO.setDownloadPercent(100); destVolumeTemplateStoragePoolVO.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED); destVolumeTemplateStoragePoolVO.setState(ObjectInDataStoreStateMachine.State.Ready); diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java index 4d3ec184ac1..936f0626af3 100644 --- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java +++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java @@ -1710,7 +1710,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy { * Return expected MigrationOptions for a linked clone volume live storage migration */ protected MigrationOptions createLinkedCloneMigrationOptions(VolumeInfo srcVolumeInfo, VolumeInfo destVolumeInfo, String srcVolumeBackingFile, String srcPoolUuid, Storage.StoragePoolType srcPoolType) { - VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(destVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId()); + VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(destVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId(), null); boolean updateBackingFileReference = ref == null; String backingFile = ref != null ? ref.getInstallPath() : srcVolumeBackingFile; return new MigrationOptions(srcPoolUuid, srcPoolType, backingFile, updateBackingFileReference); @@ -1983,7 +1983,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy { srcVolumeInfo.getTemplateId() != null && srcVolumeInfo.getPoolId() != null) { VMTemplateVO template = _vmTemplateDao.findById(srcVolumeInfo.getTemplateId()); if (template.getFormat() != null && template.getFormat() != Storage.ImageFormat.ISO) { - VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(srcVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId()); + VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(srcVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId(), null); return ref != null ? ref.getInstallPath() : null; } } @@ -2157,8 +2157,8 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy { * Update reference on template_spool_ref table of copied template to destination storage */ protected void updateCopiedTemplateReference(VolumeInfo srcVolumeInfo, VolumeInfo destVolumeInfo) { - VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(srcVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId()); - VMTemplateStoragePoolVO newRef = new VMTemplateStoragePoolVO(destVolumeInfo.getPoolId(), ref.getTemplateId()); + VMTemplateStoragePoolVO ref = templatePoolDao.findByPoolTemplate(srcVolumeInfo.getPoolId(), srcVolumeInfo.getTemplateId(), null); + VMTemplateStoragePoolVO newRef = new VMTemplateStoragePoolVO(destVolumeInfo.getPoolId(), ref.getTemplateId(), null); newRef.setDownloadPercent(100); newRef.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED); newRef.setState(ObjectInDataStoreStateMachine.State.Ready); diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java index 6971444bcad..ba7fb74da1d 100644 --- a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java +++ b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/KvmNonManagedStorageSystemDataMotionTest.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.storage.motion; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; @@ -301,7 +302,7 @@ public class KvmNonManagedStorageSystemDataMotionTest { public void copyTemplateToTargetStorageIfNeededTestTemplateAlreadyOnTargetHost() throws AgentUnavailableException, OperationTimedoutException { Answer copyCommandAnswer = Mockito.mock(Answer.class); Mockito.lenient().when(copyCommandAnswer.getResult()).thenReturn(true); - configureAndTestcopyTemplateToTargetStorageIfNeeded(new VMTemplateStoragePoolVO(0l, 0l), StoragePoolType.Filesystem, 0); + configureAndTestcopyTemplateToTargetStorageIfNeeded(new VMTemplateStoragePoolVO(0l, 0l, null), StoragePoolType.Filesystem, 0); } @Test @@ -316,7 +317,7 @@ public class KvmNonManagedStorageSystemDataMotionTest { if (storagePoolTypeArray[i] == StoragePoolType.Filesystem) { continue; } - configureAndTestcopyTemplateToTargetStorageIfNeeded(new VMTemplateStoragePoolVO(0l, 0l), storagePoolTypeArray[i], 0); + configureAndTestcopyTemplateToTargetStorageIfNeeded(new VMTemplateStoragePoolVO(0l, 0l, null), storagePoolTypeArray[i], 0); } } @@ -353,7 +354,7 @@ public class KvmNonManagedStorageSystemDataMotionTest { Mockito.when(sourceTemplateInfo.getSize()).thenReturn(0l); Mockito.when(sourceTemplateInfo.getHypervisorType()).thenReturn(HypervisorType.KVM); - Mockito.when(vmTemplatePoolDao.findByPoolTemplate(Mockito.anyLong(), Mockito.anyLong())).thenReturn(vmTemplateStoragePoolVO); + Mockito.when(vmTemplatePoolDao.findByPoolTemplate(Mockito.anyLong(), Mockito.anyLong(), nullable(String.class))).thenReturn(vmTemplateStoragePoolVO); Mockito.when(dataStoreManagerImpl.getRandomImageStore(Mockito.anyLong())).thenReturn(sourceTemplateDataStore); Mockito.when(templateDataFactory.getTemplate(Mockito.anyLong(), Mockito.eq(sourceTemplateDataStore))).thenReturn(sourceTemplateInfo); Mockito.when(templateDataFactory.getTemplate(Mockito.anyLong(), Mockito.eq(destDataStore))).thenReturn(sourceTemplateInfo); @@ -362,7 +363,7 @@ public class KvmNonManagedStorageSystemDataMotionTest { Mockito.any(TemplateInfo.class), Mockito.any(DataStore.class)); InOrder verifyInOrder = Mockito.inOrder(vmTemplatePoolDao, dataStoreManagerImpl, templateDataFactory, kvmNonManagedStorageDataMotionStrategy); - verifyInOrder.verify(vmTemplatePoolDao, Mockito.times(1)).findByPoolTemplate(Mockito.anyLong(), Mockito.anyLong()); + verifyInOrder.verify(vmTemplatePoolDao, Mockito.times(1)).findByPoolTemplate(Mockito.anyLong(), Mockito.anyLong(), nullable(String.class)); verifyInOrder.verify(dataStoreManagerImpl, Mockito.times(times)).getRandomImageStore(Mockito.anyLong()); verifyInOrder.verify(templateDataFactory, Mockito.times(times)).getTemplate(Mockito.anyLong(), Mockito.eq(sourceTemplateDataStore)); verifyInOrder.verify(templateDataFactory, Mockito.times(times)).getTemplate(Mockito.anyLong(), Mockito.eq(destDataStore)); diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java index 043af9a49ac..1590fe0bf7d 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java @@ -23,6 +23,9 @@ import java.util.List; import javax.inject.Inject; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.utils.StringUtils; +import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.direct.download.DirectDownloadManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -39,13 +42,11 @@ import org.springframework.stereotype.Component; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; -import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.DataStoreRole; import com.cloud.storage.VMTemplateStoragePoolVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplatePoolDao; -import com.cloud.utils.exception.CloudRuntimeException; @Component public class TemplateDataFactoryImpl implements TemplateDataFactory { @@ -65,17 +66,30 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory { @Inject PrimaryDataStoreDao primaryDataStoreDao; + @Override + public TemplateInfo getTemplateOnPrimaryStorage(long templateId, DataStore store, String configuration) { + VMTemplateVO templ = imageDataDao.findById(templateId); + if (store.getRole() == DataStoreRole.Primary) { + VMTemplateStoragePoolVO templatePoolVO = templatePoolDao.findByPoolTemplate(store.getId(), templateId, configuration); + if (templatePoolVO != null) { + String deployAsIsConfiguration = templatePoolVO.getDeploymentOption(); + return TemplateObject.getTemplate(templ, store, deployAsIsConfiguration); + } + } + return null; + } + @Override public TemplateInfo getTemplate(long templateId, DataStore store) { VMTemplateVO templ = imageDataDao.findById(templateId); if (store == null && !templ.isDirectDownload()) { - TemplateObject tmpl = TemplateObject.getTemplate(templ, null); + TemplateObject tmpl = TemplateObject.getTemplate(templ, null, null); return tmpl; } // verify if the given input parameters are consistent with our db data. boolean found = false; if (store.getRole() == DataStoreRole.Primary) { - VMTemplateStoragePoolVO templatePoolVO = templatePoolDao.findByPoolTemplate(store.getId(), templateId); + VMTemplateStoragePoolVO templatePoolVO = templatePoolDao.findByPoolTemplate(store.getId(), templateId, null); if (templatePoolVO != null) { found = true; } @@ -94,7 +108,7 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory { } } - TemplateObject tmpl = TemplateObject.getTemplate(templ, store); + TemplateObject tmpl = TemplateObject.getTemplate(templ, store, null); return tmpl; } @@ -130,8 +144,13 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory { } @Override - public TemplateInfo getTemplate(DataObject obj, DataStore store) { - TemplateObject tmpObj = (TemplateObject)this.getTemplate(obj.getId(), store); + public TemplateInfo getTemplate(DataObject obj, DataStore store, String configuration) { + TemplateObject tmpObj; + if (StringUtils.isNotBlank(configuration)) { + tmpObj = (TemplateObject)this.getTemplateOnPrimaryStorage(obj.getId(), store, configuration); + } else { + tmpObj = (TemplateObject)this.getTemplate(obj.getId(), store); + } // carry over url set in passed in data object, for copyTemplate case // where url is generated on demand and not persisted in DB. // need to think of a more generic way to pass these runtime information @@ -217,7 +236,7 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory { if (pool == null) { throw new CloudRuntimeException("No storage pool found where to download template: " + templateId); } - VMTemplateStoragePoolVO spoolRef = templatePoolDao.findByPoolTemplate(pool, templateId); + VMTemplateStoragePoolVO spoolRef = templatePoolDao.findByPoolTemplate(pool, templateId, null); if (spoolRef == null) { directDownloadManager.downloadTemplate(templateId, pool, hostId); } diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java index 00bc7e4208b..ed9359d952a 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java @@ -204,7 +204,7 @@ public class TemplateServiceImpl implements TemplateService { // clean up already persisted template_store_ref entry in case of createTemplateCallback is never called TemplateDataStoreVO templateStoreVO = _vmTemplateStoreDao.findByStoreTemplate(store.getId(), template.getId()); if (templateStoreVO != null) { - TemplateInfo tmplObj = _templateFactory.getTemplate(template, store); + TemplateInfo tmplObj = _templateFactory.getTemplate(template, store, null); tmplObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed); } TemplateApiResult result = new TemplateApiResult(template); @@ -412,7 +412,7 @@ public class TemplateServiceImpl implements TemplateService { VirtualMachineTemplate.Event event = VirtualMachineTemplate.Event.OperationSucceeded; // For multi-disk OVA, check and create data disk templates if (tmplt.getFormat().equals(ImageFormat.OVA)) { - if (!createOvaDataDiskTemplates(_templateFactory.getTemplate(tmlpt.getId(), store))) { + if (!createOvaDataDiskTemplates(_templateFactory.getTemplate(tmlpt.getId(), store), tmplt.isDeployAsIs())) { event = VirtualMachineTemplate.Event.OperationFailed; } } @@ -710,7 +710,7 @@ public class TemplateServiceImpl implements TemplateService { // For multi-disk OVA, check and create data disk templates if (template.getFormat().equals(ImageFormat.OVA)) { - if (!createOvaDataDiskTemplates(template)) { + if (!createOvaDataDiskTemplates(template, template.isDeployAsIs())) { template.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed); result.setResult(callbackResult.getResult()); if (parentCallback != null) { @@ -737,12 +737,18 @@ public class TemplateServiceImpl implements TemplateService { } @Override - public boolean createOvaDataDiskTemplates(TemplateInfo parentTemplate) { + public List getTemplateDatadisksOnImageStore(TemplateInfo templateInfo, String configurationId) { + ImageStoreEntity tmpltStore = (ImageStoreEntity)templateInfo.getDataStore(); + return tmpltStore.getDataDiskTemplates(templateInfo, configurationId); + } + + @Override + public boolean createOvaDataDiskTemplates(TemplateInfo parentTemplate, boolean deployAsIs) { try { // Get Datadisk template (if any) for OVA List dataDiskTemplates = new ArrayList(); ImageStoreEntity tmpltStore = (ImageStoreEntity)parentTemplate.getDataStore(); - dataDiskTemplates = tmpltStore.getDataDiskTemplates(parentTemplate); + dataDiskTemplates = tmpltStore.getDataDiskTemplates(parentTemplate, null); int diskCount = 0; VMTemplateVO templateVO = _templateDao.findById(parentTemplate.getId()); _templateDao.loadDetails(templateVO); @@ -754,23 +760,27 @@ public class TemplateServiceImpl implements TemplateService { details = new HashMap<>(); } } + for (DatadiskTO diskTemplate : dataDiskTemplates) { - if (!diskTemplate.isBootable()) { - createChildDataDiskTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++); - if (!diskTemplate.isIso() && Strings.isNullOrEmpty(details.get(VmDetailConstants.DATA_DISK_CONTROLLER))){ - details.put(VmDetailConstants.DATA_DISK_CONTROLLER, getOvaDiskControllerDetails(diskTemplate, false)); - details.put(VmDetailConstants.DATA_DISK_CONTROLLER + diskTemplate.getDiskId(), getOvaDiskControllerDetails(diskTemplate, false)); - } - } else { - finalizeParentTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++); - if (Strings.isNullOrEmpty(VmDetailConstants.ROOT_DISK_CONTROLLER)) { - final String rootDiskController = getOvaDiskControllerDetails(diskTemplate, true); - if (!Strings.isNullOrEmpty(rootDiskController)) { - details.put(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDiskController); + if (!deployAsIs) { + if (!diskTemplate.isBootable()) { + createChildDataDiskTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++); + if (!diskTemplate.isIso() && Strings.isNullOrEmpty(details.get(VmDetailConstants.DATA_DISK_CONTROLLER))){ + details.put(VmDetailConstants.DATA_DISK_CONTROLLER, getOvaDiskControllerDetails(diskTemplate, false)); + details.put(VmDetailConstants.DATA_DISK_CONTROLLER + diskTemplate.getDiskId(), getOvaDiskControllerDetails(diskTemplate, false)); + } + } else { + finalizeParentTemplate(diskTemplate, templateVO, parentTemplate, imageStore, diskCount++); + if (Strings.isNullOrEmpty(VmDetailConstants.ROOT_DISK_CONTROLLER)) { + final String rootDiskController = getOvaDiskControllerDetails(diskTemplate, true); + if (!Strings.isNullOrEmpty(rootDiskController)) { + details.put(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDiskController); + } } } } } + templateVO.setDetails(details); _templateDao.saveDetails(templateVO); return true; @@ -789,7 +799,7 @@ public class TemplateServiceImpl implements TemplateService { String templateName = dataDiskTemplate.isIso() ? dataDiskTemplate.getPath().substring(dataDiskTemplate.getPath().lastIndexOf(File.separator) + 1) : template.getName() + suffix + diskCount; VMTemplateVO templateVO = new VMTemplateVO(templateId, templateName, format, false, false, false, ttype, template.getUrl(), template.requiresHvm(), template.getBits(), template.getAccountId(), null, templateName, false, guestOsId, false, template.getHypervisorType(), null, - null, false, false, false); + null, false, false, false, false); if (dataDiskTemplate.isIso()){ templateVO.setUniqueName(templateName); } @@ -952,7 +962,7 @@ public class TemplateServiceImpl implements TemplateService { AsyncCallFuture future = new AsyncCallFuture(); // no need to create entry on template_store_ref here, since entries are already created when prepareSecondaryStorageForMigration is invoked. // But we need to set default install path so that sync can be done in the right s3 path - TemplateInfo templateOnStore = _templateFactory.getTemplate(template, store); + TemplateInfo templateOnStore = _templateFactory.getTemplate(template, store, null); String installPath = TemplateConstants.DEFAULT_TMPLT_ROOT_DIR + "/" + TemplateConstants.DEFAULT_TMPLT_FIRST_LEVEL_DIR + template.getAccountId() + "/" + template.getId() + "/" + template.getUniqueName(); @@ -1039,7 +1049,7 @@ public class TemplateServiceImpl implements TemplateService { throw new CloudRuntimeException("No secondary VM in running state in source template zone "); } - TemplateObject tmplForCopy = (TemplateObject)_templateFactory.getTemplate(srcTemplate, destStore); + TemplateObject tmplForCopy = (TemplateObject)_templateFactory.getTemplate(srcTemplate, destStore, null); if (s_logger.isDebugEnabled()) { s_logger.debug("Setting source template url to " + url); } @@ -1068,7 +1078,7 @@ public class TemplateServiceImpl implements TemplateService { // clean up already persisted template_store_ref entry in case of createTemplateCallback is never called TemplateDataStoreVO templateStoreVO = _vmTemplateStoreDao.findByStoreTemplate(destStore.getId(), srcTemplate.getId()); if (templateStoreVO != null) { - TemplateInfo tmplObj = _templateFactory.getTemplate(srcTemplate, destStore); + TemplateInfo tmplObj = _templateFactory.getTemplate(srcTemplate, destStore, null); tmplObj.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed); } TemplateApiResult res = new TemplateApiResult((TemplateObject)templateOnStore); @@ -1130,7 +1140,7 @@ public class TemplateServiceImpl implements TemplateService { @Override public AsyncCallFuture deleteTemplateOnPrimary(TemplateInfo template, StoragePool pool) { - TemplateObject templateObject = (TemplateObject)_templateFactory.getTemplate(template.getId(), (DataStore)pool); + TemplateObject templateObject = (TemplateObject)_templateFactory.getTemplateOnPrimaryStorage(template.getId(), (DataStore)pool, template.getDeployAsIsConfiguration()); templateObject.processEvent(ObjectInDataStoreStateMachine.Event.DestroyRequested); @@ -1241,7 +1251,7 @@ public class TemplateServiceImpl implements TemplateService { dataDiskTemplateOnStore = (TemplateObject)store.create(dataDiskTemplate); dataDiskTemplateOnStore.processEvent(ObjectInDataStoreStateMachine.Event.CreateOnlyRequested); } else { - dataDiskTemplateOnStore = (TemplateObject) imageFactory.getTemplate(parentTemplate, store); + dataDiskTemplateOnStore = (TemplateObject) imageFactory.getTemplate(parentTemplate, store, null); } try { CreateDataDiskTemplateContext context = new CreateDataDiskTemplateContext(null, dataDiskTemplateOnStore, future); @@ -1261,7 +1271,7 @@ public class TemplateServiceImpl implements TemplateService { } protected Void createDatadiskTemplateCallback(AsyncCallbackDispatcher callback, - CreateDataDiskTemplateContext context) { + CreateDataDiskTemplateContext context) { DataObject dataDiskTemplate = context.dataDiskTemplate; AsyncCallFuture future = context.getFuture(); CreateCmdResult result = callback.getResult(); @@ -1280,4 +1290,4 @@ public class TemplateServiceImpl implements TemplateService { future.complete(dataDiskTemplateResult); return null; } -} +} \ No newline at end of file diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java index f54673d2b61..d4e2c056763 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/ImageStoreImpl.java @@ -218,8 +218,8 @@ public class ImageStoreImpl implements ImageStoreEntity { } @Override - public List getDataDiskTemplates(DataObject obj) { - return driver.getDataDiskTemplates(obj); + public List getDataDiskTemplates(DataObject obj, String configurationId) { + return driver.getDataDiskTemplates(obj, configurationId); } @Override diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java index 86030f226f6..b7a44cd4f08 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -63,6 +63,7 @@ public class TemplateObject implements TemplateInfo { private DataStore dataStore; private String url; private String installPath; // temporarily set installPath before passing to resource for entries with empty installPath for object store migration case + private String deployAsIsConfiguration; // Temporarily set @Inject VMTemplateDao imageDao; @Inject @@ -80,8 +81,9 @@ public class TemplateObject implements TemplateInfo { this.dataStore = dataStore; } - public static TemplateObject getTemplate(VMTemplateVO vo, DataStore store) { + public static TemplateObject getTemplate(VMTemplateVO vo, DataStore store, String configuration) { TemplateObject to = ComponentContext.inject(TemplateObject.class); + to.deployAsIsConfiguration = configuration; to.configure(vo, store); return to; } @@ -190,7 +192,9 @@ public class TemplateObject implements TemplateInfo { if (answer instanceof CopyCmdAnswer) { CopyCmdAnswer cpyAnswer = (CopyCmdAnswer)answer; TemplateObjectTO newTemplate = (TemplateObjectTO)cpyAnswer.getNewData(); - VMTemplateStoragePoolVO templatePoolRef = templatePoolDao.findByPoolTemplate(getDataStore().getId(), getId()); + + String deployAsIsConfiguration = newTemplate.getDeployAsIsConfiguration(); + VMTemplateStoragePoolVO templatePoolRef = templatePoolDao.findByPoolTemplate(getDataStore().getId(), getId(), deployAsIsConfiguration); templatePoolRef.setDownloadPercent(100); setTemplateSizeIfNeeded(newTemplate, templatePoolRef); @@ -327,6 +331,11 @@ public class TemplateObject implements TemplateInfo { return null; } + @Override + public String getDeployAsIsConfiguration() { + return deployAsIsConfiguration; + } + @Override public DataTO getTO() { DataTO to = null; @@ -365,6 +374,14 @@ public class TemplateObject implements TemplateInfo { return this.imageVO.isDirectDownload(); } + @Override + public boolean isDeployAsIs() { + if (this.imageVO == null) { + return false; + } + return this.imageVO.isDeployAsIs(); + } + public void setInstallPath(String installPath) { this.installPath = installPath; } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java index 2caa3ef3f41..777eb376cb6 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java @@ -76,7 +76,7 @@ public class DataObjectManagerImpl implements DataObjectManager { s_logger.debug("waiting too long for template downloading, marked it as failed"); throw new CloudRuntimeException("waiting too long for template downloading, marked it as failed"); } - return objectInDataStoreMgr.get(dataObj, dataStore); + return objectInDataStoreMgr.get(dataObj, dataStore, null); } class CreateContext extends AsyncRpcContext { diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java index 8f081d3af39..48acecab6b8 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManager.java @@ -33,11 +33,11 @@ public interface ObjectInDataStoreManager { boolean deleteIfNotReady(DataObject dataObj); - DataObject get(DataObject dataObj, DataStore store); + DataObject get(DataObject dataObj, DataStore store, String configuration); boolean update(DataObject vo, Event event) throws NoTransitionException, ConcurrentOperationException; - DataObjectInStore findObject(long objId, DataObjectType type, long dataStoreId, DataStoreRole role); + DataObjectInStore findObject(long objId, DataObjectType type, long dataStoreId, DataStoreRole role, String deployAsIsConfiguration); DataObjectInStore findObject(DataObject obj, DataStore store); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index ff8112cceff..da97b22946e 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -118,7 +118,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { public DataObject create(DataObject obj, DataStore dataStore) { if (dataStore.getRole() == DataStoreRole.Primary) { if (obj.getType() == DataObjectType.TEMPLATE) { - VMTemplateStoragePoolVO vo = new VMTemplateStoragePoolVO(dataStore.getId(), obj.getId()); + VMTemplateStoragePoolVO vo = new VMTemplateStoragePoolVO(dataStore.getId(), obj.getId(), null); vo = templatePoolDao.persist(vo); } else if (obj.getType() == DataObjectType.SNAPSHOT) { SnapshotInfo snapshotInfo = (SnapshotInfo)obj; @@ -197,7 +197,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { } } - return this.get(obj, dataStore); + return this.get(obj, dataStore, null); } @Override @@ -206,7 +206,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { DataStore dataStore = dataObj.getDataStore(); if (dataStore.getRole() == DataStoreRole.Primary) { if (dataObj.getType() == DataObjectType.TEMPLATE) { - VMTemplateStoragePoolVO destTmpltPool = templatePoolDao.findByPoolTemplate(dataStore.getId(), objId); + VMTemplateStoragePoolVO destTmpltPool = templatePoolDao.findByPoolTemplate(dataStore.getId(), objId, null); if (destTmpltPool != null) { return templatePoolDao.remove(destTmpltPool.getId()); } else { @@ -254,7 +254,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { DataStore dataStore = dataObj.getDataStore(); if (dataStore.getRole() == DataStoreRole.Primary) { if (dataObj.getType() == DataObjectType.TEMPLATE) { - VMTemplateStoragePoolVO destTmpltPool = templatePoolDao.findByPoolTemplate(dataStore.getId(), objId); + VMTemplateStoragePoolVO destTmpltPool = templatePoolDao.findByPoolTemplate(dataStore.getId(), objId, null); if (destTmpltPool != null && destTmpltPool.getState() != ObjectInDataStoreStateMachine.State.Ready) { return templatePoolDao.remove(destTmpltPool.getId()); } else { @@ -333,9 +333,9 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { } @Override - public DataObject get(DataObject dataObj, DataStore store) { + public DataObject get(DataObject dataObj, DataStore store, String configuration) { if (dataObj.getType() == DataObjectType.TEMPLATE) { - return imageFactory.getTemplate(dataObj, store); + return imageFactory.getTemplate(dataObj, store, configuration); } else if (dataObj.getType() == DataObjectType.VOLUME) { return volumeFactory.getVolume(dataObj, store); } else if (dataObj.getType() == DataObjectType.SNAPSHOT) { @@ -347,11 +347,15 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { @Override public DataObjectInStore findObject(DataObject obj, DataStore store) { - return findObject(obj.getId(), obj.getType(), store.getId(), store.getRole()); + String deployAsIsConfiguration = null; + if (obj.getType() == DataObjectType.TEMPLATE) { + deployAsIsConfiguration = ((TemplateInfo) obj).getDeployAsIsConfiguration(); + } + return findObject(obj.getId(), obj.getType(), store.getId(), store.getRole(), deployAsIsConfiguration); } @Override - public DataObjectInStore findObject(long objId, DataObjectType type, long dataStoreId, DataStoreRole role) { + public DataObjectInStore findObject(long objId, DataObjectType type, long dataStoreId, DataStoreRole role, String deployAsIsConfiguration) { DataObjectInStore vo = null; if (role == DataStoreRole.Image || role == DataStoreRole.ImageCache) { switch (type) { @@ -366,7 +370,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { break; } } else if (type == DataObjectType.TEMPLATE && role == DataStoreRole.Primary) { - vo = templatePoolDao.findByPoolTemplate(dataStoreId, objId); + vo = templatePoolDao.findByPoolTemplate(dataStoreId, objId, deployAsIsConfiguration); } else if (type == DataObjectType.SNAPSHOT && role == DataStoreRole.Primary) { vo = snapshotDataStoreDao.findByStoreSnapshot(role, dataStoreId, objId); } else { diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java index 2341603803e..77d97793405 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java @@ -18,6 +18,7 @@ */ package org.apache.cloudstack.storage.image; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.sql.PreparedStatement; @@ -32,6 +33,21 @@ import java.util.stream.Collectors; import javax.inject.Inject; +import com.cloud.agent.api.storage.OVFConfigurationTO; +import com.cloud.agent.api.storage.OVFEulaSectionTO; +import com.cloud.agent.api.storage.OVFPropertyTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareItemTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareSectionTO; +import com.cloud.storage.ImageStore; +import com.cloud.storage.Upload; +import com.cloud.storage.VMTemplateDetailVO; +import com.cloud.utils.compression.CompressionUtil; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; @@ -51,8 +67,6 @@ import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector; -import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -60,11 +74,9 @@ import com.cloud.agent.api.storage.CreateDatadiskTemplateCommand; import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.agent.api.storage.GetDatadisksAnswer; import com.cloud.agent.api.storage.GetDatadisksCommand; -import com.cloud.agent.api.storage.OVFPropertyTO; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataTO; import com.cloud.agent.api.to.DatadiskTO; -import com.cloud.agent.api.to.NfsTO; import com.cloud.alert.AlertManager; import com.cloud.configuration.Config; import com.cloud.exception.AgentUnavailableException; @@ -72,14 +84,10 @@ import com.cloud.exception.OperationTimedoutException; import com.cloud.host.dao.HostDao; import com.cloud.secstorage.CommandExecLogDao; import com.cloud.secstorage.CommandExecLogVO; -import com.cloud.storage.DataStoreRole; import com.cloud.storage.StorageManager; -import com.cloud.storage.TemplateOVFPropertyVO; -import com.cloud.storage.Upload; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.TemplateOVFPropertiesDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateDetailsDao; import com.cloud.storage.dao.VMTemplateZoneDao; @@ -88,14 +96,14 @@ import com.cloud.storage.download.DownloadMonitor; import com.cloud.user.ResourceLimitService; import com.cloud.user.dao.AccountDao; import com.cloud.utils.NumbersUtil; -import com.cloud.utils.crypt.DBEncryptionUtil; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.Proxy; import com.cloud.vm.dao.SecondaryStorageVmDao; public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { - private static final Logger s_logger = Logger.getLogger(BaseImageStoreDriverImpl.class); + private static final Logger LOGGER = Logger.getLogger(BaseImageStoreDriverImpl.class); + @Inject protected VMTemplateDao _templateDao; @Inject @@ -115,7 +123,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { @Inject AlertManager _alertMgr; @Inject - VMTemplateDetailsDao _templateDetailsDao; + VMTemplateDetailsDao templateDetailsDao; @Inject DefaultEndPointSelector _defaultEpSelector; @Inject @@ -123,8 +131,6 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { @Inject ResourceLimitService _resourceLimitMgr; @Inject - TemplateOVFPropertiesDao templateOvfPropertiesDao; - @Inject HostDao hostDao; @Inject CommandExecLogDao _cmdExecLogDao; @@ -137,6 +143,14 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { protected String _proxy = null; + private static Gson gson; + + static { + GsonBuilder builder = new GsonBuilder(); + builder.disableHtmlEscaping(); + gson = builder.create(); + } + protected Proxy getHttpProxy() { if (_proxy == null) { return null; @@ -184,14 +198,14 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { caller.setContext(context); if (data.getType() == DataObjectType.TEMPLATE) { caller.setCallback(caller.getTarget().createTemplateAsyncCallback(null, null)); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Downloading template to data store " + dataStore.getId()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Downloading template to data store " + dataStore.getId()); } _downloadMonitor.downloadTemplateToStorage(data, caller); } else if (data.getType() == DataObjectType.VOLUME) { caller.setCallback(caller.getTarget().createVolumeAsyncCallback(null, null)); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Downloading volume to data store " + dataStore.getId()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Downloading volume to data store " + dataStore.getId()); } _downloadMonitor.downloadVolumeToStorage(data, caller); } @@ -201,43 +215,108 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { * Persist OVF properties as template details for template with id = templateId */ private void persistOVFProperties(List ovfProperties, long templateId) { - List listToPersist = new ArrayList<>(); - for (OVFPropertyTO property : ovfProperties) { - if (!templateOvfPropertiesDao.existsOption(templateId, property.getKey())) { - TemplateOVFPropertyVO option = new TemplateOVFPropertyVO(templateId, property.getKey(), property.getType(), - property.getValue(), property.getQualifiers(), property.isUserConfigurable(), - property.getLabel(), property.getDescription(), property.isPassword()); - if (property.isPassword()) { - String encryptedPassword = DBEncryptionUtil.encrypt(property.getValue()); - option.setValue(encryptedPassword); - } - listToPersist.add(option); - } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving properties for template %d as details", templateId)); } - if (CollectionUtils.isNotEmpty(listToPersist)) { - s_logger.debug("Persisting " + listToPersist.size() + " OVF properties for template " + templateId); - templateOvfPropertiesDao.saveOptions(listToPersist); + for (OVFPropertyTO property : ovfProperties) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving property %s for template %d as detail", property.getKey(), templateId)); + } + persistOvfPropertyAsSetOfTemplateDetails(templateId, property); } } + private void persistOvfPropertyAsSetOfTemplateDetails(long templateId, OVFPropertyTO property) { + String key = property.getKey(); + String propKey = ImageStore.ACS_PROPERTY_PREFIX + key; + try { + String propValue = gson.toJson(property); + savePropertyAttribute(templateId, propKey, propValue); + } catch (RuntimeException re) { + LOGGER.error("gson marshalling of property object fails: " + propKey,re); + } + } + + private void persistNetworkRequirements(List networkRequirements, long templateId) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving network requirements for template %d as details", templateId)); + } + for (NetworkPrerequisiteTO network : networkRequirements) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving property %s for template %d as detail", network.getName(), templateId)); + } + persistRequiredNetworkAsASingleTemplateDetail(templateId, network); + } + } + + private void persistDiskDefinitions(List disks, long templateId) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving disk definitionsn for template %d as details", templateId)); + } + for (DatadiskTO disk : disks) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving property %s for template %d as detail", disk.getDiskId(), templateId)); + } + persistDiskDefinitionAsASingleTemplateDetail(templateId, disk); + } + } + + private void persistRequiredNetworkAsASingleTemplateDetail(long templateId, NetworkPrerequisiteTO network) { + String key = network.getName(); + String propKey = ImageStore.REQUIRED_NETWORK_PREFIX + key; + try { + String propValue = gson.toJson(network); + savePropertyAttribute(templateId, propKey, propValue); + } catch (RuntimeException re) { + LOGGER.warn("gson marshalling of network object fails: " + propKey,re); + } + } + + private void persistDiskDefinitionAsASingleTemplateDetail(long templateId, DatadiskTO disk) { + String key = disk.getDiskId(); + String propKey = ImageStore.DISK_DEFINITION_PREFIX + key; + try { + String propValue = gson.toJson(disk); + savePropertyAttribute(templateId, propKey, propValue); + } catch (RuntimeException re) { + LOGGER.warn("gson marshalling of disk definition object fails: " + propKey,re); + } + } + + private void savePropertyAttribute(long templateId, String key, String value) { + if ( templateDetailsDao.findDetail(templateId,key) != null) { + LOGGER.debug(String.format("detail '%s' existed for template %d, deleting.", key, templateId)); + templateDetailsDao.removeDetail(templateId,key); + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("template detail for template %d to save is '%s': '%s'", templateId, key, value)); + } + VMTemplateDetailVO detailVO = new VMTemplateDetailVO(templateId, key, value, false); + LOGGER.debug("Persisting template details " + detailVO.getName() + " from OVF properties for template " + templateId); + templateDetailsDao.persist(detailVO); + } + protected Void createTemplateAsyncCallback(AsyncCallbackDispatcher callback, - CreateContext context) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Performing image store createTemplate async callback"); + CreateContext context) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Performing image store createTemplate async callback"); } DownloadAnswer answer = callback.getResult(); DataObject obj = context.data; DataStore store = obj.getDataStore(); List ovfProperties = answer.getOvfProperties(); + List networkRequirements = answer.getNetworkRequirements(); + List disks = answer.getDisks(); + OVFVirtualHardwareSectionTO ovfHardwareSection = answer.getOvfHardwareSection(); + List eulaSections = answer.getEulaSections(); + VMTemplateVO template = _templateDao.findById(obj.getId()); TemplateDataStoreVO tmpltStoreVO = _templateStoreDao.findByStoreTemplate(store.getId(), obj.getId()); if (tmpltStoreVO != null) { if (tmpltStoreVO.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { - if (CollectionUtils.isNotEmpty(ovfProperties)) { - persistOVFProperties(ovfProperties, obj.getId()); - } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Template is already in DOWNLOADED state, ignore further incoming DownloadAnswer"); + persistExtraDetails(obj, ovfProperties, networkRequirements, disks, ovfHardwareSection, eulaSections); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Template is already in DOWNLOADED state, ignore further incoming DownloadAnswer"); } return null; } @@ -261,23 +340,21 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { AsyncCompletionCallback caller = context.getParentCallback(); if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || - answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { + answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); result.setResult(answer.getErrorString()); caller.complete(result); String msg = "Failed to register template: " + obj.getUuid() + " with error: " + answer.getErrorString(); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED, _vmTemplateZoneDao.listByTemplateId(obj.getId()).get(0).getZoneId(), null, msg, msg); - s_logger.error(msg); + LOGGER.error(msg); } else if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { if (answer.getCheckSum() != null) { VMTemplateVO templateDaoBuilder = _templateDao.createForUpdate(); templateDaoBuilder.setChecksum(answer.getCheckSum()); _templateDao.update(obj.getId(), templateDaoBuilder); } - if (CollectionUtils.isNotEmpty(ovfProperties)) { - persistOVFProperties(ovfProperties, obj.getId()); - } + persistExtraDetails(obj, ovfProperties, networkRequirements, disks, ovfHardwareSection, eulaSections); CreateCmdResult result = new CreateCmdResult(null, null); caller.complete(result); @@ -285,8 +362,78 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { return null; } + private void persistExtraDetails(DataObject obj, List ovfProperties, List networkRequirements, List disks, OVFVirtualHardwareSectionTO ovfHardwareSection, List eulaSections) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving %d ovf properties for template '%s' as details", ovfProperties != null ? ovfProperties.size() : 0, obj.getUuid())); + } + if (CollectionUtils.isNotEmpty(ovfProperties)) { + persistOVFProperties(ovfProperties, obj.getId()); + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving %d required network requirements for template '%s' as details", networkRequirements != null ? networkRequirements.size() : 0, obj.getUuid())); + } + if (CollectionUtils.isNotEmpty(networkRequirements)) { + persistNetworkRequirements(networkRequirements, obj.getId()); + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("saving %d disks definitions for template '%s' as details", disks != null ? disks.size() : 0, obj.getUuid())); + } + if (CollectionUtils.isNotEmpty(disks)) { + persistDiskDefinitions(disks, obj.getId()); + } + if (CollectionUtils.isNotEmpty(eulaSections)) { + persistEulaSectionsAsTemplateDetails(eulaSections, obj.getId()); + } + persistOVFHardwareSectionAsTemplateDetails(ovfHardwareSection, obj.getId()); + } + + private void persistEulaSectionsAsTemplateDetails(List eulaSections, long templateId) { + CompressionUtil compressionUtil = new CompressionUtil(); + for (OVFEulaSectionTO eulaSectionTO : eulaSections) { + String key = ImageStore.OVF_EULA_SECTION_PREFIX + eulaSectionTO.getIndex() + "-" + eulaSectionTO.getInfo(); + byte[] compressedLicense = eulaSectionTO.getCompressedLicense(); + try { + String detailValue = compressionUtil.decompressByteArary(compressedLicense); + savePropertyAttribute(templateId, key, detailValue); + } catch (IOException e) { + LOGGER.error("Could not decompress the license for template " + templateId, e); + } + } + } + + /** + * Persist template details for template with ID=templateId, with name=key and value=json(object) + */ + private void persistTemplateDetailGsonEncoded(long templateId, String key, Object object) { + try { + String propValue = gson.toJson(object); + savePropertyAttribute(templateId, key, propValue); + } catch (RuntimeException re) { + LOGGER.error("gson marshalling of property object fails: " + key, re); + } + } + + private void persistOVFHardwareSectionAsTemplateDetails(OVFVirtualHardwareSectionTO ovfHardwareSection, long templateId) { + if (ovfHardwareSection != null) { + if (CollectionUtils.isNotEmpty(ovfHardwareSection.getConfigurations())) { + for (OVFConfigurationTO configuration : ovfHardwareSection.getConfigurations()) { + String key = configuration.getId(); + String propKey = ImageStore.OVF_HARDWARE_CONFIGURATION_PREFIX + configuration.getIndex() + "-" + key; + persistTemplateDetailGsonEncoded(templateId, propKey, configuration); + } + } + if (CollectionUtils.isNotEmpty(ovfHardwareSection.getCommonHardwareItems())) { + for (OVFVirtualHardwareItemTO item : ovfHardwareSection.getCommonHardwareItems()) { + String key = item.getResourceType().getName().trim().replaceAll("\\s","") + "-" + item.getInstanceId(); + String propKey = ImageStore.OVF_HARDWARE_ITEM_PREFIX + key; + persistTemplateDetailGsonEncoded(templateId, propKey, item); + } + } + } + } + protected Void - createVolumeAsyncCallback(AsyncCallbackDispatcher callback, CreateContext context) { + createVolumeAsyncCallback(AsyncCallbackDispatcher callback, CreateContext context) { DownloadAnswer answer = callback.getResult(); DataObject obj = context.data; DataStore store = obj.getDataStore(); @@ -294,8 +441,8 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { VolumeDataStoreVO volStoreVO = _volumeStoreDao.findByStoreVolume(store.getId(), obj.getId()); if (volStoreVO != null) { if (volStoreVO.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Volume is already in DOWNLOADED state, ignore further incoming DownloadAnswer"); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Volume is already in DOWNLOADED state, ignore further incoming DownloadAnswer"); } return null; } @@ -319,7 +466,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { AsyncCompletionCallback caller = context.getParentCallback(); if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_ERROR || - answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { + answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.ABANDONED || answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.UNKNOWN) { CreateCmdResult result = new CreateCmdResult(null, null); result.setSuccess(false); result.setResult(answer.getErrorString()); @@ -327,7 +474,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { String msg = "Failed to upload volume: " + obj.getUuid() + " with error: " + answer.getErrorString(); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPLOAD_FAILED, (volStoreVO == null ? -1L : volStoreVO.getZoneId()), null, msg, msg); - s_logger.error(msg); + LOGGER.error(msg); } else if (answer.getDownloadStatus() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { CreateCmdResult result = new CreateCmdResult(null, null); caller.complete(result); @@ -344,7 +491,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { Answer answer = null; if (ep == null) { String errMsg = "No remote endpoint to send command, check if host or ssvm is down?"; - s_logger.error(errMsg); + LOGGER.error(errMsg); answer = new Answer(cmd, false, errMsg); } else { answer = ep.sendMessage(cmd); @@ -353,7 +500,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { result.setResult(answer.getDetails()); } } catch (Exception ex) { - s_logger.debug("Unable to destoy " + data.getType().toString() + ": " + data.getId(), ex); + LOGGER.debug("Unable to destoy " + data.getType().toString() + ": " + data.getId(), ex); result.setResult(ex.toString()); } callback.complete(result); @@ -377,7 +524,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { List eps = _epSelector.findAllEndpointsForScope(srcdata.getDataStore()); if (eps == null || eps.isEmpty()) { String errMsg = "No remote endpoint to send command, check if host or ssvm is down?"; - s_logger.error(errMsg); + LOGGER.error(errMsg); answer = new Answer(cmd, false, errMsg); } else { // select endpoint with least number of commands running on them @@ -414,25 +561,16 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { return answer; } catch (AgentUnavailableException e) { errMsg = e.toString(); - s_logger.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); + LOGGER.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); } catch (OperationTimedoutException e) { errMsg = e.toString(); - s_logger.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); + LOGGER.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); } throw new CloudRuntimeException("Failed to send command, due to Agent:" + endPoint.getId() + ", " + errMsg); } @Override public boolean canCopy(DataObject srcData, DataObject destData) { - DataStore srcStore = srcData.getDataStore(); - DataStore destStore = destData.getDataStore(); - if ((srcData.getDataStore().getTO() instanceof NfsTO && destData.getDataStore().getTO() instanceof NfsTO) && - (srcStore.getRole() == DataStoreRole.Image && destStore.getRole() == DataStoreRole.Image) && - ((srcData.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.TEMPLATE) || - (srcData.getType() == DataObjectType.SNAPSHOT && destData.getType() == DataObjectType.SNAPSHOT) || - (srcData.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME))) { - return true; - } return false; } @@ -445,18 +583,18 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { } @Override - public List getDataDiskTemplates(DataObject obj) { + public List getDataDiskTemplates(DataObject obj, String configurationId) { List dataDiskDetails = new ArrayList(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Get the data disks present in the OVA template"); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Get the data disks present in the OVA template"); } DataStore store = obj.getDataStore(); - GetDatadisksCommand cmd = new GetDatadisksCommand(obj.getTO()); + GetDatadisksCommand cmd = new GetDatadisksCommand(obj.getTO(), configurationId); EndPoint ep = _defaultEpSelector.select(store); Answer answer = null; if (ep == null) { String errMsg = "No remote endpoint to send command, check if host or ssvm is down?"; - s_logger.error(errMsg); + LOGGER.error(errMsg); answer = new Answer(cmd, false, errMsg); } else { answer = ep.sendMessage(cmd); @@ -475,14 +613,14 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { public Void createDataDiskTemplateAsync(TemplateInfo dataDiskTemplate, String path, String diskId, boolean bootable, long fileSize, AsyncCompletionCallback callback) { Answer answer = null; String errMsg = null; - if (s_logger.isDebugEnabled()) { - s_logger.debug("Create Datadisk template: " + dataDiskTemplate.getId()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Create Datadisk template: " + dataDiskTemplate.getId()); } CreateDatadiskTemplateCommand cmd = new CreateDatadiskTemplateCommand(dataDiskTemplate.getTO(), path, diskId, fileSize, bootable); EndPoint ep = _defaultEpSelector.select(dataDiskTemplate.getDataStore()); if (ep == null) { errMsg = "No remote endpoint to send command, check if host or ssvm is down?"; - s_logger.error(errMsg); + LOGGER.error(errMsg); answer = new Answer(cmd, false, errMsg); } else { answer = ep.sendMessage(cmd); @@ -496,8 +634,12 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { return null; } + private Integer getCopyCmdsCountToSpecificSSVM(Long ssvmId) { + return _cmdExecLogDao.getCopyCmdCountForSSVM(ssvmId); + } + private List ssvmWithLeastMigrateJobs() { - s_logger.debug("Picking ssvm from the pool with least commands running on it"); + LOGGER.debug("Picking ssvm from the pool with least commands running on it"); String query = "select host_id, count(*) from cmd_exec_log group by host_id order by 2;"; TransactionLegacy txn = TransactionLegacy.currentTxn(); @@ -510,7 +652,7 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { result.add((long) rs.getInt(1)); } } catch (SQLException e) { - s_logger.debug("SQLException caught", e); + LOGGER.debug("SQLException caught", e); } return result; } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java index 70f40f6f5c0..29071d8e5bb 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/ImageStoreDriver.java @@ -37,7 +37,7 @@ public interface ImageStoreDriver extends DataStoreDriver { void deleteEntityExtractUrl(DataStore store, String installPath, String url, Upload.Type entityType); - List getDataDiskTemplates(DataObject obj); + List getDataDiskTemplates(DataObject obj, String configurationId); Void createDataDiskTemplateAsync(TemplateInfo dataDiskTemplate, String path, String diskId, boolean bootable, long fileSize, AsyncCompletionCallback callback); } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java deleted file mode 100644 index b027c42a86e..00000000000 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/TemplateEntityImpl.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * 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 org.apache.cloudstack.storage.image; - -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.cloudstack.engine.cloud.entity.api.TemplateEntity; -import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; -import org.apache.cloudstack.storage.image.datastore.ImageStoreInfo; - -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.storage.Storage.ImageFormat; -import com.cloud.storage.Storage.TemplateType; -import com.cloud.template.VirtualMachineTemplate; - -public class TemplateEntityImpl implements TemplateEntity { - protected TemplateInfo templateInfo; - - @Override - public State getState() { - return templateInfo.getState(); - } - - public TemplateEntityImpl(TemplateInfo templateInfo) { - this.templateInfo = templateInfo; - } - - public ImageStoreInfo getImageDataStore() { - return (ImageStoreInfo)templateInfo.getDataStore(); - } - - public long getImageDataStoreId() { - return getImageDataStore().getImageStoreId(); - } - - public TemplateInfo getTemplateInfo() { - return templateInfo; - } - - @Override - public String getUuid() { - return templateInfo.getUuid(); - } - - @Override - public long getId() { - return templateInfo.getId(); - } - - public String getExternalId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getCreatedTime() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getLastUpdatedTime() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getOwner() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getDetails() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isDynamicallyScalable() { - return false; - } - - @Override - public void addDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void updateDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isFeatured() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isPublicTemplate() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isExtractable() { - // TODO Auto-generated method stub - return false; - } - - @Override - public String getName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ImageFormat getFormat() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isRequiresHvm() { - // TODO Auto-generated method stub - return false; - } - - @Override - public String getDisplayText() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isEnablePassword() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isEnableSshKey() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isCrossZones() { - // TODO Auto-generated method stub - return false; - } - - @Override - public Date getCreated() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getGuestOSId() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean isBootable() { - // TODO Auto-generated method stub - return false; - } - - @Override - public TemplateType getTemplateType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HypervisorType getHypervisorType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getBits() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getUniqueName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getUrl() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getChecksum() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Long getSourceTemplateId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getTemplateTag() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getAccountId() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public long getDomainId() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public long getPhysicalSize() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public long getVirtualSize() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public Class getEntityType() { - return VirtualMachineTemplate.class; - } - - @Override - public long getUpdatedCount() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void incrUpdatedCount() { - // TODO Auto-generated method stub - } - - @Override - public Date getUpdated() { - return null; - } - - @Override - public Long getParentTemplateId() { - return null; - } -} diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java index 16c3396884e..18a7f3c4890 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java @@ -218,12 +218,12 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore { } @Override - public TemplateInfo getTemplate(long templateId) { - VMTemplateStoragePoolVO template = templatePoolDao.findByPoolTemplate(getId(), templateId); + public TemplateInfo getTemplate(long templateId, String configuration) { + VMTemplateStoragePoolVO template = templatePoolDao.findByPoolTemplate(getId(), templateId, configuration); if (template == null || template.getState() != ObjectInDataStoreStateMachine.State.Ready) { return null; } - return imageDataFactory.getTemplate(templateId, this); + return imageDataFactory.getTemplateOnPrimaryStorage(templateId, this, configuration); } @Override @@ -264,18 +264,26 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore { */ @Override public DataObject create(DataObject dataObject) { - return create(dataObject, true); + return create(dataObject, true, null); + } + + @Override + public DataObject create(DataObject dataObject, String configuration) { + return create(dataObject, true, configuration); } /** * Please read the comment for the create(DataObject) method if you are planning on passing in "false" for createEntryInTempSpoolRef. + * + * The parameter configuration allows storing multiple configurations of the + * base template appliance in primary storage (VMware supported) - null by default or no configurations */ @Override - public DataObject create(DataObject obj, boolean createEntryInTempSpoolRef) { + public DataObject create(DataObject obj, boolean createEntryInTempSpoolRef, String configuration) { // create template on primary storage if (obj.getType() == DataObjectType.TEMPLATE && (!isManaged() || (createEntryInTempSpoolRef && canCloneVolume()))) { try { - String templateIdPoolIdString = "templateId:" + obj.getId() + "poolId:" + getId(); + String templateIdPoolIdString = "templateId:" + obj.getId() + "poolId:" + getId() + "conf:" + configuration; VMTemplateStoragePoolVO templateStoragePoolRef; GlobalLock lock = GlobalLock.getInternLock(templateIdPoolIdString); if (!lock.lock(5)) { @@ -283,20 +291,20 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore { return null; } try { - templateStoragePoolRef = templatePoolDao.findByPoolTemplate(getId(), obj.getId()); + templateStoragePoolRef = templatePoolDao.findByPoolTemplate(getId(), obj.getId(), configuration); if (templateStoragePoolRef == null) { if (s_logger.isDebugEnabled()) { s_logger.debug("Not found (" + templateIdPoolIdString + ") in template_spool_ref, persisting it"); } - templateStoragePoolRef = new VMTemplateStoragePoolVO(getId(), obj.getId()); + templateStoragePoolRef = new VMTemplateStoragePoolVO(getId(), obj.getId(), configuration); templateStoragePoolRef = templatePoolDao.persist(templateStoragePoolRef); } } catch (Throwable t) { if (s_logger.isDebugEnabled()) { s_logger.debug("Failed to insert (" + templateIdPoolIdString + ") to template_spool_ref", t); } - templateStoragePoolRef = templatePoolDao.findByPoolTemplate(getId(), obj.getId()); + templateStoragePoolRef = templatePoolDao.findByPoolTemplate(getId(), obj.getId(), configuration); if (templateStoragePoolRef == null) { throw new CloudRuntimeException("Failed to create template storage pool entry"); } else { @@ -321,7 +329,7 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore { } } - return objectInStoreMgr.get(obj, this); + return objectInStoreMgr.get(obj, this, configuration); } @Override diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java index 76e59d82856..d2a771d46a5 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -20,6 +20,14 @@ import java.util.Date; import javax.inject.Inject; +import com.cloud.storage.MigrationOptions; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.VolumeDetailVO; +import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.storage.dao.VolumeDetailsDao; +import com.cloud.vm.VmDetailConstants; +import org.apache.log4j.Logger; + import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -30,7 +38,6 @@ import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.to.VolumeObjectTO; -import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.DownloadAnswer; @@ -71,6 +78,10 @@ public class VolumeObject implements VolumeInfo { VMInstanceDao vmInstanceDao; @Inject DiskOfferingDao diskOfferingDao; + @Inject + VMTemplateDao templateDao; + @Inject + VolumeDetailsDao volumeDetailsDao; private Object payload; private MigrationOptions migrationOptions; private boolean directDownload; @@ -357,7 +368,7 @@ public class VolumeObject implements VolumeInfo { if (dataStore == null) { throw new CloudRuntimeException("datastore must be set before using this object"); } - DataObjectInStore obj = objectInStoreMgr.findObject(volumeVO.getId(), DataObjectType.VOLUME, dataStore.getId(), dataStore.getRole()); + DataObjectInStore obj = objectInStoreMgr.findObject(volumeVO.getId(), DataObjectType.VOLUME, dataStore.getId(), dataStore.getRole(), null); if (obj.getState() != ObjectInDataStoreStateMachine.State.Ready) { return dataStore.getUri() + "&" + EncodingType.OBJTYPE + "=" + DataObjectType.VOLUME + "&" + EncodingType.SIZE + "=" + volumeVO.getSize() + "&" + EncodingType.NAME + "=" + volumeVO.getName(); @@ -391,9 +402,7 @@ public class VolumeObject implements VolumeInfo { if (event == ObjectInDataStoreStateMachine.Event.CreateOnlyRequested) { volEvent = Volume.Event.UploadRequested; } else if (event == ObjectInDataStoreStateMachine.Event.MigrationRequested) { - volEvent = Event.CopyRequested; - } else if (event == ObjectInDataStoreStateMachine.Event.MigrateDataRequested) { - return; + volEvent = Volume.Event.CopyRequested; } } else { if (event == ObjectInDataStoreStateMachine.Event.CreateRequested || event == ObjectInDataStoreStateMachine.Event.CreateOnlyRequested) { @@ -436,6 +445,18 @@ public class VolumeObject implements VolumeInfo { } } + @Override + public boolean isDeployAsIs() { + VMTemplateVO template = templateDao.findById(getTemplateId()); + return template != null && template.isDeployAsIs(); + } + + @Override + public String getDeployAsIsConfiguration() { + VolumeDetailVO detail = volumeDetailsDao.findDetail(getId(), VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION); + return detail != null ? detail.getValue() : null; + } + @Override public void processEventOnly(ObjectInDataStoreStateMachine.Event event) { try { diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 77413ad6c2b..3ccb7be8f60 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -121,6 +121,8 @@ import com.cloud.utils.db.GlobalLock; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine; +import static com.cloud.storage.resource.StorageProcessor.REQUEST_TEMPLATE_RELOAD; + @Component public class VolumeServiceImpl implements VolumeService { private static final Logger s_logger = Logger.getLogger(VolumeServiceImpl.class); @@ -458,7 +460,7 @@ public class VolumeServiceImpl implements VolumeService { private final AsyncCallFuture _future; public ManagedCreateBaseImageContext(AsyncCompletionCallback callback, VolumeInfo volumeInfo, PrimaryDataStore primaryDatastore, TemplateInfo templateInfo, - AsyncCallFuture future) { + AsyncCallFuture future) { super(callback); _volumeInfo = volumeInfo; @@ -493,7 +495,7 @@ public class VolumeServiceImpl implements VolumeService { long templatePoolId; public CreateBaseImageContext(AsyncCompletionCallback callback, VolumeInfo volume, PrimaryDataStore datastore, TemplateInfo srcTemplate, AsyncCallFuture future, - DataObject destObj, long templatePoolId) { + DataObject destObj, long templatePoolId) { super(callback); this.volume = volume; this.dataStore = datastore; @@ -530,7 +532,7 @@ public class VolumeServiceImpl implements VolumeService { int sleepTime = 120; int tries = storagePoolMaxWaitSeconds / sleepTime; while (tries > 0) { - TemplateInfo tmpl = store.getTemplate(template.getId()); + TemplateInfo tmpl = store.getTemplate(template.getId(), null); if (tmpl != null) { return tmpl; } @@ -546,9 +548,10 @@ public class VolumeServiceImpl implements VolumeService { @DB protected void createBaseImageAsync(VolumeInfo volume, PrimaryDataStore dataStore, TemplateInfo template, AsyncCallFuture future) { - DataObject templateOnPrimaryStoreObj = dataStore.create(template); + String deployAsIsConfiguration = volume.getDeployAsIsConfiguration(); + DataObject templateOnPrimaryStoreObj = dataStore.create(template, deployAsIsConfiguration); - VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(dataStore.getId(), template.getId()); + VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(dataStore.getId(), template.getId(), deployAsIsConfiguration); if (templatePoolRef == null) { throw new CloudRuntimeException("Failed to find template " + template.getUniqueName() + " in storage pool " + dataStore.getId()); } else { @@ -571,8 +574,8 @@ public class VolumeServiceImpl implements VolumeService { if (s_logger.isDebugEnabled()) { s_logger.info("Unable to acquire lock on VMTemplateStoragePool " + templatePoolRefId); } - templatePoolRef = _tmpltPoolDao.findByPoolTemplate(dataStore.getId(), template.getId()); - if (templatePoolRef != null && templatePoolRef.getState() == ObjectInDataStoreStateMachine.State.Ready) { + templatePoolRef = _tmpltPoolDao.findByPoolTemplate(dataStore.getId(), template.getId(), deployAsIsConfiguration); + if (templatePoolRef != null && templatePoolRef.getState() == ObjectInDataStoreStateMachine.State.Ready && !template.isDeployAsIs()) { s_logger.info( "Unable to acquire lock on VMTemplateStoragePool " + templatePoolRefId + ", But Template " + template.getUniqueName() + " is already copied to primary storage, skip copying"); createVolumeFromBaseImageAsync(volume, templateOnPrimaryStoreObj, dataStore, future); @@ -585,7 +588,7 @@ public class VolumeServiceImpl implements VolumeService { s_logger.info("lock is acquired for VMTemplateStoragePool " + templatePoolRefId); } try { - if (templatePoolRef.getState() == ObjectInDataStoreStateMachine.State.Ready) { + if (templatePoolRef.getState() == ObjectInDataStoreStateMachine.State.Ready && !template.isDeployAsIs()) { s_logger.info("Template " + template.getUniqueName() + " is already copied to primary storage, skip copying"); createVolumeFromBaseImageAsync(volume, templateOnPrimaryStoreObj, dataStore, future); return; @@ -595,7 +598,7 @@ public class VolumeServiceImpl implements VolumeService { } catch (Throwable e) { s_logger.debug("failed to create template on storage", e); templateOnPrimaryStoreObj.processEvent(Event.OperationFailed); - dataStore.create(template); // make sure that template_spool_ref entry is still present so that the second thread can acquire the lock + dataStore.create(template, deployAsIsConfiguration); // make sure that template_spool_ref entry is still present so that the second thread can acquire the lock VolumeApiResult result = new VolumeApiResult(volume); result.setResult(e.toString()); future.complete(result); @@ -705,14 +708,16 @@ public class VolumeServiceImpl implements VolumeService { private final AsyncCallFuture future; private final DataObject templateOnStore; private final SnapshotInfo snapshot; + private final String deployAsIsConfiguration; public CreateVolumeFromBaseImageContext(AsyncCompletionCallback callback, DataObject vo, DataStore primaryStore, DataObject templateOnStore, AsyncCallFuture future, - SnapshotInfo snapshot) { + SnapshotInfo snapshot, String configuration) { super(callback); this.vo = vo; this.future = future; this.templateOnStore = templateOnStore; this.snapshot = snapshot; + this.deployAsIsConfiguration = configuration; } public AsyncCallFuture getFuture() { @@ -722,15 +727,16 @@ public class VolumeServiceImpl implements VolumeService { @DB protected void createVolumeFromBaseImageAsync(VolumeInfo volume, DataObject templateOnPrimaryStore, PrimaryDataStore pd, AsyncCallFuture future) { - DataObject volumeOnPrimaryStorage = pd.create(volume); + DataObject volumeOnPrimaryStorage = pd.create(volume, volume.getDeployAsIsConfiguration()); volumeOnPrimaryStorage.processEvent(Event.CreateOnlyRequested); - CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volumeOnPrimaryStorage, pd, templateOnPrimaryStore, future, null); + CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volumeOnPrimaryStorage, pd, templateOnPrimaryStore, future, null, volume.getDeployAsIsConfiguration()); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().createVolumeFromBaseImageCallBack(null, null)); caller.setContext(context); motionSrv.copyAsync(context.templateOnStore, volumeOnPrimaryStorage, caller); + return; } @@ -740,6 +746,7 @@ public class VolumeServiceImpl implements VolumeService { DataObject tmplOnPrimary = context.templateOnStore; CopyCommandResult result = callback.getResult(); VolumeApiResult volResult = new VolumeApiResult((VolumeObject)vo); + String deployAsIsConfiguration = context.deployAsIsConfiguration; if (result.isSuccess()) { vo.processEvent(Event.OperationSuccessed, result.getAnswer()); @@ -750,10 +757,10 @@ public class VolumeServiceImpl implements VolumeService { // hack for Vmware: host is down, previously download template to the host needs to be re-downloaded, so we need to reset // template_spool_ref entry here to NOT_DOWNLOADED and Allocated state Answer ans = result.getAnswer(); - if (ans != null && ans instanceof CopyCmdAnswer && ans.getDetails().contains("request template reload")) { + if (ans != null && ans instanceof CopyCmdAnswer && ans.getDetails().contains(REQUEST_TEMPLATE_RELOAD)) { if (tmplOnPrimary != null) { s_logger.info("Reset template_spool_ref entry so that vmware template can be reloaded in next try"); - VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(tmplOnPrimary.getDataStore().getId(), tmplOnPrimary.getId()); + VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(tmplOnPrimary.getDataStore().getId(), tmplOnPrimary.getId(), deployAsIsConfiguration); if (templatePoolRef != null) { long templatePoolRefId = templatePoolRef.getId(); templatePoolRef = _tmpltPoolDao.acquireInLockTable(templatePoolRefId, 1200); @@ -789,9 +796,9 @@ public class VolumeServiceImpl implements VolumeService { private TemplateInfo createManagedTemplateVolume(TemplateInfo srcTemplateInfo, PrimaryDataStore destPrimaryDataStore) { // create a template volume on primary storage AsyncCallFuture createTemplateFuture = new AsyncCallFuture<>(); - TemplateInfo templateOnPrimary = (TemplateInfo)destPrimaryDataStore.create(srcTemplateInfo); + TemplateInfo templateOnPrimary = (TemplateInfo)destPrimaryDataStore.create(srcTemplateInfo, srcTemplateInfo.getDeployAsIsConfiguration()); - VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId()); + VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId(), srcTemplateInfo.getDeployAsIsConfiguration()); if (templatePoolRef == null) { throw new CloudRuntimeException("Failed to find template " + srcTemplateInfo.getUniqueName() + " in storage pool " + destPrimaryDataStore.getId()); @@ -861,7 +868,7 @@ public class VolumeServiceImpl implements VolumeService { * @param destHost The host that we will use for the copy */ private void copyTemplateToManagedTemplateVolume(TemplateInfo srcTemplateInfo, TemplateInfo templateOnPrimary, VMTemplateStoragePoolVO templatePoolRef, PrimaryDataStore destPrimaryDataStore, - Host destHost) { + Host destHost) { AsyncCallFuture copyTemplateFuture = new AsyncCallFuture<>(); int storagePoolMaxWaitSeconds = NumbersUtil.parseInt(configDao.getValue(Config.StoragePoolMaxWaitSeconds.key()), 3600); long templatePoolRefId = templatePoolRef.getId(); @@ -986,7 +993,7 @@ public class VolumeServiceImpl implements VolumeService { * @param future For async */ private void createManagedVolumeCloneTemplateAsync(VolumeInfo volumeInfo, TemplateInfo templateOnPrimary, PrimaryDataStore destPrimaryDataStore, AsyncCallFuture future) { - VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId()); + VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId(), volumeInfo.getDeployAsIsConfiguration()); if (templatePoolRef == null) { throw new CloudRuntimeException("Failed to find template " + templateOnPrimary.getUniqueName() + " in storage pool " + destPrimaryDataStore.getId()); @@ -1000,7 +1007,7 @@ public class VolumeServiceImpl implements VolumeService { try { volumeInfo.processEvent(Event.CreateOnlyRequested); - CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext<>(null, volumeInfo, destPrimaryDataStore, templateOnPrimary, future, null); + CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext<>(null, volumeInfo, destPrimaryDataStore, templateOnPrimary, future, null, volumeInfo.getDeployAsIsConfiguration()); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); @@ -1021,7 +1028,7 @@ public class VolumeServiceImpl implements VolumeService { try { // Create a volume on managed storage. - TemplateInfo destTemplateInfo = (TemplateInfo)primaryDataStore.create(srcTemplateInfo, false); + TemplateInfo destTemplateInfo = (TemplateInfo)primaryDataStore.create(srcTemplateInfo, false, volumeInfo.getDeployAsIsConfiguration()); AsyncCallFuture createVolumeFuture = createVolumeAsync(volumeInfo, primaryDataStore); VolumeApiResult createVolumeResult = createVolumeFuture.get(); @@ -1109,7 +1116,7 @@ public class VolumeServiceImpl implements VolumeService { if (storageCanCloneVolume && computeSupportsVolumeClone) { s_logger.debug("Storage " + destDataStoreId + " can support cloning using a cached template and compute side is OK with volume cloning."); - TemplateInfo templateOnPrimary = destPrimaryDataStore.getTemplate(srcTemplateInfo.getId()); + TemplateInfo templateOnPrimary = destPrimaryDataStore.getTemplate(srcTemplateInfo.getId(), null); if (templateOnPrimary == null) { templateOnPrimary = createManagedTemplateVolume(srcTemplateInfo, destPrimaryDataStore); @@ -1120,7 +1127,7 @@ public class VolumeServiceImpl implements VolumeService { } // Copy the template to the template volume. - VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId()); + VMTemplateStoragePoolVO templatePoolRef = _tmpltPoolDao.findByPoolTemplate(destPrimaryDataStore.getId(), templateOnPrimary.getId(), null); if (templatePoolRef == null) { throw new CloudRuntimeException("Failed to find template " + srcTemplateInfo.getUniqueName() + " in storage pool " + destPrimaryDataStore.getId()); @@ -1196,8 +1203,8 @@ public class VolumeServiceImpl implements VolumeService { @Override public AsyncCallFuture createVolumeFromTemplateAsync(VolumeInfo volume, long dataStoreId, TemplateInfo template) { PrimaryDataStore pd = dataStoreMgr.getPrimaryDataStore(dataStoreId); - TemplateInfo templateOnPrimaryStore = pd.getTemplate(template.getId()); - AsyncCallFuture future = new AsyncCallFuture(); + TemplateInfo templateOnPrimaryStore = pd.getTemplate(template.getId(), volume.getDeployAsIsConfiguration()); + AsyncCallFuture future = new AsyncCallFuture<>(); if (templateOnPrimaryStore == null) { createBaseImageAsync(volume, pd, template, future); @@ -1234,7 +1241,7 @@ public class VolumeServiceImpl implements VolumeService { volumeOnStore.processEvent(Event.CreateOnlyRequested); _volumeDetailsDao.addDetail(volume.getId(), SNAPSHOT_ID, Long.toString(snapshot.getId()), false); - CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volume, store, volumeOnStore, future, snapshot); + CreateVolumeFromBaseImageContext context = new CreateVolumeFromBaseImageContext(null, volume, store, volumeOnStore, future, snapshot, null); AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().createVolumeFromSnapshotCallback(null, null)).setContext(context); motionSrv.copyAsync(snapshot, volumeOnStore, caller); @@ -2125,4 +2132,4 @@ public class VolumeServiceImpl implements VolumeService { volDao.remove(vol.getId()); } } -} +} \ No newline at end of file diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java index 740b66844b5..d48a5d9b101 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java @@ -598,7 +598,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Co private VMTemplateVO createVMTemplateRecord(String vmInternalName, long guestOsId, long accountId) { Long nextTemplateId = vmTemplateDao.getNextInSequence(Long.class, "id"); VMTemplateVO templateVO = new VMTemplateVO(nextTemplateId, "Imported-from-" + vmInternalName, Storage.ImageFormat.OVA, false, false, false, Storage.TemplateType.USER, null, - false, 64, accountId, null, "Template imported from VM " + vmInternalName, false, guestOsId, false, HypervisorType.VMware, null, null, false, false, false); + false, 64, accountId, null, "Template imported from VM " + vmInternalName, false, guestOsId, false, HypervisorType.VMware, null, null, false, false, false, false); return vmTemplateDao.persist(templateVO); } @@ -619,7 +619,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Co VMTemplateStoragePoolVO templateRef = templateStoragePoolDao.findByPoolPath(poolId, templatePath); if (templateRef == null) { templateRef = new VMTemplateStoragePoolVO(poolId, templateId, null, 100, VMTemplateStorageResourceAssoc.Status.DOWNLOADED, templatePath, null, null, templatePath, - templateSize); + templateSize, null); templateRef.setState(ObjectInDataStoreStateMachine.State.Ready); templateStoragePoolDao.persist(templateRef); } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java index c9f8b0c337a..7ffc88af531 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java @@ -17,7 +17,7 @@ package com.cloud.hypervisor.guru; import com.cloud.agent.api.storage.OVFPropertyTO; -import com.cloud.agent.api.to.DataStoreTO; +import com.cloud.agent.api.to.DeployAsIsInfoTO; import com.cloud.agent.api.to.DiskTO; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; @@ -35,16 +35,14 @@ import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; import com.cloud.storage.GuestOSHypervisorVO; import com.cloud.storage.GuestOSVO; -import com.cloud.storage.TemplateOVFPropertyVO; +import com.cloud.storage.ImageStore; import com.cloud.storage.VMTemplateStoragePoolVO; -import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.Volume; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.GuestOSHypervisorDao; -import com.cloud.storage.dao.TemplateOVFPropertiesDao; +import com.cloud.storage.dao.VMTemplateDetailsDao; import com.cloud.storage.dao.VMTemplatePoolDao; import com.cloud.template.VirtualMachineTemplate; -import com.cloud.utils.Pair; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.DomainRouterVO; import com.cloud.vm.NicProfile; @@ -70,7 +68,7 @@ import java.util.Map; import java.util.stream.Collectors; class VmwareVmImplementer { - private static final Logger LOG = Logger.getLogger(VmwareVmImplementer.class); + private static final Logger LOGGER = Logger.getLogger(VmwareVmImplementer.class); @Inject DomainRouterDao domainRouterDao; @@ -89,10 +87,10 @@ class VmwareVmImplementer { @Inject PrimaryDataStoreDao storagePoolDao; @Inject - TemplateOVFPropertiesDao templateOVFPropertiesDao; - @Inject VMTemplatePoolDao templateStoragePoolDao; @Inject + VMTemplateDetailsDao templateDetailsDao; + @Inject VmwareManager vmwareMgr; private Boolean globalNestedVirtualisationEnabled; @@ -116,10 +114,11 @@ class VmwareVmImplementer { VirtualMachineTO implement(VirtualMachineProfile vm, VirtualMachineTO to, long clusterId) { to.setBootloader(VirtualMachineTemplate.BootloaderType.HVM); - + boolean deployAsIs = vm.getTemplate().isDeployAsIs(); + HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId()); Map details = to.getDetails(); if (details == null) - details = new HashMap(); + details = new HashMap<>(); VirtualMachine.Type vmType = vm.getType(); boolean userVm = !(vmType.equals(VirtualMachine.Type.DomainRouter) || vmType.equals(VirtualMachine.Type.ConsoleProxy) || vmType.equals(VirtualMachine.Type.SecondaryStorageVm)); @@ -133,7 +132,7 @@ class VmwareVmImplementer { try { VirtualEthernetCardType.valueOf(nicDeviceType); } catch (Exception e) { - LOG.warn("Invalid NIC device type " + nicDeviceType + " is specified in VM details, switch to default E1000"); + LOGGER.warn("Invalid NIC device type " + nicDeviceType + " is specified in VM details, switch to default E1000"); details.put(VmDetailConstants.NIC_ADAPTER, VirtualEthernetCardType.E1000.toString()); } } @@ -145,7 +144,7 @@ class VmwareVmImplementer { try { VirtualEthernetCardType.valueOf(nicDeviceType); } catch (Exception e) { - LOG.warn("Invalid NIC device type " + nicDeviceType + " is specified in VM details, switch to default E1000"); + LOGGER.warn("Invalid NIC device type " + nicDeviceType + " is specified in VM details, switch to default E1000"); details.put(VmDetailConstants.NIC_ADAPTER, VirtualEthernetCardType.E1000.toString()); } } @@ -172,7 +171,7 @@ class VmwareVmImplementer { GuestOSVO guestOS = guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); to.setHostName(vm.getHostName()); - HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId()); + GuestOSHypervisorVO guestOsMapping = null; if (host != null) { guestOsMapping = guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), Hypervisor.HypervisorType.VMware.toString(), host.getHypervisorVersion()); @@ -183,22 +182,55 @@ class VmwareVmImplementer { to.setPlatformEmulator(guestOsMapping.getGuestOsName()); } - List ovfProperties = getOvfPropertyList(vm, details); - - handleOvfProperties(vm, to, details, ovfProperties); + if (deployAsIs) { + List ovfProperties = getOvfPropertyList(vm, details); + handleOvfProperties(vm, to, details, ovfProperties); + setDeployAsIsParams(vm, to, details); + } setDetails(to, details); return to; } - private void setDetails(VirtualMachineTO to, Map details) { - if (LOG.isTraceEnabled()) { - for (String key: details.keySet()) { - LOG.trace(String.format("Detail for VM %s: %s => %s",to.getName(), key, details.get(key))); - } + private void setDeployAsIsParams(VirtualMachineProfile vm, VirtualMachineTO to, Map details) { + DeployAsIsInfoTO info = new DeployAsIsInfoTO(); + + String configuration = null; + if (details.containsKey(VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION)) { + configuration = details.get(VmDetailConstants.DEPLOY_AS_IS_CONFIGURATION); + info.setDeploymentConfiguration(configuration); } - to.setDetails(details); + + // Deploy as-is disks are all allocated to the same storage pool + String deployAsIsStoreUuid = vm.getDisks().get(0).getData().getDataStore().getUuid(); + StoragePoolVO storagePoolVO = storagePoolDao.findByUuid(deployAsIsStoreUuid); + VMTemplateStoragePoolVO tmplRef = templateStoragePoolDao.findByPoolTemplate(storagePoolVO.getId(), vm.getTemplate().getId(), configuration); + if (tmplRef != null) { + info.setTemplatePath(tmplRef.getInstallPath()); + } + + info.setDeployAsIs(true); + to.setDeployAsIsInfo(info); + } + + private void setDetails(VirtualMachineTO to, Map details) { + Map detailsToSend = new HashMap<>(); + for (String key: details.keySet()) { + if (key.startsWith(ImageStore.OVF_EULA_SECTION_PREFIX) || + key.startsWith(ImageStore.OVF_HARDWARE_CONFIGURATION_PREFIX) || + key.startsWith(ImageStore.OVF_HARDWARE_ITEM_PREFIX)) { + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("Discarding detail for VM %s: %s => %s", to.getName(), key, details.get(key))); + } + continue; + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace(String.format("Detail for VM %s: %s => %s", to.getName(), key, details.get(key))); + } + detailsToSend.put(key, details.get(key)); + } + to.setDetails(detailsToSend); } private void configureDomainRouterNicsAndDetails(VirtualMachineProfile vm, VirtualMachineTO to, Map details, List nicProfiles) { @@ -289,47 +321,40 @@ class VmwareVmImplementer { private void handleOvfProperties(VirtualMachineProfile vm, VirtualMachineTO to, Map details, List ovfProperties) { if (CollectionUtils.isNotEmpty(ovfProperties)) { removeOvfPropertiesFromDetails(ovfProperties, details); - String templateInstallPath = null; - List rootDiskList = vm.getDisks().stream().filter(x -> x.getType() == Volume.Type.ROOT).collect(Collectors.toList()); - if (rootDiskList.size() != 1) { + to.setOvfProperties(ovfProperties); + } + } + + private DiskTO getRootDiskTOFromVM(VirtualMachineProfile vm) { + DiskTO rootDiskTO; + List rootDiskList; + rootDiskList = vm.getDisks().stream().filter(x -> x.getType() == Volume.Type.ROOT).collect(Collectors.toList()); + if (rootDiskList.size() != 1) { + if (vm.getTemplate().isDeployAsIs()) { + rootDiskList = vm.getDisks().stream().filter(x -> x.getType() == null).collect(Collectors.toList()); + if (rootDiskList.size() < 1) { + throw new CloudRuntimeException("Did not find a template to serve as root disk for VM " + vm.getHostName()); + } + } else { throw new CloudRuntimeException("Did not find only one root disk for VM " + vm.getHostName()); } - - DiskTO rootDiskTO = rootDiskList.get(0); - DataStoreTO dataStore = rootDiskTO.getData().getDataStore(); - StoragePoolVO storagePoolVO = storagePoolDao.findByUuid(dataStore.getUuid()); - long dataCenterId = storagePoolVO.getDataCenterId(); - List pools = storagePoolDao.listByDataCenterId(dataCenterId); - for (StoragePoolVO pool : pools) { - VMTemplateStoragePoolVO ref = templateStoragePoolDao.findByPoolTemplate(pool.getId(), vm.getTemplateId()); - if (ref != null && ref.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) { - templateInstallPath = ref.getInstallPath(); - break; - } - } - - if (templateInstallPath == null) { - throw new CloudRuntimeException("Did not find the template install path for template " + vm.getTemplateId() + " on zone " + dataCenterId); - } - - Pair> pair = new Pair>(templateInstallPath, ovfProperties); - to.setOvfProperties(pair); } + rootDiskTO = rootDiskList.get(0); + return rootDiskTO; } private List getOvfPropertyList(VirtualMachineProfile vm, Map details) { List ovfProperties = new ArrayList(); for (String detailKey : details.keySet()) { - if (detailKey.startsWith(ApiConstants.OVF_PROPERTIES)) { - String ovfPropKey = detailKey.replace(ApiConstants.OVF_PROPERTIES + "-", ""); - TemplateOVFPropertyVO templateOVFPropertyVO = templateOVFPropertiesDao.findByTemplateAndKey(vm.getTemplateId(), ovfPropKey); - if (templateOVFPropertyVO == null) { - LOG.warn(String.format("OVF property %s not found on template, discarding", ovfPropKey)); + if (detailKey.startsWith(ImageStore.ACS_PROPERTY_PREFIX)) { + OVFPropertyTO propertyTO = templateDetailsDao.findPropertyByTemplateAndKey(vm.getTemplateId(), detailKey); + String vmPropertyKey = detailKey.replace(ImageStore.ACS_PROPERTY_PREFIX, ""); + if (propertyTO == null) { + LOGGER.warn(String.format("OVF property %s not found on template, discarding", vmPropertyKey)); continue; } - String ovfValue = details.get(detailKey); - boolean isPassword = templateOVFPropertyVO.isPassword(); - OVFPropertyTO propertyTO = new OVFPropertyTO(ovfPropKey, ovfValue, isPassword); + propertyTO.setKey(vmPropertyKey); + propertyTO.setValue(details.get(detailKey)); ovfProperties.add(propertyTO); } } @@ -389,7 +414,7 @@ class VmwareVmImplementer { private void removeOvfPropertiesFromDetails(List ovfProperties, Map details) { for (OVFPropertyTO propertyTO : ovfProperties) { String key = propertyTO.getKey(); - details.remove(ApiConstants.OVF_PROPERTIES + "-" + key); + details.remove(ApiConstants.PROPERTIES + "-" + key); } } @@ -405,8 +430,8 @@ class VmwareVmImplementer { Boolean globalNestedVPerVMEnabled = getGlobalNestedVPerVMEnabled(); Boolean shouldEnableNestedVirtualization = shouldEnableNestedVirtualization(globalNestedVirtualisationEnabled, globalNestedVPerVMEnabled, localNestedV); - if(LOG.isDebugEnabled()) { - LOG.debug(String.format( + if(LOGGER.isDebugEnabled()) { + LOGGER.debug(String.format( "Due to '%B'(globalNestedVirtualisationEnabled) and '%B'(globalNestedVPerVMEnabled) I'm adding a flag with value %B to the vm configuration for Nested Virtualisation.", globalNestedVirtualisationEnabled, globalNestedVPerVMEnabled, diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java index d8afb08f8df..2fcf1358d08 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java @@ -591,7 +591,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { } String vmName = templateUuid; - hyperHost.importVmFromOVF(srcFileName, vmName, datastoreMo, "thin"); + hyperHost.importVmFromOVF(srcFileName, vmName, datastoreMo, "thin", null); VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmName); if (vmMo == null) { @@ -912,7 +912,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager { VirtualMachineMO clonedVm = null; try { - hyperHost.importVmFromOVF(srcOVFFileName, newVolumeName, primaryDsMo, "thin"); + hyperHost.importVmFromOVF(srcOVFFileName, newVolumeName, primaryDsMo, "thin", null); clonedVm = hyperHost.findVmOnHyperHost(newVolumeName); if (clonedVm == null) { throw new Exception("Unable to create container VM for volume creation"); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 909f5f76a78..5d611f4be67 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -16,10 +16,53 @@ // under the License. package com.cloud.hypervisor.vmware.resource; +import java.io.File; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.ConnectException; +import java.net.InetSocketAddress; +import java.net.URI; +import java.net.URL; +import java.nio.channels.SocketChannel; +import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.TimeZone; +import java.util.UUID; +import java.util.stream.Collectors; + +import javax.naming.ConfigurationException; +import javax.xml.datatype.XMLGregorianCalendar; + +import com.cloud.agent.api.to.DataTO; +import com.cloud.agent.api.to.DeployAsIsInfoTO; +import com.cloud.storage.ImageStore; import com.cloud.agent.api.ValidateVcenterDetailsCommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.storage.configdrive.ConfigDrive; import org.apache.cloudstack.storage.to.TemplateObjectTO; +import org.apache.cloudstack.storage.to.VolumeObjectTO; +import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo; +import org.apache.cloudstack.vm.UnmanagedInstanceTO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.log4j.Logger; +import org.apache.log4j.NDC; +import org.joda.time.Duration; import com.cloud.agent.IAgentControl; import com.cloud.agent.api.Answer; @@ -1796,6 +1839,21 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.error(msg); throw new Exception(msg); } + + DiskTO[] specDisks = vmSpec.getDisks(); + DeployAsIsInfoTO deployAsIsInfo = vmSpec.getDeployAsIsInfo(); + boolean installAsIs = deployAsIsInfo != null && deployAsIsInfo.isDeployAsIs(); + if (installAsIs && dcMo.findVm(vmInternalCSName) == null) { + if (s_logger.isTraceEnabled()) { + s_logger.trace("Deploying OVA from as is"); + } + String deployAsIsTemplate = deployAsIsInfo.getTemplatePath(); + String destDatastore = getDatastoreFromSpecDisks(specDisks); + String deploymentConfiguration = deployAsIsInfo.getDeploymentConfiguration(); + vmInVcenter = _storageProcessor.cloneVMFromTemplate(deployAsIsTemplate, vmInternalCSName, destDatastore); + mapSpecDisksToClonedDisks(vmInVcenter, vmInternalCSName, specDisks); + } + String guestOsId = translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs(), vmSpec.getPlatformEmulator()).value(); DiskTO[] disks = validateDisks(vmSpec.getDisks()); assert (disks.length > 0); @@ -1816,6 +1874,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } VirtualMachineDiskInfoBuilder diskInfoBuilder = null; + VirtualDevice[] nicDevices = null; VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(vmInternalCSName); DiskControllerType systemVmScsiControllerType = DiskControllerType.lsilogic; int firstScsiControllerBusNum = 0; @@ -1829,6 +1888,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa // retrieve disk information before we tear down diskInfoBuilder = vmMo.getDiskInfoBuilder(); hasSnapshot = vmMo.hasSnapshot(); + nicDevices = vmMo.getNicDevices(); if (!hasSnapshot) vmMo.tearDownDevices(new Class[]{VirtualDisk.class, VirtualEthernetCard.class}); else @@ -1925,7 +1985,20 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } } + // The number of disks changed must be 0 for install as is, as the VM is a clone + //int disksChanges = !installAsIs ? disks.length : 0; int totalChangeDevices = disks.length + nics.length; + int hackDeviceCount = 0; + if (diskInfoBuilder != null) { + hackDeviceCount += diskInfoBuilder.getDiskCount(); + } + hackDeviceCount += nicDevices == null ? 0 : nicDevices.length; + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("current count(s) desired: %d/ found:%d. now adding device to device count for vApp config ISO", totalChangeDevices, hackDeviceCount)); + } + if (vmSpec.getOvfProperties() != null) { + totalChangeDevices++; + } DiskTO volIso = null; if (vmSpec.getType() != VirtualMachine.Type.User) { @@ -2309,15 +2382,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa configureVideoCard(vmMo, vmSpec, vmConfigSpec); // Set OVF properties (if available) - Pair> ovfPropsMap = vmSpec.getOvfProperties(); - VmConfigInfo templateVappConfig = null; - List ovfProperties = null; - if (ovfPropsMap != null) { - String vmTemplate = ovfPropsMap.first(); - s_logger.info("Find VM template " + vmTemplate); - VirtualMachineMO vmTemplateMO = dcMo.findVm(vmTemplate); - templateVappConfig = vmTemplateMO.getConfigInfo().getVAppConfig(); - ovfProperties = ovfPropsMap.second(); + List ovfProperties = vmSpec.getOvfProperties(); + VmConfigInfo templateVappConfig; + if (ovfProperties != null) { + VirtualMachineMO templateVMmo = dcMo.findVm(deployAsIsInfo.getTemplatePath()); + templateVappConfig = templateVMmo.getConfigInfo().getVAppConfig(); // Set OVF properties (if available) if (CollectionUtils.isNotEmpty(ovfProperties)) { s_logger.info("Copying OVF properties from template and setting them to the values the user provided"); @@ -2414,6 +2483,85 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } } + private String getDatastoreFromSpecDisks(DiskTO[] specDisks) { + if (specDisks.length == 0) { + return null; + } + + Map> psDisksMap = Arrays.asList(specDisks).stream() + .filter(x -> x.getType() != Volume.Type.ISO && x.getData() != null && x.getData().getDataStore() != null) + .collect(Collectors.groupingBy(x -> x.getData().getDataStore().getUuid())); + + String dataStore; + if (MapUtils.isEmpty(psDisksMap)) { + s_logger.error("Could not find a destination datastore for VM volumes"); + return null; + } else { + dataStore = psDisksMap.keySet().iterator().next(); + if (psDisksMap.keySet().size() > 1) { + s_logger.info("Found multiple destination datastores for VM volumes, selecting " + dataStore); + } + } + return dataStore; + } + + /** + * Modify the specDisks information to match the cloned VM's disks (from vmMo VM) + */ + private void mapSpecDisksToClonedDisks(VirtualMachineMO vmMo, String vmInternalCSName, DiskTO[] specDisks) { + try { + s_logger.debug("Mapping spec disks information to cloned VM disks for VM " + vmInternalCSName); + if (vmMo != null && ArrayUtils.isNotEmpty(specDisks)) { + List vmDisks = vmMo.getVirtualDisks(); + List sortedDisks = Arrays.asList(sortVolumesByDeviceId(specDisks)) + .stream() + .filter(x -> x.getType() == Volume.Type.ROOT) + .collect(Collectors.toList()); + if (sortedDisks.size() != vmDisks.size()) { + s_logger.error("Different number of root disks spec vs cloned deploy-as-is VM disks: " + sortedDisks.size() + " - " + vmDisks.size()); + return; + } + for (int i = 0; i < sortedDisks.size(); i++) { + DiskTO specDisk = sortedDisks.get(i); + VirtualDisk vmDisk = vmDisks.get(i); + DataTO dataVolume = specDisk.getData(); + if (dataVolume instanceof VolumeObjectTO) { + VolumeObjectTO volumeObjectTO = (VolumeObjectTO) dataVolume; + if (!volumeObjectTO.getSize().equals(vmDisk.getCapacityInBytes())) { + s_logger.info("Mapped disk size is not the same as the cloned VM disk size: " + + volumeObjectTO.getSize() + " - " + vmDisk.getCapacityInBytes()); + } + VirtualDeviceBackingInfo backingInfo = vmDisk.getBacking(); + if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) { + VirtualDiskFlatVer2BackingInfo backing = (VirtualDiskFlatVer2BackingInfo) backingInfo; + String fileName = backing.getFileName(); + if (StringUtils.isNotBlank(fileName)) { + String[] fileNameParts = fileName.split(" "); + String datastoreUuid = fileNameParts[0].replace("[", "").replace("]", ""); + String relativePath = fileNameParts[1].split("/")[1].replace(".vmdk", ""); + String vmSpecDatastoreUuid = volumeObjectTO.getDataStore().getUuid().replaceAll("-", ""); + if (!datastoreUuid.equals(vmSpecDatastoreUuid)) { + s_logger.info("Mapped disk datastore UUID is not the same as the cloned VM datastore UUID: " + + datastoreUuid + " - " + vmSpecDatastoreUuid); + } + volumeObjectTO.setPath(relativePath); + specDisk.setPath(relativePath); + } else { + s_logger.error("Empty backing filename for volume " + volumeObjectTO.getName()); + } + } else { + s_logger.error("Could not get volume backing info for volume " + volumeObjectTO.getName()); + } + } + } + } + } catch (Exception e) { + String msg = "Error mapping deploy-as-is VM disks from cloned VM " + vmInternalCSName; + s_logger.error(msg, e); + throw new CloudRuntimeException(e); + } + } + private void setBootOptions(VirtualMachineTO vmSpec, String bootMode, VirtualMachineConfigSpec vmConfigSpec) { VirtualMachineBootOptions bootOptions = null; if (StringUtils.isNotBlank(bootMode) && !bootMode.equalsIgnoreCase("bios")) { @@ -2457,12 +2605,22 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa private Map> getOVFMap(List props) { Map> map = new HashMap<>(); for (OVFPropertyTO prop : props) { - Pair pair = new Pair<>(prop.getValue(), prop.isPassword()); + String value = getPropertyValue(prop); + Pair pair = new Pair<>(value, prop.isPassword()); map.put(prop.getKey(), pair); } return map; } + private String getPropertyValue(OVFPropertyTO prop) { + String type = prop.getType(); + String value = prop.getValue(); + if ("boolean".equalsIgnoreCase(type)) { + value = Boolean.parseBoolean(value) ? "True" : "False"; + } + return value; + } + /** * Set the properties section from existing vApp configuration and values set on ovfProperties */ @@ -2843,7 +3001,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa private static void configCustomExtraOption(List extraOptions, VirtualMachineTO vmSpec) { // we no longer to validation anymore for (Map.Entry entry : vmSpec.getDetails().entrySet()) { - if (entry.getKey().equalsIgnoreCase(VmDetailConstants.BOOT_MODE)) { + if (entry.getKey().equalsIgnoreCase(VmDetailConstants.BOOT_MODE) || + entry.getKey().startsWith(ImageStore.REQUIRED_NETWORK_PREFIX) || + entry.getKey().startsWith(ImageStore.ACS_PROPERTY_PREFIX) || + entry.getKey().startsWith(ImageStore.DISK_DEFINITION_PREFIX)) { continue; } OptionValue newVal = new OptionValue(); diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java index 2c4d9a14381..1f1056a09aa 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -795,95 +795,100 @@ public class VmwareStorageProcessor implements StorageProcessor { DatastoreMO dsMo = new DatastoreMO(context, morDatastore); String vmdkName = volume.getName(); - String vmdkFileBaseName; - if (srcStore == null) { - // create a root volume for blank VM (created from ISO) - String dummyVmName = hostService.getWorkerName(context, cmd, 0); + String vmdkFileBaseName = null; + if (template.isDeployAsIs()) { + s_logger.info("Volume from deploy-as-is template, no need to create the volume at this point, VM will be cloned"); + } else { + if (srcStore == null) { + // create a root volume for blank VM (created from ISO) + String dummyVmName = hostService.getWorkerName(context, cmd, 0); - try { - vmMo = HypervisorHostHelper.createWorkerVM(hyperHost, dsMo, dummyVmName, null); - if (vmMo == null) { - throw new Exception("Unable to create a dummy VM for volume creation"); + try { + vmMo = HypervisorHostHelper.createWorkerVM(hyperHost, dsMo, dummyVmName, null); + if (vmMo == null) { + throw new Exception("Unable to create a dummy VM for volume creation"); + } + + vmdkFileBaseName = vmMo.getVmdkFileBaseNames().get(0); + // we only use the first file in the pair, linked or not will not matter + String vmdkFilePair[] = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, null, vmdkFileBaseName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, true); + String volumeDatastorePath = vmdkFilePair[0]; + synchronized (this) { + s_logger.info("Delete file if exists in datastore to clear the way for creating the volume. file: " + volumeDatastorePath); + VmwareStorageLayoutHelper.deleteVolumeVmdkFiles(dsMo, vmdkName, dcMo, searchExcludedFolders); + vmMo.createDisk(volumeDatastorePath, (long)(volume.getSize() / (1024L * 1024L)), morDatastore, -1); + vmMo.detachDisk(volumeDatastorePath, false); + } + } finally { + s_logger.info("Destroy dummy VM after volume creation"); + if (vmMo != null) { + s_logger.warn("Unable to destroy a null VM ManagedObjectReference"); + vmMo.detachAllDisks(); + vmMo.destroy(); + } } + } else { + String templatePath = template.getPath(); + VirtualMachineMO vmTemplate = VmwareHelper.pickOneVmOnRunningHost(dcMo.findVmByNameAndLabel(templatePath), true); + if (vmTemplate == null) { + s_logger.warn("Template host in vSphere is not in connected state, request template reload"); + return new CopyCmdAnswer("Template host in vSphere is not in connected state, request template reload"); + } + + ManagedObjectReference morPool = hyperHost.getHyperHostOwnerResourcePool(); + ManagedObjectReference morCluster = hyperHost.getHyperHostCluster(); + if (template.getSize() != null){ + _fullCloneFlag = volume.getSize() > template.getSize() ? true : _fullCloneFlag; + } + if (!_fullCloneFlag) { + createVMLinkedClone(vmTemplate, dcMo, vmdkName, morDatastore, morPool); + } else { + createVMFullClone(vmTemplate, dcMo, dsMo, vmdkName, morDatastore, morPool); + } + + vmMo = new ClusterMO(context, morCluster).findVmOnHyperHost(vmdkName); + assert (vmMo != null); vmdkFileBaseName = vmMo.getVmdkFileBaseNames().get(0); - // we only use the first file in the pair, linked or not will not matter - String vmdkFilePair[] = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, null, vmdkFileBaseName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, true); - String volumeDatastorePath = vmdkFilePair[0]; - synchronized (this) { - s_logger.info("Delete file if exists in datastore to clear the way for creating the volume. file: " + volumeDatastorePath); - VmwareStorageLayoutHelper.deleteVolumeVmdkFiles(dsMo, vmdkName, dcMo, searchExcludedFolders); - vmMo.createDisk(volumeDatastorePath, (long)(volume.getSize() / (1024L * 1024L)), morDatastore, -1); - vmMo.detachDisk(volumeDatastorePath, false); - } - } finally { - s_logger.info("Destroy dummy VM after volume creation"); - if (vmMo != null) { - s_logger.warn("Unable to destroy a null VM ManagedObjectReference"); - vmMo.detachAllDisks(); - vmMo.destroy(); - } - } - } else { - String templatePath = template.getPath(); - VirtualMachineMO vmTemplate = VmwareHelper.pickOneVmOnRunningHost(dcMo.findVmByNameAndLabel(templatePath), true); - if (vmTemplate == null) { - s_logger.warn("Template host in vSphere is not in connected state, request template reload"); - return new CopyCmdAnswer("Template host in vSphere is not in connected state, request template reload"); - } - - ManagedObjectReference morPool = hyperHost.getHyperHostOwnerResourcePool(); - ManagedObjectReference morCluster = hyperHost.getHyperHostCluster(); - if (template.getSize() != null){ - _fullCloneFlag = volume.getSize() > template.getSize() ? true : _fullCloneFlag; - } - if (!_fullCloneFlag) { - createVMLinkedClone(vmTemplate, dcMo, vmdkName, morDatastore, morPool); - } else { - createVMFullClone(vmTemplate, dcMo, dsMo, vmdkName, morDatastore, morPool); - } - - vmMo = new ClusterMO(context, morCluster).findVmOnHyperHost(vmdkName); - assert (vmMo != null); - - vmdkFileBaseName = vmMo.getVmdkFileBaseNames().get(0); - s_logger.info("Move volume out of volume-wrapper VM " + vmdkFileBaseName); - String[] vmwareLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkFileBaseName, VmwareStorageLayoutType.VMWARE, !_fullCloneFlag); - String[] legacyCloudStackLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkFileBaseName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, !_fullCloneFlag); + s_logger.info("Move volume out of volume-wrapper VM " + vmdkFileBaseName); + String[] vmwareLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkFileBaseName, VmwareStorageLayoutType.VMWARE, !_fullCloneFlag); + String[] legacyCloudStackLayoutFilePair = VmwareStorageLayoutHelper.getVmdkFilePairDatastorePath(dsMo, vmdkName, vmdkFileBaseName, VmwareStorageLayoutType.CLOUDSTACK_LEGACY, !_fullCloneFlag); for (int i=0; i template.getSize() || _fullCloneFlag; + } + if (!_fullCloneFlag) { + createVMLinkedClone(vmMo, dcMo, cloneName, morDatastore, morPool); + } else { + createVMFullClone(vmMo, dcMo, dsMo, cloneName, morDatastore, morPool); + } + } + private Pair copyVolumeFromSecStorage(VmwareHypervisorHost hyperHost, String srcVolumePath, DatastoreMO dsMo, String secStorageUrl, long wait, String nfsVersion) throws Exception { String volumeFolder; @@ -3478,7 +3495,7 @@ public class VmwareStorageProcessor implements StorageProcessor { VirtualMachineMO clonedVm = null; try { - hyperHost.importVmFromOVF(srcOVFFileName, newVolumeName, primaryDsMo, "thin"); + hyperHost.importVmFromOVF(srcOVFFileName, newVolumeName, primaryDsMo, "thin", null); clonedVm = hyperHost.findVmOnHyperHost(newVolumeName); if (clonedVm == null) { throw new Exception("Unable to create container VM for volume creation"); @@ -3640,4 +3657,40 @@ public class VmwareStorageProcessor implements StorageProcessor { public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) { return null; } + + /** + * Return the cloned VM from the template + */ + public VirtualMachineMO cloneVMFromTemplate(String templateName, String cloneName, String templatePrimaryStoreUuid) { + try { + VmwareContext context = hostService.getServiceContext(null); + VmwareHypervisorHost hyperHost = hostService.getHyperHost(context, null); + DatacenterMO dcMo = new DatacenterMO(context, hyperHost.getHyperHostDatacenter()); + VirtualMachineMO templateMo = dcMo.findVm(templateName); + if (templateMo == null) { + throw new CloudRuntimeException(String.format("Unable to find template %s in vSphere", templateName)); + } + ManagedObjectReference morDatastore = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, templatePrimaryStoreUuid); + DatastoreMO dsMo = new DatastoreMO(context, morDatastore); + ManagedObjectReference morPool = hyperHost.getHyperHostOwnerResourcePool(); + if (morDatastore == null) { + throw new CloudRuntimeException("Unable to find datastore in vSphere"); + } + s_logger.info("Cloning VM " + cloneName + " from template " + templatePrimaryStoreUuid); + if (!_fullCloneFlag) { + createVMLinkedClone(templateMo, dcMo, cloneName, morDatastore, morPool); + } else { + createVMFullClone(templateMo, dcMo, dsMo, cloneName, morDatastore, morPool); + } + VirtualMachineMO vm = dcMo.findVm(cloneName); + if (vm == null) { + throw new CloudRuntimeException("Unable to get the cloned VM " + cloneName); + } + return vm; + } catch (Throwable e) { + String msg = "Error cloning VM from template in primary storage: %s" + e.getMessage(); + s_logger.error(msg, e); + throw new CloudRuntimeException(msg, e); + } + } } diff --git a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/driver/DateraPrimaryDataStoreDriver.java b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/driver/DateraPrimaryDataStoreDriver.java index 497960d1c23..fa1f3d4a646 100644 --- a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/driver/DateraPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/driver/DateraPrimaryDataStoreDriver.java @@ -955,7 +955,7 @@ public class DateraPrimaryDataStoreDriver implements PrimaryDataStoreDriver { } else if (dataType == DataObjectType.TEMPLATE) { s_logger.debug("Clone volume from a template"); - VMTemplateStoragePoolVO templatePoolRef = tmpltPoolDao.findByPoolTemplate(storagePoolId, dataObjectId); + VMTemplateStoragePoolVO templatePoolRef = tmpltPoolDao.findByPoolTemplate(storagePoolId, dataObjectId, null); if (templatePoolRef != null) { baseAppInstanceName = templatePoolRef.getLocalDownloadPath(); @@ -1114,7 +1114,7 @@ public class DateraPrimaryDataStoreDriver implements PrimaryDataStoreDriver { iqn = appInstance.getIqn(); VMTemplateStoragePoolVO templatePoolRef = tmpltPoolDao.findByPoolTemplate(storagePoolId, - templateInfo.getId()); + templateInfo.getId(), null); templatePoolRef.setInstallPath(DateraUtil.generateIqnPath(iqn)); templatePoolRef.setLocalDownloadPath(appInstance.getName()); @@ -1505,7 +1505,7 @@ public class DateraPrimaryDataStoreDriver implements PrimaryDataStoreDriver { DateraUtil.deleteAppInstance(conn, appInstanceName); VMTemplateStoragePoolVO templatePoolRef = tmpltPoolDao.findByPoolTemplate(storagePoolId, - templateInfo.getId()); + templateInfo.getId(), null); tmpltPoolDao.remove(templatePoolRef.getId()); diff --git a/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java index 22e4e952b3e..0651f2ea856 100644 --- a/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java +++ b/plugins/storage/volume/solidfire/src/main/java/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java @@ -709,7 +709,7 @@ public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { sfVolumeId = Long.parseLong(snapshotDetails.getValue()); } else if (dataObjectType == DataObjectType.TEMPLATE) { // get the cached template on this storage - VMTemplateStoragePoolVO templatePoolRef = vmTemplatePoolDao.findByPoolTemplate(storagePoolId, dataObjectId); + VMTemplateStoragePoolVO templatePoolRef = vmTemplatePoolDao.findByPoolTemplate(storagePoolId, dataObjectId, null); if (templatePoolRef != null) { sfVolumeId = Long.parseLong(templatePoolRef.getLocalDownloadPath()); @@ -1135,7 +1135,7 @@ public class SolidFirePrimaryDataStoreDriver implements PrimaryDataStoreDriver { String iqn = sfVolume.getIqn(); - VMTemplateStoragePoolVO templatePoolRef = vmTemplatePoolDao.findByPoolTemplate(storagePoolId, templateInfo.getId()); + VMTemplateStoragePoolVO templatePoolRef = vmTemplatePoolDao.findByPoolTemplate(storagePoolId, templateInfo.getId(), null); templatePoolRef.setInstallPath(iqn); templatePoolRef.setLocalDownloadPath(Long.toString(sfVolume.getId())); diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java index e6b30775795..a2433ab634d 100644 --- a/server/src/main/java/com/cloud/api/ApiDBUtils.java +++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java @@ -2004,16 +2004,16 @@ public class ApiDBUtils { return s_templateJoinDao.newUpdateResponse(vr); } - public static TemplateResponse newTemplateResponse(ResponseView view, TemplateJoinVO vr) { - return s_templateJoinDao.newTemplateResponse(view, vr); + public static TemplateResponse newTemplateResponse(EnumSet detailsView, ResponseView view, TemplateJoinVO vr) { + return s_templateJoinDao.newTemplateResponse(detailsView, view, vr); } public static TemplateResponse newIsoResponse(TemplateJoinVO vr) { return s_templateJoinDao.newIsoResponse(vr); } - public static TemplateResponse fillTemplateDetails(ResponseView view, TemplateResponse vrData, TemplateJoinVO vr) { - return s_templateJoinDao.setTemplateResponse(view, vrData, vr); + public static TemplateResponse fillTemplateDetails(EnumSet detailsView, ResponseView view, TemplateResponse vrData, TemplateJoinVO vr) { + return s_templateJoinDao.setTemplateResponse(detailsView, view, vrData, vr); } public static List newTemplateView(VirtualMachineTemplate vr) { diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 2957a59b07e..51a5436fba5 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -1564,7 +1564,7 @@ public class ApiResponseHelper implements ResponseGenerator { tvo = ApiDBUtils.newTemplateView(result, zoneId, readyOnly); } - return ViewResponseHelper.createTemplateResponse(view, tvo.toArray(new TemplateJoinVO[tvo.size()])); + return ViewResponseHelper.createTemplateResponse(EnumSet.of(DomainDetails.all), view, tvo.toArray(new TemplateJoinVO[tvo.size()])); } @Override @@ -1581,7 +1581,7 @@ public class ApiResponseHelper implements ResponseGenerator { tvo.addAll(ApiDBUtils.newTemplateView(result, zoneId, readyOnly)); } } - return ViewResponseHelper.createTemplateResponse(view, tvo.toArray(new TemplateJoinVO[tvo.size()])); + return ViewResponseHelper.createTemplateResponse(EnumSet.of(DomainDetails.all), view, tvo.toArray(new TemplateJoinVO[tvo.size()])); } @Override diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 005968949c7..e8161bc4c65 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -31,6 +31,7 @@ import java.util.stream.Stream; import javax.inject.Inject; +import com.cloud.storage.dao.VMTemplateDetailsDao; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.affinity.AffinityGroupDomainMapVO; import org.apache.cloudstack.affinity.AffinityGroupResponse; @@ -71,7 +72,6 @@ import org.apache.cloudstack.api.command.user.project.ListProjectsCmd; import org.apache.cloudstack.api.command.user.resource.ListDetailOptionsCmd; import org.apache.cloudstack.api.command.user.securitygroup.ListSecurityGroupsCmd; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; -import org.apache.cloudstack.api.command.user.template.ListTemplateOVFProperties; import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd; import org.apache.cloudstack.api.command.user.vm.ListVMsCmd; import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; @@ -101,7 +101,6 @@ import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.StorageTagResponse; -import org.apache.cloudstack.api.response.TemplateOVFPropertyResponse; import org.apache.cloudstack.api.response.TemplateResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; @@ -125,7 +124,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.agent.api.storage.OVFProperty; import com.cloud.api.query.dao.AccountJoinDao; import com.cloud.api.query.dao.AffinityGroupJoinDao; import com.cloud.api.query.dao.AsyncJobJoinDao; @@ -214,11 +212,9 @@ import com.cloud.storage.Storage; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePoolTagVO; -import com.cloud.storage.TemplateOVFPropertyVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.Volume; import com.cloud.storage.dao.StoragePoolTagsDao; -import com.cloud.storage.dao.TemplateOVFPropertiesDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; @@ -405,7 +401,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q ManagementServerHostDao managementServerHostDao; @Inject - TemplateOVFPropertiesDao templateOVFPropertiesDao; + VMTemplateDetailsDao vmTemplateDetailsDao; @Inject public VpcVirtualNetworkApplianceService routerService; @@ -2919,6 +2915,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q ServiceOfferingVO currentVmOffering = null; Boolean isRecursive = cmd.isRecursive(); Long zoneId = cmd.getZoneId(); + Integer cpuNumber = cmd.getCpuNumber(); + Integer memory = cmd.getMemory(); + Integer cpuSpeed = cmd.getCpuSpeed(); SearchCriteria sc = _srvOfferingJoinDao.createSearchCriteria(); if (!_accountMgr.isRootAdmin(caller.getId()) && isSystem) { @@ -2970,35 +2969,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) { throw new InvalidParameterValueException("Only ROOT admins and Domain admins can list service offerings with isrecursive=true"); } - }/* else { // domain + all ancestors - // find all domain Id up to root domain for this account - List domainIds = new ArrayList(); - DomainVO domainRecord; - if (vmId != null) { - UserVmVO vmInstance = _userVmDao.findById(vmId); - domainRecord = _domainDao.findById(vmInstance.getDomainId()); - if (domainRecord == null) { - s_logger.error("Could not find the domainId for vmId:" + vmId); - throw new CloudAuthenticationException("Could not find the domainId for vmId:" + vmId); - } - } else { - domainRecord = _domainDao.findById(caller.getDomainId()); - if (domainRecord == null) { - s_logger.error("Could not find the domainId for account:" + caller.getAccountName()); - throw new CloudAuthenticationException("Could not find the domainId for account:" + caller.getAccountName()); - } - } - domainIds.add(domainRecord.getId()); - while (domainRecord.getParent() != null) { - domainRecord = _domainDao.findById(domainRecord.getParent()); - domainIds.add(domainRecord.getId()); - } - - SearchCriteria spc = _srvOfferingJoinDao.createSearchCriteria(); - spc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); - spc.addOr("domainId", SearchCriteria.Op.NULL); // include public offering as well - sc.addAnd("domainId", SearchCriteria.Op.SC, spc); - }*/ + } } else { // for root users if (caller.getDomainId() != 1 && isSystem) { // NON ROOT admin @@ -3045,6 +3016,37 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q sc.addAnd("zoneId", SearchCriteria.Op.SC, zoneSC); } + if (cpuNumber != null) { + SearchCriteria cpuConstraintSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); + cpuConstraintSearchCriteria.addAnd("minCpu", Op.LTEQ, cpuNumber); + cpuConstraintSearchCriteria.addAnd("maxCpu", Op.GTEQ, cpuNumber); + + SearchCriteria cpuSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); + cpuSearchCriteria.addOr("minCpu", Op.NULL); + cpuSearchCriteria.addOr("constraints", Op.SC, cpuConstraintSearchCriteria); + + sc.addAnd("cpuConstraints", SearchCriteria.Op.SC, cpuSearchCriteria); + } + + if (memory != null) { + SearchCriteria memoryConstraintSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); + memoryConstraintSearchCriteria.addAnd("minMemory", Op.LTEQ, memory); + memoryConstraintSearchCriteria.addAnd("maxMemory", Op.GTEQ, memory); + + SearchCriteria memSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); + memSearchCriteria.addOr("minMemory", Op.NULL); + memSearchCriteria.addOr("memconstraints", Op.SC, memoryConstraintSearchCriteria); + + sc.addAnd("memoryConstraints", SearchCriteria.Op.SC, memSearchCriteria); + } + + if (cpuSpeed != null) { + SearchCriteria cpuSpeedSearchCriteria = _srvOfferingJoinDao.createSearchCriteria(); + cpuSpeedSearchCriteria.addOr("speed", Op.NULL); + cpuSpeedSearchCriteria.addOr("speed", Op.EQ, cpuSpeed); + sc.addAnd("cpuspeedconstraints", SearchCriteria.Op.SC, cpuSpeedSearchCriteria); + } + Pair, Integer> result = _srvOfferingJoinDao.searchAndCount(sc, searchFilter); //Couldn't figure out a smart way to filter offerings based on tags in sql so doing it in Java. @@ -3325,7 +3327,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q respView = ResponseView.Full; } - List templateResponses = ViewResponseHelper.createTemplateResponse(respView, result.first().toArray(new TemplateJoinVO[result.first().size()])); + List templateResponses = ViewResponseHelper.createTemplateResponse(cmd.getDetails(), respView, result.first().toArray(new TemplateJoinVO[result.first().size()])); response.setResponses(templateResponses, result.second()); return response; } @@ -4095,29 +4097,6 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q return mgmtResponse; } - @Override - public ListResponse listTemplateOVFProperties(ListTemplateOVFProperties cmd) { - ListResponse response = new ListResponse<>(); - List result = new ArrayList<>(); - Long templateId = cmd.getTemplateId(); - List ovfProperties = templateOVFPropertiesDao.listByTemplateId(templateId); - for (OVFProperty property : ovfProperties) { - TemplateOVFPropertyResponse propertyResponse = new TemplateOVFPropertyResponse(); - propertyResponse.setKey(property.getKey()); - propertyResponse.setType(property.getType()); - propertyResponse.setValue(property.getValue()); - propertyResponse.setQualifiers(property.getQualifiers()); - propertyResponse.setUserConfigurable(property.isUserConfigurable()); - propertyResponse.setLabel(property.getLabel()); - propertyResponse.setDescription(property.getDescription()); - propertyResponse.setPassword(property.isPassword()); - propertyResponse.setObjectName("ovfproperty"); - result.add(propertyResponse); - } - response.setResponses(result); - return response; - } - @Override public List listRouterHealthChecks(GetRouterHealthCheckResultsCmd cmd) { s_logger.info("Executing health check command " + cmd); diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java index 88a7639ac91..d91fa7bf480 100644 --- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java @@ -26,6 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.DomainDetails; import org.apache.cloudstack.api.ApiConstants.HostDetails; @@ -583,17 +584,17 @@ public class ViewResponseHelper { return respList; } - public static List createTemplateResponse(ResponseView view, TemplateJoinVO... templates) { + public static List createTemplateResponse(EnumSet detailsView, ResponseView view, TemplateJoinVO... templates) { LinkedHashMap vrDataList = new LinkedHashMap(); for (TemplateJoinVO vr : templates) { TemplateResponse vrData = vrDataList.get(vr.getTempZonePair()); if (vrData == null) { // first time encountering this volume - vrData = ApiDBUtils.newTemplateResponse(view, vr); + vrData = ApiDBUtils.newTemplateResponse(detailsView, view, vr); } else{ // update tags - vrData = ApiDBUtils.fillTemplateDetails(view, vrData, vr); + vrData = ApiDBUtils.fillTemplateDetails(detailsView, view, vrData, vr); } vrDataList.put(vr.getTempZonePair(), vrData); } @@ -609,7 +610,7 @@ public class ViewResponseHelper { vrData = ApiDBUtils.newTemplateUpdateResponse(vr); } else { // update tags - vrData = ApiDBUtils.fillTemplateDetails(view, vrData, vr); + vrData = ApiDBUtils.fillTemplateDetails(EnumSet.of(DomainDetails.all), view, vrData, vr); } vrDataList.put(vr.getId(), vrData); } @@ -625,7 +626,7 @@ public class ViewResponseHelper { vrData = ApiDBUtils.newIsoResponse(vr); } else { // update tags - vrData = ApiDBUtils.fillTemplateDetails(view, vrData, vr); + vrData = ApiDBUtils.fillTemplateDetails(EnumSet.of(DomainDetails.all), view, vrData, vr); } vrDataList.put(vr.getTempZonePair(), vrData); } diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java index c9d7eba48b2..58cb886594f 100644 --- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java +++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDao.java @@ -16,8 +16,10 @@ // under the License. package com.cloud.api.query.dao; +import java.util.EnumSet; import java.util.List; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.response.TemplateResponse; @@ -30,13 +32,13 @@ import com.cloud.utils.db.SearchCriteria; public interface TemplateJoinDao extends GenericDao { - TemplateResponse newTemplateResponse(ResponseView view, TemplateJoinVO tmpl); + TemplateResponse newTemplateResponse(EnumSet detailsView, ResponseView view, TemplateJoinVO tmpl); TemplateResponse newIsoResponse(TemplateJoinVO tmpl); TemplateResponse newUpdateResponse(TemplateJoinVO tmpl); - TemplateResponse setTemplateResponse(ResponseView view, TemplateResponse tmplData, TemplateJoinVO tmpl); + TemplateResponse setTemplateResponse(EnumSet detailsView, ResponseView view, TemplateResponse tmplData, TemplateJoinVO tmpl); List newTemplateView(VirtualMachineTemplate tmpl); diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 6b700a255ae..e51dd1e3f9c 100644 --- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -17,6 +17,7 @@ package com.cloud.api.query.dao; import java.util.ArrayList; +import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -25,6 +26,11 @@ import java.util.Set; import javax.inject.Inject; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.utils.security.DigestHelper; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.response.ChildTemplateResponse; import org.apache.cloudstack.api.response.TemplateResponse; @@ -147,7 +153,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation detailsView, ResponseView view, TemplateJoinVO template) { List templatesInStore = _templateStoreDao.listByTemplateNotBypassed(template.getId()); List> downloadProgressDetails = new ArrayList(); HashMap downloadDetailInImageStores = null; @@ -158,6 +164,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation details = _templateDetailsDao.listDetailsKeyPairs(template.getId()); - templateResponse.setDetails(details); + if (detailsView.contains(ApiConstants.DomainDetails.all)) { + Map details = _templateDetailsDao.listDetailsKeyPairs(template.getId()); + templateResponse.setDetails(details); + } // update tag information long tag_id = template.getTagId(); @@ -240,6 +249,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation details = templateResponse.getDetails(); - if (details == null) { - details = new HashMap<>(); + public TemplateResponse setTemplateResponse(EnumSet detailsView, ResponseView view, TemplateResponse templateResponse, TemplateJoinVO template) { + if (detailsView.contains(ApiConstants.DomainDetails.all)) { + // update details map + String key = template.getDetailName(); + if (key != null) { + templateResponse.addDetail(key, template.getDetailValue()); } - details.put(template.getDetailName(), template.getDetailValue()); - templateResponse.setDetails(details); } // update tag information @@ -496,7 +503,6 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation resourceDetails = new HashMap(); for (UserVmDetailVO userVmDetailVO : vmDetails) { - if (!userVmDetailVO.getName().startsWith(ApiConstants.OVF_PROPERTIES) || - (UserVmManager.DisplayVMOVFProperties.value() && userVmDetailVO.getName().startsWith(ApiConstants.OVF_PROPERTIES))) { + if (!userVmDetailVO.getName().startsWith(ApiConstants.PROPERTIES) || + (UserVmManager.DisplayVMOVFProperties.value() && userVmDetailVO.getName().startsWith(ApiConstants.PROPERTIES))) { resourceDetails.put(userVmDetailVO.getName(), userVmDetailVO.getValue()); } if ((ApiConstants.BootType.UEFI.toString()).equalsIgnoreCase(userVmDetailVO.getName())) { diff --git a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java index 4f8932ad4cf..a3e1cb14723 100644 --- a/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java +++ b/server/src/main/java/com/cloud/api/query/vo/ServiceOfferingJoinVO.java @@ -175,6 +175,18 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit @Column(name = "cache_mode") String cacheMode; + @Column(name = "min_cpu") + Integer minCpu; + + @Column(name = "max_cpu") + Integer maxCpu; + + @Column(name = "min_memory") + Integer minMemory; + + @Column(name = "max_memory") + Integer maxMemory; + public ServiceOfferingJoinVO() { } @@ -356,4 +368,20 @@ public class ServiceOfferingJoinVO extends BaseViewVO implements InternalIdentit public String getCacheMode() { return cacheMode; } + + public Integer getMinCpu() { + return minCpu; + } + + public Integer getMaxCpu() { + return maxCpu; + } + + public Integer getMinMemory() { + return minMemory; + } + + public Integer getMaxMemory() { + return maxMemory; + } } diff --git a/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java index 25e3b0b5ff5..91bb76336cc 100644 --- a/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java +++ b/server/src/main/java/com/cloud/api/query/vo/TemplateJoinVO.java @@ -231,6 +231,9 @@ public class TemplateJoinVO extends BaseViewWithTagInformationVO implements Cont @Column(name = "direct_download") private boolean directDownload; + @Column(name = "deploy_as_is") + private boolean deployAsIs; + public TemplateJoinVO() { } @@ -490,6 +493,10 @@ public class TemplateJoinVO extends BaseViewWithTagInformationVO implements Cont return directDownload; } + public boolean isDeployAsIs() { + return deployAsIs; + } + public Object getParentTemplateId() { return parentTemplateId; } diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 83f3fc05d98..844f75997d5 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -457,7 +457,6 @@ import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd; 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.GetUploadParamsForTemplateCmd; -import org.apache.cloudstack.api.command.user.template.ListTemplateOVFProperties; import org.apache.cloudstack.api.command.user.template.ListTemplatePermissionsCmd; import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd; import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; @@ -3185,7 +3184,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(RevokeTemplateDirectDownloadCertificateCmd.class); cmdList.add(ListMgmtsCmd.class); cmdList.add(GetUploadParamsForIsoCmd.class); - cmdList.add(ListTemplateOVFProperties.class); cmdList.add(GetRouterHealthCheckResultsCmd.class); cmdList.add(StartRollingMaintenanceCmd.class); cmdList.add(MigrateSecondaryStorageDataCmd.class); diff --git a/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java index a2f97e84127..1ce5b362eb9 100755 --- a/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java +++ b/server/src/main/java/com/cloud/storage/ImageStoreUploadMonitorImpl.java @@ -408,11 +408,11 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto VMTemplateVO templateUpdate = _templateDao.createForUpdate(); templateUpdate.setSize(answer.getVirtualSize()); _templateDao.update(tmpTemplate.getId(), templateUpdate); - // For multi-disk OVA, check and create data disk templates + // For multi-disk OVA, check and create data disk templates or root disks as details if (tmpTemplate.getFormat().equals(Storage.ImageFormat.OVA)) { final DataStore store = dataStoreManager.getDataStore(templateDataStore.getDataStoreId(), templateDataStore.getDataStoreRole()); final TemplateInfo templateInfo = templateFactory.getTemplate(tmpTemplate.getId(), store); - if (!templateService.createOvaDataDiskTemplates(templateInfo)) { + if (!templateService.createOvaDataDiskTemplates(templateInfo, template.isDeployAsIs())) { tmpTemplateDataStore.setDownloadState(VMTemplateStorageResourceAssoc.Status.ABANDONED); tmpTemplateDataStore.setState(State.Failed); stateMachine.transitTo(tmpTemplate, VirtualMachineTemplate.Event.OperationFailed, null, _templateDao); diff --git a/server/src/main/java/com/cloud/storage/TemplateProfile.java b/server/src/main/java/com/cloud/storage/TemplateProfile.java index 304b652a589..b90409480bc 100644 --- a/server/src/main/java/com/cloud/storage/TemplateProfile.java +++ b/server/src/main/java/com/cloud/storage/TemplateProfile.java @@ -52,6 +52,7 @@ public class TemplateProfile { Boolean isDynamicallyScalable; TemplateType templateType; Boolean directDownload; + Boolean deployAsIs; Long size; public TemplateProfile(Long templateId, Long userId, String name, String displayText, Integer bits, Boolean passwordEnabled, Boolean requiresHvm, String url, @@ -95,7 +96,7 @@ public class TemplateProfile { Boolean isPublic, Boolean featured, Boolean isExtractable, ImageFormat format, Long guestOsId, List zoneId, HypervisorType hypervisorType, String accountName, Long domainId, Long accountId, String chksum, Boolean bootable, String templateTag, Map details, - Boolean sshKeyEnabled, Long imageStoreId, Boolean isDynamicallyScalable, TemplateType templateType, Boolean directDownload) { + Boolean sshKeyEnabled, Long imageStoreId, Boolean isDynamicallyScalable, TemplateType templateType, Boolean directDownload, Boolean deployAsIs) { this(templateId, userId, name, @@ -122,6 +123,7 @@ public class TemplateProfile { this.isDynamicallyScalable = isDynamicallyScalable; this.templateType = templateType; this.directDownload = directDownload; + this.deployAsIs = deployAsIs; } public Long getTemplateId() { @@ -331,4 +333,8 @@ public class TemplateProfile { public void setSize(Long size) { this.size = size; } + + public boolean isDeployAsIs() { + return this.deployAsIs; + } } diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java index 0d42b760b6d..be8319c9e57 100644 --- a/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java +++ b/server/src/main/java/com/cloud/storage/upload/params/UploadParams.java @@ -46,4 +46,5 @@ public interface UploadParams { boolean isDynamicallyScalable(); boolean isRoutingType(); boolean isDirectDownload(); + boolean isDeployAsIs(); } diff --git a/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java b/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java index 67b04f7b480..e5bc1a3c906 100644 --- a/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java +++ b/server/src/main/java/com/cloud/storage/upload/params/UploadParamsBase.java @@ -214,6 +214,11 @@ public abstract class UploadParamsBase implements UploadParams { return false; } + @Override + public boolean isDeployAsIs() { + return false; + } + void setIso(boolean iso) { isIso = iso; } diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java index 80ca46912f2..95fe38b7189 100644 --- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java @@ -25,6 +25,11 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; +import com.cloud.configuration.Config; +import com.cloud.storage.dao.VMTemplateDetailsDao; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionStatus; import org.apache.cloudstack.agent.directdownload.CheckUrlAnswer; import org.apache.cloudstack.agent.directdownload.CheckUrlCommand; import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; @@ -60,7 +65,6 @@ import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.alert.AlertManager; -import com.cloud.configuration.Config; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; @@ -89,9 +93,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.UriUtils; import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; public class HypervisorTemplateAdapter extends TemplateAdapterBase { @@ -126,6 +127,8 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { ResourceManager resourceManager; @Inject VMTemplateDao templateDao; + @Inject + private VMTemplateDetailsDao templateDetailsDao; @Override public String getName() { @@ -241,12 +244,14 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { private void createTemplateWithinZone(Long zId, TemplateProfile profile, VMTemplateVO template) { // find all eligible image stores for this zone scope - List imageStores = storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zId)); + List imageStores = storeMgr.getImageStoresByScope(new ZoneScope(zId)); if (imageStores == null || imageStores.size() == 0) { throw new CloudRuntimeException("Unable to find image store to download template " + profile.getTemplate()); } Set zoneSet = new HashSet(); + Collections.shuffle(imageStores); + // For private templates choose a random store. TODO - Have a better algorithm based on size, no. of objects, load etc. for (DataStore imageStore : imageStores) { // skip data stores for a disabled zone Long zoneId = imageStore.getScope().getScopeId(); @@ -306,7 +311,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { zoneId = profile.getZoneIdList().get(0); // find all eligible image stores for this zone scope - List imageStores = storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); + List imageStores = storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); if (imageStores == null || imageStores.size() == 0) { throw new CloudRuntimeException("Unable to find image store to download template " + profile.getTemplate()); } @@ -590,6 +595,9 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase { Pair, Long> tmplt = new Pair, Long>(VirtualMachineTemplate.class, template.getId()); _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, tmplt); + // Remove template details + templateDetailsDao.removeDetails(template.getId()); + } return success; diff --git a/server/src/main/java/com/cloud/template/TemplateAdapter.java b/server/src/main/java/com/cloud/template/TemplateAdapter.java index c048ceaf1fc..86dd0d3cad5 100644 --- a/server/src/main/java/com/cloud/template/TemplateAdapter.java +++ b/server/src/main/java/com/cloud/template/TemplateAdapter.java @@ -72,13 +72,12 @@ public interface TemplateAdapter extends Adapter { boolean delete(TemplateProfile profile); - 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 zoneId, HypervisorType hypervisorType, String accountName, - Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload) throws ResourceAllocationException; + 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 zoneId, HypervisorType hypervisorType, String accountName, Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload, + boolean deployAsIs) throws ResourceAllocationException; - 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 zoneId, HypervisorType hypervisorType, String chksum, - Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshKeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, - TemplateType templateType, boolean directDownload) throws ResourceAllocationException; + 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 zoneId, HypervisorType hypervisorType, String chksum, Boolean bootable, String templateTag, Account templateOwner, Map details, Boolean sshKeyEnabled, String imageStoreUuid, Boolean isDynamicallyScalable, + TemplateType templateType, boolean directDownload, boolean deployAsIs) throws ResourceAllocationException; } diff --git a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java index 0e88c147f51..d016fed4a2e 100644 --- a/server/src/main/java/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/main/java/com/cloud/template/TemplateAdapterBase.java @@ -129,16 +129,16 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat @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 zoneId, HypervisorType hypervisorType, String accountName, - Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload) throws ResourceAllocationException { + Long domainId, String chksum, Boolean bootable, Map details, boolean directDownload, boolean deployAsIs) 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); + hypervisorType, chksum, bootable, null, null, details, false, null, false, TemplateType.USER, directDownload, deployAsIs); } @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 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 { + TemplateType templateType, boolean directDownload, boolean deployAsIs) throws ResourceAllocationException { //Long accountId = null; // parameters verification @@ -257,7 +257,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat 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); + sshkeyEnabled, null, isDynamicallyScalable, templateType, directDownload, deployAsIs); } @@ -285,7 +285,8 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat 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()); + cmd.getTemplateTag(), owner, cmd.getDetails(), cmd.isSshKeyEnabled(), null, cmd.isDynamicallyScalable(), isRouting ? TemplateType.ROUTING : TemplateType.USER, + cmd.isDirectDownload(), cmd.isDeployAsIs()); } @@ -316,7 +317,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat params.isExtractable(), params.getFormat(), params.getGuestOSId(), zoneList, params.getHypervisorType(), params.getChecksum(), params.isBootable(), params.getTemplateTag(), owner, params.getDetails(), params.isSshKeyEnabled(), params.getImageStoreUuid(), - params.isDynamicallyScalable(), params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER, params.isDirectDownload()); + params.isDynamicallyScalable(), params.isRoutingType() ? TemplateType.ROUTING : TemplateType.USER, params.isDirectDownload(), false); } @Override @@ -358,7 +359,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat return prepare(true, CallContext.current().getCallingUserId(), cmd.getIsoName(), cmd.getDisplayText(), 64, cmd.isPasswordEnabled(), 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()); + owner, null, false, cmd.getImageStoreUuid(), cmd.isDynamicallyScalable(), TemplateType.USER, cmd.isDirectDownload(), false); } protected VMTemplateVO persistTemplate(TemplateProfile profile, VirtualMachineTemplate.State initialState) { @@ -367,7 +368,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat 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()); + profile.getTemplateTag(), profile.getDetails(), profile.isSshKeyEnabled(), profile.IsDynamicallyScalable(), profile.isDirectDownload(), profile.isDeployAsIs()); template.setState(initialState); if (profile.isDirectDownload()) { diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 3a241faccd9..c58b2f1ad9a 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -32,6 +32,7 @@ import java.util.concurrent.Executors; import javax.inject.Inject; import javax.naming.ConfigurationException; +import com.cloud.agent.api.to.DatadiskTO; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListTemplateOrIsoPermissionsCmd; @@ -669,7 +670,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, VMTemplateStoragePoolVO templateStoragePoolRef = null; TemplateDataStoreVO templateStoreRef = null; - templateStoragePoolRef = _tmpltPoolDao.findByPoolTemplate(poolId, templateId); + templateStoragePoolRef = _tmpltPoolDao.findByPoolTemplate(poolId, templateId, null); if (templateStoragePoolRef != null) { templateStoragePoolRef.setMarkedForGC(false); _tmpltPoolDao.update(templateStoragePoolRef.getId(), templateStoragePoolRef); @@ -709,7 +710,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, return null; } - return _tmpltPoolDao.findByPoolTemplate(poolId, templateId); + return _tmpltPoolDao.findByPoolTemplate(poolId, templateId, null); } catch (Exception ex) { s_logger.debug("failed to copy template from image store:" + srcSecStore.getName() + " to primary storage"); } @@ -1021,7 +1022,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } PrimaryDataStore pool = (PrimaryDataStore)_dataStoreMgr.getPrimaryDataStore(templatePoolVO.getPoolId()); - TemplateInfo template = _tmplFactory.getTemplate(templatePoolRef.getTemplateId(), pool); + TemplateInfo template = _tmplFactory.getTemplateOnPrimaryStorage(templatePoolRef.getTemplateId(), pool, templatePoolRef.getDeploymentOption()); try { if (s_logger.isDebugEnabled()) { @@ -1897,7 +1898,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } privateTemplate = new VMTemplateVO(nextTemplateId, name, ImageFormat.RAW, isPublic, featured, isExtractable, TemplateType.USER, null, requiresHvmValue, bitsValue, templateOwner.getId(), null, description, - passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails(), sshKeyEnabledValue, isDynamicScalingEnabled, false); + passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails(), sshKeyEnabledValue, isDynamicScalingEnabled, false, false); if (sourceTemplateId != null) { if (s_logger.isDebugEnabled()) { @@ -2223,4 +2224,16 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, public void setTemplateAdapters(List adapters) { _adapters = adapters; } + + @Override + public List getTemplateDisksOnImageStore(Long templateId, DataStoreRole role, String configurationId) { + TemplateInfo templateObject = _tmplFactory.getTemplate(templateId, role); + if (templateObject == null) { + String msg = String.format("Could not find template %s downloaded on store with role %s", templateId, role.toString()); + s_logger.error(msg); + throw new CloudRuntimeException(msg); + } + return _tmpltSvr.getTemplateDatadisksOnImageStore(templateObject, configurationId); + } + } diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 525931deddb..a7f01cb1be3 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -47,8 +47,12 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import com.cloud.agent.api.storage.OVFPropertyTO; import com.cloud.exception.UnsupportedServiceException; import com.cloud.hypervisor.Hypervisor; +import com.cloud.storage.ImageStore; +import com.cloud.storage.VMTemplateDetailVO; +import com.cloud.storage.dao.VMTemplateDetailsDao; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.affinity.AffinityGroupService; @@ -79,6 +83,7 @@ import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity; import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMNetworkMapDao; @@ -105,6 +110,7 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -257,7 +263,6 @@ import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.Storage.TemplateType; import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolStatus; -import com.cloud.storage.TemplateOVFPropertyVO; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateZoneVO; @@ -268,7 +273,6 @@ import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.GuestOSCategoryDao; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.SnapshotDao; -import com.cloud.storage.dao.TemplateOVFPropertiesDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.dao.VolumeDao; @@ -503,7 +507,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir @Inject private ResourceTagDao resourceTagDao; @Inject - private TemplateOVFPropertiesDao templateOVFPropertiesDao; + private VMTemplateDetailsDao templateDetailsDao; private ScheduledExecutorService _executor = null; private ScheduledExecutorService _vmIpFetchExecutor = null; @@ -2500,10 +2504,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } for (String detailName : details.keySet()) { - if (detailName.startsWith(ApiConstants.OVF_PROPERTIES)) { - String ovfPropKey = detailName.replace(ApiConstants.OVF_PROPERTIES + "-", ""); - TemplateOVFPropertyVO ovfPropertyVO = templateOVFPropertiesDao.findByTemplateAndKey(vmInstance.getTemplateId(), ovfPropKey); - if (ovfPropertyVO != null && ovfPropertyVO.isPassword()) { + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("looking for vm detail '%s'", detailName)); + } + if (detailName.startsWith(ImageStore.ACS_PROPERTY_PREFIX)) { + OVFPropertyTO propertyTO = templateDetailsDao.findPropertyByTemplateAndKey(vmInstance.getTemplateId(),detailName); + if (propertyTO != null && propertyTO.isPassword()) { details.put(detailName, DBEncryptionUtil.encrypt(details.get(detailName))); } } @@ -3307,56 +3313,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir List vpcSupportedHTypes = _vpcMgr.getSupportedVpcHypervisors(); if (networkIdList == null || networkIdList.isEmpty()) { - NetworkVO defaultNetwork = null; - - // if no network is passed in - // Check if default virtual network offering has - // Availability=Required. If it's true, search for corresponding - // network - // * if network is found, use it. If more than 1 virtual network is - // found, throw an error - // * if network is not found, create a new one and use it - - List requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false); - if (requiredOfferings.size() < 1) { - throw new InvalidParameterValueException("Unable to find network offering with availability=" + Availability.Required - + " to automatically create the network as a part of vm creation"); - } - - if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) { - // get Virtual networks - List virtualNetworks = _networkModel.listNetworksForAccount(owner.getId(), zone.getId(), Network.GuestType.Isolated); - if (virtualNetworks == null) { - throw new InvalidParameterValueException("No (virtual) networks are found for account " + owner); - } - if (virtualNetworks.isEmpty()) { - long physicalNetworkId = _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); - // Validate physical network - PhysicalNetwork physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); - if (physicalNetwork == null) { - throw new InvalidParameterValueException("Unable to find physical network with id: " + physicalNetworkId + " and tag: " - + requiredOfferings.get(0).getTags()); - } - s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + " as a part of deployVM process"); - Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network", - null, null, null, false, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null, null, - null); - if (newNetwork != null) { - defaultNetwork = _networkDao.findById(newNetwork.getId()); - } - } else if (virtualNetworks.size() > 1) { - throw new InvalidParameterValueException("More than 1 default Isolated networks are found for account " + owner + "; please specify networkIds"); - } else { - defaultNetwork = _networkDao.findById(virtualNetworks.get(0).getId()); - } - } else { - throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); - } - + NetworkVO defaultNetwork = getDefaultNetwork(zone, owner, false); if (defaultNetwork != null) { networkList.add(defaultNetwork); } - } else { for (Long networkId : networkIdList) { NetworkVO network = _networkDao.findById(networkId); @@ -3393,6 +3353,91 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir dataDiskTemplateToDiskOfferingMap, userVmOVFPropertiesMap); } + private NetworkVO getNetworkToAddToNetworkList(VirtualMachineTemplate template, Account owner, HypervisorType hypervisor, + List vpcSupportedHTypes, Long networkId) { + NetworkVO network = _networkDao.findById(networkId); + if (network == null) { + throw new InvalidParameterValueException("Unable to find network by id " + networkId); + } + if (network.getVpcId() != null) { + // Only ISOs, XenServer, KVM, and VmWare template types are + // supported for vpc networks + if (template.getFormat() != ImageFormat.ISO && !vpcSupportedHTypes.contains(template.getHypervisorType())) { + throw new InvalidParameterValueException("Can't create vm from template with hypervisor " + template.getHypervisorType() + " in vpc network " + network); + } else if (template.getFormat() == ImageFormat.ISO && !vpcSupportedHTypes.contains(hypervisor)) { + // Only XenServer, KVM, and VMware hypervisors are supported + // for vpc networks + throw new InvalidParameterValueException("Can't create vm of hypervisor type " + hypervisor + " in vpc network"); + } + } + + _networkModel.checkNetworkPermissions(owner, network); + + // don't allow to use system networks + NetworkOffering networkOffering = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId()); + if (networkOffering.isSystemOnly()) { + throw new InvalidParameterValueException("Network id=" + networkId + " is system only and can't be used for vm deployment"); + } + return network; + } + + private NetworkVO getDefaultNetwork(DataCenter zone, Account owner, boolean selectAny) throws InsufficientCapacityException, ResourceAllocationException { + NetworkVO defaultNetwork = null; + + // if no network is passed in + // Check if default virtual network offering has + // Availability=Required. If it's true, search for corresponding + // network + // * if network is found, use it. If more than 1 virtual network is + // found, throw an error + // * if network is not found, create a new one and use it + + List requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false); + if (requiredOfferings.size() < 1) { + throw new InvalidParameterValueException("Unable to find network offering with availability=" + Availability.Required + + " to automatically create the network as a part of vm creation"); + } + + if (requiredOfferings.get(0).getState() == NetworkOffering.State.Enabled) { + // get Virtual networks + List virtualNetworks = _networkModel.listNetworksForAccount(owner.getId(), zone.getId(), Network.GuestType.Isolated); + if (virtualNetworks == null) { + throw new InvalidParameterValueException("No (virtual) networks are found for account " + owner); + } + if (virtualNetworks.isEmpty()) { + defaultNetwork = createDefaultNetworkForAccount(zone, owner, requiredOfferings); + } else if (virtualNetworks.size() > 1 && !selectAny) { + throw new InvalidParameterValueException("More than 1 default Isolated networks are found for account " + owner + "; please specify networkIds"); + } else { + defaultNetwork = _networkDao.findById(virtualNetworks.get(0).getId()); + } + } else { + throw new InvalidParameterValueException("Required network offering id=" + requiredOfferings.get(0).getId() + " is not in " + NetworkOffering.State.Enabled); + } + + return defaultNetwork; + } + + private NetworkVO createDefaultNetworkForAccount(DataCenter zone, Account owner, List requiredOfferings) + throws InsufficientCapacityException, ResourceAllocationException { + NetworkVO defaultNetwork = null; + long physicalNetworkId = _networkModel.findPhysicalNetworkId(zone.getId(), requiredOfferings.get(0).getTags(), requiredOfferings.get(0).getTrafficType()); + // Validate physical network + PhysicalNetwork physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork == null) { + throw new InvalidParameterValueException("Unable to find physical network with id: " + physicalNetworkId + " and tag: " + + requiredOfferings.get(0).getTags()); + } + s_logger.debug("Creating network for account " + owner + " from the network offering id=" + requiredOfferings.get(0).getId() + " as a part of deployVM process"); + Network newNetwork = _networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() + "-network", owner.getAccountName() + "-network", + null, null, null, false, null, owner, null, physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true, null, null, + null); + if (newNetwork != null) { + defaultNetwork = _networkDao.findById(newNetwork.getId()); + } + return defaultNetwork; + } + private void verifyExtraDhcpOptionsNetwork(Map> dhcpOptionsMap, List networkList) throws InvalidParameterValueException { if (dhcpOptionsMap != null) { for (String networkUuid : dhcpOptionsMap.keySet()) { @@ -3646,12 +3691,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir sshPublicKey = pair.getPublicKey(); } - List> networks = new ArrayList>(); - - LinkedHashMap networkNicMap = new LinkedHashMap(); + LinkedHashMap> networkNicMap = new LinkedHashMap<>(); short defaultNetworkNumber = 0; boolean securityGroupEnabled = false; + int networkIndex = 0; for (NetworkVO network : networkList) { if ((network.getDataCenterId() != zone.getId())) { if (!network.isStrechedL2Network()) { @@ -3689,7 +3733,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } NicProfile profile = new NicProfile(requestedIpPair.getIp4Address(), requestedIpPair.getIp6Address(), requestedIpPair.getMacAddress()); - + profile.setOrderIndex(networkIndex); if (defaultNetworkNumber == 0) { defaultNetworkNumber++; // if user requested specific ip for default network, add it @@ -3716,13 +3760,16 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } - networks.add(new Pair(network, profile)); - if (_networkModel.isSecurityGroupSupportedInNetwork(network)) { securityGroupEnabled = true; } - - networkNicMap.put(network.getUuid(), profile); + List profiles = networkNicMap.get(network.getUuid()); + if (CollectionUtils.isEmpty(profiles)) { + profiles = new ArrayList<>(); + } + profiles.add(profile); + networkNicMap.put(network.getUuid(), profiles); + networkIndex++; } if (securityGroupIdList != null && !securityGroupIdList.isEmpty() && !securityGroupEnabled) { @@ -3853,7 +3900,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir private UserVmVO commitUserVm(final boolean isImport, final DataCenter zone, final Host host, final Host lastHost, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner, final Long diskOfferingId, final Long diskSize, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard, - final long accountId, final long userId, final ServiceOffering offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap networkNicMap, + final long accountId, final long userId, final ServiceOffering offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap> networkNicMap, final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map customParameters, final Map> extraDhcpOptionMap, final Map dataDiskTemplateToDiskOfferingMap, final Map userVmOVFPropertiesMap, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException { @@ -3960,27 +4007,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } vm.setDetail(VmDetailConstants.DEPLOY_VM, "true"); - if (MapUtils.isNotEmpty(userVmOVFPropertiesMap)) { - for (String key : userVmOVFPropertiesMap.keySet()) { - String detailKey = ApiConstants.OVF_PROPERTIES + "-" + key; - String value = userVmOVFPropertiesMap.get(key); + copyDiskDetailsToVm(vm, template); - // Sanitize boolean values to expected format and encrypt passwords - if (StringUtils.isNotBlank(value)) { - if (value.equalsIgnoreCase("True")) { - value = "True"; - } else if (value.equalsIgnoreCase("False")) { - value = "False"; - } else { - TemplateOVFPropertyVO ovfPropertyVO = templateOVFPropertiesDao.findByTemplateAndKey(vm.getTemplateId(), key); - if (ovfPropertyVO.isPassword()) { - value = DBEncryptionUtil.encrypt(value); - } - } - } - vm.setDetail(detailKey, value); - } - } + setPropertiesOnVM(vm, userVmOVFPropertiesMap); + + copyNetworkRequirementsToVm(vm, template); _vmDao.saveDetails(vm); if (!isImport) { @@ -4025,9 +4056,59 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir }); } + private void copyNetworkRequirementsToVm(UserVmVO vm, VirtualMachineTemplate template) { + if (template.isDeployAsIs()) { + List details = templateDetailsDao.listDetailsByTemplateIdMatchingPrefix(template.getId(), ImageStore.REQUIRED_NETWORK_PREFIX); + for (VMTemplateDetailVO detail : details) { + vm.setDetail(detail.getName(), detail.getValue()); + } + } + } + + private void copyDiskDetailsToVm(UserVmVO vm, VirtualMachineTemplate template) { + if (template.isDeployAsIs()) { + List details = templateDetailsDao.listDetailsByTemplateIdMatchingPrefix(template.getId(), ImageStore.DISK_DEFINITION_PREFIX); + for (VMTemplateDetailVO detail : details) { + vm.setDetail(detail.getName(), detail.getValue()); + } + } + } + + /** + * take the properties and set them on the vm. + * consider should we be complete, and make sure all default values are copied as well if known? + * I.E. iterate over the template details as well to copy any that are not defined yet. + */ + private void setPropertiesOnVM(UserVmVO vm, Map userVmOVFPropertiesMap) { + if (MapUtils.isNotEmpty(userVmOVFPropertiesMap)) { + for (String key : userVmOVFPropertiesMap.keySet()) { + String detailKey = ImageStore.ACS_PROPERTY_PREFIX + key; + String value = userVmOVFPropertiesMap.get(key); + + // Sanitize boolean values to expected format and encrypt passwords + if (StringUtils.isNotBlank(value)) { + if (value.equalsIgnoreCase("True")) { + value = "True"; + } else if (value.equalsIgnoreCase("False")) { + value = "False"; + } else { + OVFPropertyTO propertyTO = templateDetailsDao.findPropertyByTemplateAndKey(vm.getTemplateId(), key); + if (propertyTO != null && propertyTO.isPassword()) { + value = DBEncryptionUtil.encrypt(value); + } + } + } + if (s_logger.isTraceEnabled()) { + s_logger.trace(String.format("setting property '%s' as '%s' with value '%s'", key, detailKey, value)); + } + vm.setDetail(detailKey, value); + } + } + } + private UserVmVO commitUserVm(final DataCenter zone, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner, final Long diskOfferingId, final Long diskSize, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard, - final long accountId, final long userId, final ServiceOfferingVO offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap networkNicMap, + final long accountId, final long userId, final ServiceOfferingVO offering, final boolean isIso, final String sshPublicKey, final LinkedHashMap> networkNicMap, final long id, final String instanceName, final String uuidName, final HypervisorType hypervisorType, final Map customParameters, final Map> extraDhcpOptionMap, final Map dataDiskTemplateToDiskOfferingMap, Map userVmOVFPropertiesMap) throws InsufficientCapacityException { @@ -5143,6 +5224,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } + List networkIds = cmd.getNetworkIds(); + LinkedHashMap userVmNetworkMap = getVmOvfNetworkMapping(zone, owner, template, cmd.getVmNetworkMap()); + if (MapUtils.isNotEmpty(userVmNetworkMap)) { + networkIds = new ArrayList<>(userVmNetworkMap.values()); + } + String ipAddress = cmd.getIpAddress(); String ip6Address = cmd.getIp6Address(); String macAddress = cmd.getMacAddress(); @@ -5157,9 +5244,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir Boolean displayVm = cmd.isDisplayVm(); String keyboard = cmd.getKeyboard(); Map dataDiskTemplateToDiskOfferingMap = cmd.getDataDiskTemplateToDiskOfferingMap(); - Map userVmOVFProperties = cmd.getVmOVFProperties(); + Map userVmOVFProperties = cmd.getVmProperties(); if (zone.getNetworkType() == NetworkType.Basic) { - if (cmd.getNetworkIds() != null) { + if (networkIds != null) { throw new InvalidParameterValueException("Can't specify network Ids in Basic zone"); } else { vm = createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(cmd), owner, name, displayName, diskOfferingId, @@ -5169,7 +5256,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } else { if (zone.isSecurityGroupEnabled()) { - vm = createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, cmd.getNetworkIds(), getSecurityGroupIdList(cmd), owner, name, + vm = createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, networkIds, getSecurityGroupIdList(cmd), owner, name, displayName, diskOfferingId, size, group, cmd.getHypervisor(), cmd.getHttpMethod(), userData, sshKeyPairName, cmd.getIpToNetworkMap(), addrs, displayVm, keyboard, cmd.getAffinityGroupIdList(), cmd.getDetails(), cmd.getCustomId(), cmd.getDhcpOptionsMap(), dataDiskTemplateToDiskOfferingMap, userVmOVFProperties); @@ -5178,7 +5265,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (cmd.getSecurityGroupIdList() != null && !cmd.getSecurityGroupIdList().isEmpty()) { throw new InvalidParameterValueException("Can't create vm with security groups; security group feature is not enabled per zone"); } - vm = createAdvancedVirtualMachine(zone, serviceOffering, template, cmd.getNetworkIds(), owner, name, displayName, diskOfferingId, size, group, + vm = createAdvancedVirtualMachine(zone, serviceOffering, template, networkIds, owner, name, displayName, diskOfferingId, size, group, cmd.getHypervisor(), cmd.getHttpMethod(), userData, sshKeyPairName, cmd.getIpToNetworkMap(), addrs, displayVm, keyboard, cmd.getAffinityGroupIdList(), cmd.getDetails(), cmd.getCustomId(), cmd.getDhcpOptionsMap(), dataDiskTemplateToDiskOfferingMap, userVmOVFProperties); } @@ -7287,4 +7374,42 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } } } -} \ No newline at end of file + + private LinkedHashMap getVmOvfNetworkMapping(DataCenter zone, Account owner, VirtualMachineTemplate template, Map vmNetworkMapping) throws InsufficientCapacityException, ResourceAllocationException { + LinkedHashMap mapping = new LinkedHashMap<>(); + if (ImageFormat.OVA.equals(template.getFormat())) { + List networkPrerequisiteTOList = + templateDetailsDao.listNetworkRequirementsByTemplateId(template.getId()); + if (CollectionUtils.isNotEmpty(networkPrerequisiteTOList)) { + Network lastMappedNetwork = null; + for (NetworkPrerequisiteTO networkPrerequisiteTO : networkPrerequisiteTOList) { + Long networkId = vmNetworkMapping.get(networkPrerequisiteTO.getInstanceID()); + if (networkId == null && lastMappedNetwork == null) { + lastMappedNetwork = getNetworkForOvfNetworkMapping(zone, owner); + } + if (networkId == null) { + networkId = lastMappedNetwork.getId(); + } + mapping.put(networkPrerequisiteTO.getInstanceID(), networkId); + } + } + } + return mapping; + } + + private Network getNetworkForOvfNetworkMapping(DataCenter zone, Account owner) throws InsufficientCapacityException, ResourceAllocationException { + Network network = null; + if (zone.isSecurityGroupEnabled()) { + network = _networkModel.getNetworkWithSGWithFreeIPs(zone.getId()); + if (network == null) { + throw new InvalidParameterValueException("No network with security enabled is found in zone ID: " + zone.getUuid()); + } + } else { + network = getDefaultNetwork(zone, owner, true); + if (network == null) { + throw new InvalidParameterValueException(String.format("Default network not found for zone ID: %s and account ID: %s", zone.getUuid(), owner.getUuid())); + } + } + return network; + } +} diff --git a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java index a05c4b9e4aa..dcbc9656448 100644 --- a/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadManagerImpl.java @@ -263,13 +263,13 @@ public class DirectDownloadManagerImpl extends ManagerBase implements DirectDown Answer answer = sendDirectDownloadCommand(cmd, template, poolId, host); - VMTemplateStoragePoolVO sPoolRef = vmTemplatePoolDao.findByPoolTemplate(poolId, templateId); + VMTemplateStoragePoolVO sPoolRef = vmTemplatePoolDao.findByPoolTemplate(poolId, templateId, null); if (sPoolRef == null) { if (s_logger.isDebugEnabled()) { s_logger.debug("Not found (templateId:" + templateId + " poolId: " + poolId + ") in template_spool_ref, persisting it"); } DirectDownloadAnswer ans = (DirectDownloadAnswer) answer; - sPoolRef = new VMTemplateStoragePoolVO(poolId, templateId); + sPoolRef = new VMTemplateStoragePoolVO(poolId, templateId, null); sPoolRef.setDownloadPercent(100); sPoolRef.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED); sPoolRef.setState(ObjectInDataStoreStateMachine.State.Ready); diff --git a/server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java b/server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java index a6b33edd1aa..d4cbf910c24 100755 --- a/server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java +++ b/server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplTest.java @@ -115,5 +115,4 @@ public class TemplateJoinDaoImplTest extends GenericDaoBaseWithTagInformationBas ReflectionTestUtils.setField(template, "detailName", detailName); ReflectionTestUtils.setField(template, "detailValue", detailValue); } - } \ No newline at end of file diff --git a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java index bd21643b4a1..47180cda0a1 100755 --- a/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java +++ b/server/src/test/java/com/cloud/template/TemplateManagerImplTest.java @@ -119,6 +119,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyLong; @@ -287,7 +288,7 @@ public class TemplateManagerImplTest { when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(mockTemplateStore); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(mockTemplateStore); doNothing().when(mockTemplateStore).setMarkedForGC(anyBoolean()); @@ -309,7 +310,7 @@ public class TemplateManagerImplTest { when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(null); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(null); when(templateDataStoreDao.findByTemplateZoneDownloadStatus(202l, 1l, VMTemplateStorageResourceAssoc.Status.DOWNLOADED)).thenReturn(null); VMTemplateStoragePoolVO returnObject = templateManager.prepareTemplateForCreate(mockTemplate, (StoragePool) mockPrimaryDataStore); @@ -332,7 +333,7 @@ public class TemplateManagerImplTest { when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(null); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(null); when(templateDataStoreDao.findByTemplateZoneDownloadStatus(202l, 1l, VMTemplateStorageResourceAssoc.Status.DOWNLOADED)).thenReturn(mockTemplateDataStore); when(storagePoolHostDao.listByHostStatus(2l, Status.Up)).thenReturn(null); @@ -361,7 +362,7 @@ public class TemplateManagerImplTest { when(vmTemplateDao.findById(anyLong())).thenReturn(mockTemplate); when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(mockTemplateStore); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(mockTemplateStore); when(primaryDataStoreDao.findById(anyLong())).thenReturn(mockPool); doNothing().when(mockTemplateStore).setMarkedForGC(anyBoolean()); @@ -390,7 +391,7 @@ public class TemplateManagerImplTest { when(vmTemplateDao.findById(anyLong())).thenReturn(mockTemplate); when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(mockTemplateStore); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(mockTemplateStore); when(primaryDataStoreDao.findById(anyLong())).thenReturn(mockPool); doNothing().when(mockTemplateStore).setMarkedForGC(anyBoolean()); @@ -432,7 +433,7 @@ public class TemplateManagerImplTest { when(vmTemplateDao.findById(anyLong())).thenReturn(mockTemplate); when(dataStoreManager.getPrimaryDataStore(anyLong())).thenReturn(mockPrimaryDataStore); when(vmTemplateDao.findById(anyLong(), anyBoolean())).thenReturn(mockTemplate); - when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong())).thenReturn(mockTemplateStore); + when(vmTemplatePoolDao.findByPoolTemplate(anyLong(), anyLong(), nullable(String.class))).thenReturn(mockTemplateStore); when(primaryDataStoreDao.findById(2l)).thenReturn(mockPool1); when(primaryDataStoreDao.findById(3l)).thenReturn(mockPool2); when(primaryDataStoreDao.findById(4l)).thenReturn(mockPool3); diff --git a/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java index e73c0c6bd7d..d356570b633 100644 --- a/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java +++ b/server/src/test/java/com/cloud/vm/DeploymentPlanningManagerImplTest.java @@ -29,6 +29,8 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import com.cloud.host.Host; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.dao.VMTemplateDao; import org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDao; import org.junit.Before; import org.junit.BeforeClass; @@ -141,6 +143,9 @@ public class DeploymentPlanningManagerImplTest { @Inject UserVmDetailsDao vmDetailsDao; + @Inject + VMTemplateDao templateDao; + @Mock Host host; @@ -162,6 +167,10 @@ public class DeploymentPlanningManagerImplTest { Mockito.when(_plannerHostReserveDao.findById(Matchers.anyLong())).thenReturn(reservationVO); Mockito.when(_affinityGroupVMMapDao.countAffinityGroupsForVm(Matchers.anyLong())).thenReturn(0L); + VMTemplateVO template = Mockito.mock(VMTemplateVO.class); + Mockito.when(template.isDeployAsIs()).thenReturn(false); + Mockito.when(templateDao.findById(Mockito.anyLong())).thenReturn(template); + VMInstanceVO vm = new VMInstanceVO(); Mockito.when(vmProfile.getVirtualMachine()).thenReturn(vm); @@ -456,6 +465,11 @@ public class DeploymentPlanningManagerImplTest { return Mockito.mock(HostGpuGroupsDao.class); } + @Bean + public VMTemplateDao vmTemplateDao() { + return Mockito.mock(VMTemplateDao.class); + } + public static class Library implements TypeFilter { @Override diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 863376d3381..03eba4a6b84 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -190,6 +190,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private static final String TEMPLATE_ROOT_DIR = "template/tmpl"; private static final String VOLUME_ROOT_DIR = "volumes"; private static final String POST_UPLOAD_KEY_LOCATION = "/etc/cloudstack/agent/ms-psk"; + private static final String ORIGINAL_FILE_EXTENSION = ".orig"; private static final Map updatableConfigData = Maps.newHashMap(); static { @@ -391,6 +392,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S public Answer execute(GetDatadisksCommand cmd) { DataTO srcData = cmd.getData(); + String configurationId = cmd.getConfigurationId(); TemplateObjectTO template = (TemplateObjectTO)srcData; DataStoreTO srcStore = srcData.getDataStore(); if (!(srcStore instanceof NfsTO)) { @@ -435,7 +437,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S Script command = new Script("cp", _timeout, s_logger); command.add(ovfFilePath); - command.add(ovfFilePath + ".orig"); + command.add(ovfFilePath + ORIGINAL_FILE_EXTENSION); String result = command.execute(); if (result != null) { String msg = "Unable to rename original OVF, error msg: " + result; @@ -445,7 +447,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S s_logger.debug("Reading OVF " + ovfFilePath + " to retrive the number of disks present in OVA"); OVFHelper ovfHelper = new OVFHelper(); - List disks = ovfHelper.getOVFVolumeInfo(ovfFilePath); + List disks = ovfHelper.getOVFVolumeInfoFromFile(ovfFilePath, configurationId); return new GetDatadisksAnswer(disks); } catch (Exception e) { String msg = "Get Datadisk Template Count failed due to " + e.getMessage(); @@ -503,7 +505,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S throw new Exception(msg); } command = new Script("cp", _timeout, s_logger); - command.add(ovfFilePath + ".orig"); + command.add(ovfFilePath + ORIGINAL_FILE_EXTENSION); command.add(newTmplDirAbsolute); result = command.execute(); if (result != null) { @@ -517,7 +519,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S // Create OVF for the disk String newOvfFilePath = newTmplDirAbsolute + File.separator + ovfFilePath.substring(ovfFilePath.lastIndexOf(File.separator) + 1); OVFHelper ovfHelper = new OVFHelper(); - ovfHelper.rewriteOVFFile(ovfFilePath + ".orig", newOvfFilePath, diskName); + ovfHelper.rewriteOVFFileForSingleDisk(ovfFilePath + ORIGINAL_FILE_EXTENSION, newOvfFilePath, diskName); postCreatePrivateTemplate(newTmplDirAbsolute, templateId, templateUniqueName, physicalSize, virtualSize); writeMetaOvaForTemplate(newTmplDirAbsolute, ovfFilePath.substring(ovfFilePath.lastIndexOf(File.separator) + 1), diskName, templateUniqueName, physicalSize); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java index c31bc9b38c6..fec8eab8ce2 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/template/DownloadManagerImpl.java @@ -37,6 +37,9 @@ import java.util.concurrent.Executors; import javax.naming.ConfigurationException; +import com.cloud.agent.api.storage.OVFEulaSectionTO; +import com.cloud.agent.api.storage.OVFVirtualHardwareSectionTO; +import com.cloud.agent.api.to.DatadiskTO; import com.cloud.agent.api.storage.OVFPropertyTO; import com.cloud.storage.template.Processor; import com.cloud.storage.template.S3TemplateDownloader; @@ -55,6 +58,7 @@ import com.cloud.storage.template.RawImageProcessor; import com.cloud.storage.template.TARProcessor; import com.cloud.storage.template.VhdProcessor; import com.cloud.storage.template.TemplateConstants; +import org.apache.cloudstack.api.net.NetworkPrerequisiteTO; import org.apache.cloudstack.storage.command.DownloadCommand; import org.apache.cloudstack.storage.command.DownloadCommand.ResourceType; import org.apache.cloudstack.storage.command.DownloadProgressCommand; @@ -128,6 +132,10 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager private final long id; private final ResourceType resourceType; private List ovfProperties; + private List networks; + private List disks; + private OVFVirtualHardwareSectionTO hardwareSection; + private List eulaSections; public DownloadJob(TemplateDownloader td, String jobId, long id, String tmpltName, ImageFormat format, boolean hvm, Long accountId, String descr, String cksum, String installPathPrefix, ResourceType resourceType) { @@ -230,6 +238,38 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager public void setOvfProperties(List ovfProperties) { this.ovfProperties = ovfProperties; } + + public List getNetworks() { + return networks; + } + + public void setNetworks(List networks) { + this.networks = networks; + } + + public List getDisks() { + return disks; + } + + public void setDisks(List disks) { + this.disks = disks; + } + + public void setVirtualHardwareSection(OVFVirtualHardwareSectionTO section) { + this.hardwareSection = section; + } + + public OVFVirtualHardwareSectionTO getVirtualHardwareSection() { + return this.hardwareSection; + } + + public List getEulaSections() { + return eulaSections; + } + + public void setEulaSections(List eulaSections) { + this.eulaSections = eulaSections; + } } public static final Logger LOGGER = Logger.getLogger(DownloadManagerImpl.class); @@ -509,7 +549,7 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager while (en.hasNext()) { Processor processor = en.next(); - FormatInfo info = null; + FormatInfo info; try { info = processor.process(resourcePath, null, templateName, this._processTimeout); } catch (InternalErrorException e) { @@ -526,6 +566,16 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager if (CollectionUtils.isNotEmpty(info.ovfProperties)) { dnld.setOvfProperties(info.ovfProperties); } + if (CollectionUtils.isNotEmpty(info.networks)) { + dnld.setNetworks(info.networks); + } + if (CollectionUtils.isNotEmpty(info.disks)) { + dnld.setDisks(info.disks); + } + dnld.setVirtualHardwareSection(info.hardwareSection); + if (CollectionUtils.isNotEmpty(info.eulaSections)) { + dnld.setEulaSections(info.eulaSections); + } break; } } @@ -829,6 +879,16 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager if (CollectionUtils.isNotEmpty(dj.getOvfProperties())) { answer.setOvfProperties(dj.getOvfProperties()); } + if (CollectionUtils.isNotEmpty(dj.getNetworks())) { + answer.setNetworkRequirements(dj.getNetworks()); + } + if (CollectionUtils.isNotEmpty(dj.getDisks())) { + answer.setDisks(dj.getDisks()); + } + answer.setOvfHardwareSection(dj.getVirtualHardwareSection()); + if (CollectionUtils.isNotEmpty(dj.getEulaSections())) { + answer.setEulaSections(dj.getEulaSections()); + } jobs.remove(jobId); return answer; default: diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 68ec359f1a2..08668e47b72 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -27,7 +27,9 @@ from marvin.cloudstackAPI import (recoverVirtualMachine, migrateVirtualMachine, migrateVirtualMachineWithVolume, unmanageVirtualMachine, - listUnmanagedInstances) + listUnmanagedInstances, + listNics, + listVolumes) from marvin.lib.utils import * from marvin.lib.base import (Account, @@ -45,13 +47,17 @@ from marvin.lib.base import (Account, from marvin.lib.common import (get_domain, get_zone, get_suitable_test_template, + get_test_ovf_templates, list_hosts, - list_virtual_machines) + list_virtual_machines, + get_vm_vapp_configs) from marvin.codes import FAILED, PASS from nose.plugins.attrib import attr from marvin.lib.decoratorGenerators import skipTestIf # Import System modules import time +import json +from operator import itemgetter _multiprocess_shared_ = True @@ -1679,3 +1685,273 @@ class TestUnmanageVM(cloudstackTestCase): "PowerOn", "Unmanaged VM is still running" ) + + +class TestVAppsVM(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + testClient = super(TestVAppsVM, cls).getClsTestClient() + cls.apiclient = testClient.getApiClient() + cls.services = testClient.getParsedTestDataConfig() + cls.hypervisor = testClient.getHypervisorInfo() + cls._cleanup = [] + + # Get Zone, Domain and templates + cls.domain = get_domain(cls.apiclient) + cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests()) + cls.services['mode'] = cls.zone.networktype + + cls.hypervisorNotSupported = cls.hypervisor.lower() != "vmware" + + if cls.hypervisorNotSupported == False: + + cls.account = Account.create( + cls.apiclient, + cls.services["account"], + domainid=cls.domain.id + ) + + cls.templates = get_test_ovf_templates( + cls.apiclient, + cls.zone.id, + cls.services['test_ovf_templates'], + cls.hypervisor + ) + if len(cls.templates) == 0: + assert False, "get_test_ovf_templates() failed to return templates" + + cls.custom_offering = ServiceOffering.create( + cls.apiclient, + cls.services["custom_service_offering"] + ) + + cls.isolated_network_offering = NetworkOffering.create( + cls.apiclient, + cls.services["isolated_network_offering"], + ) + cls.isolated_network_offering.update(cls.apiclient, state='Enabled') + + cls.l2_network_offering = NetworkOffering.create( + cls.apiclient, + cls.services["l2-network_offering"], + ) + cls.l2_network_offering.update(cls.apiclient, state='Enabled') + + cls._cleanup = [ + cls.account, + cls.custom_offering, + cls.isolated_network_offering, + cls.l2_network_offering + ] + + # Uncomment when tests are finished, to cleanup the test templates + for template in cls.templates: + cls._cleanup.append(template) + + @classmethod + def tearDownClass(cls): + try: + cleanup_resources(cls.apiclient, cls._cleanup) + except Exception as e: + raise Exception("Warning: Exception during class cleanup : %s" % e) + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.cleanup = [] + + def tearDown(self): + try: + cleanup_resources(self.apiclient, self.cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + + def get_ova_parsed_information_from_template(self, template): + if not template: + return None + details = template.details.__dict__ + configurations = [] + disks = [] + isos = [] + networks = [] + for propKey in details: + if propKey.startswith('ACS-configuration'): + configurations.append(json.loads(details[propKey])) + elif propKey.startswith('ACS-disk'): + detail = json.loads(details[propKey]) + if detail['isIso'] == True: + isos.append(detail) + else: + disks.append(detail) + elif propKey.startswith('ACS-network'): + networks.append(json.loads(details[propKey])) + + return configurations, disks, isos, networks + + def verify_nics(self, nic_networks, vm_id): + cmd = listNics.listNicsCmd() + cmd.virtualmachineid = vm_id + vm_nics = self.apiclient.listNics(cmd) + self.assertEqual( + isinstance(vm_nics, list), + True, + "Check listNics response returns a valid list" + ) + self.assertEqual( + len(nic_networks), + len(vm_nics), + msg="VM NIC count is different, expected = {}, result = {}".format(len(nic_networks), len(vm_nics)) + ) + nic_networks.sort(key=itemgetter('nic')) # CS will create NIC in order of InstanceID. Check network order + vm_nics.sort(key=itemgetter('deviceid')) + for i in range(len(vm_nics)): + nic = vm_nics[i] + nic_network = nic_networks[i] + self.assertEqual( + nic.networkid, + nic_network["network"], + msg="VM NIC(InstanceID: {}) network mismatch, expected = {}, result = {}".format(nic_network["nic"], nic_network["network"], nic.networkid) + ) + + def verify_disks(self, template_disks, vm_id): + cmd = listVolumes.listVolumesCmd() + cmd.virtualmachineid = vm_id + cmd.listall = True + vm_volumes = self.apiclient.listVolumes(cmd) + self.assertEqual( + isinstance(vm_volumes, list), + True, + "Check listVolumes response returns a valid list" + ) + self.assertEqual( + len(template_disks), + len(vm_volumes), + msg="VM volumes count is different, expected = {}, result = {}".format(len(template_disks), len(vm_volumes)) + ) + template_disks.sort(key=itemgetter('diskNumber')) + vm_volumes.sort(key=itemgetter('deviceid')) + for j in range(len(vm_volumes)): + volume = vm_volumes[j] + disk = template_disks[j] + self.assertEqual( + volume.size, + disk["virtualSize"], + msg="VM Volume(diskNumber: {}) network mismatch, expected = {}, result = {}".format(disk["diskNumber"], disk["virtualSize"], volume.size) + ) + + @attr(tags=["advanced", "advancedns", "smoke", "sg", "dev"], required_hardware="false") + @skipTestIf("hypervisorNotSupported") + def test_01_vapps_vm_cycle(self): + """ + Test the following for all found ovf templates: + 1. Deploy VM + 2. Verify VM has correct properties + 3. Verify VM has correct disks + 4. Verify VM has correct nics + 5. Destroy VM + """ + + for template in self.templates: + configurations, disks, isos, network = self.get_ova_parsed_information_from_template(template) + + if configurations: + conf = configurations[0] + items = conf['hardwareItems'] + cpu_speed = 1000 + cpu_number = 0 + memory = 0 + for item in items: + if item['resourceType'] == 'Memory': + memory = item['virtualQuantity'] + elif item['resourceType'] == 'Processor': + cpu_number = item['virtualQuantity'] + + nicnetworklist = [] + networks = [] + vm_service = self.services["virtual_machine_vapps"][template.name] + network_mappings = vm_service["nicnetworklist"] + for network_mapping in network_mappings: + network_service = self.services["isolated_network"] + network_offering_id = self.isolated_network_offering.id + if network_mapping["network"] == 'l2': + network_service = self.services["l2-network"] + network_offering_id = self.l2_network_offering.id + network = Network.create( + self.apiclient, + network_service, + networkofferingid=network_offering_id, + accountid=self.account.name, + domainid=self.account.domainid, + zoneid=self.zone.id) + networks.append(network) + for interface in network_mapping["nic"]: + nicnetworklist.append({"nic": interface, "network": network.id}) + + vm = VirtualMachine.create( + self.apiclient, + vm_service, + accountid=self.account.name, + domainid=self.account.domainid, + templateid=template.id, + serviceofferingid=self.custom_offering.id, + zoneid=self.zone.id, + customcpunumber=cpu_number, + customcpuspeed=cpu_speed, + custommemory=memory, + properties=vm_service['properties'], + nicnetworklist=nicnetworklist + ) + + list_vm_response = VirtualMachine.list( + self.apiclient, + id=vm.id + ) + self.debug( + "Verify listVirtualMachines response for virtual machine: %s" \ + % vm.id + ) + self.assertEqual( + isinstance(list_vm_response, list), + True, + "Check list response returns a valid list" + ) + self.assertNotEqual( + len(list_vm_response), + 0, + "Check VM available in List Virtual Machines" + ) + vm_response = list_vm_response[0] + self.assertEqual( + vm_response.id, + vm.id, + "Check virtual machine id in listVirtualMachines" + ) + self.assertEqual( + vm_response.name, + vm.name, + "Check virtual machine name in listVirtualMachines" + ) + self.assertEqual( + vm_response.state, + 'Running', + msg="VM is not in Running state" + ) + + # Verify nics + self.verify_nics(nicnetworklist, vm.id) + # Verify disks + self.verify_disks(disks, vm.id) + # Verify properties + original_properties = vm_service['properties'] + vm_properties = get_vm_vapp_configs(self.apiclient, self.config, self.zone, vm.instancename) + for property in original_properties: + if property["key"] in vm_properties: + self.assertEqual( + vm_properties[property["key"]], + property["value"], + "Check VM property %s with original value" % property["key"] + ) + + cmd = destroyVirtualMachine.destroyVirtualMachineCmd() + cmd.id = vm.id + self.apiclient.destroyVirtualMachine(cmd) diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 47087176be2..436c656509d 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -986,7 +986,60 @@ test_data = { "ispublic": "True" } }, - + "test_ovf_templates": [ + { + "name": "test-ovf", + "displaytext": "test-ovf", + "format": "ova", + "hypervisor": "vmware", + "ostype": "Other Linux (64-bit)", + "url": "http://172.17.0.1/machina-2dd-iso.ova", + "deployasis": "True", + "requireshvm": "True", + "ispublic": "True" + } + ], + "virtual_machine_vapps": { + "test-ovf": { + "name": "testvm-vapps", + "displayname": "Test VM vApps", + "properties": [ + { + "key": "used.by.admin", + "value": "marvin" + }, + { + "key": "use.type", + "value": "test" + }, + { + "key": "usefull.property", + "value": "True" + } + ], + "nicnetworklist": [ + { + "network": "l2", + "nic": [15, 18] + }, + { + "network": "l2", + "nic": [16] + }, + { + "network": "l2", + "nic": [17] + } + ] + } + }, + "custom_service_offering": { + "name": "Custom Service Offering for vApps", + "displaytext": "Custom Service Offering for vApps", + "cpunumber": "", + "cpuspeed": "", + "memory": "" + }, "coreos_volume": { "diskname": "Volume_core", "urlvmware":"http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-vmware.ova", diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 10ea666b2de..a53e295c974 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -502,7 +502,8 @@ class VirtualMachine: hostid=None, keypair=None, ipaddress=None, mode='default', method='GET', hypervisor=None, customcpunumber=None, customcpuspeed=None, custommemory=None, rootdisksize=None, - rootdiskcontroller=None, macaddress=None, datadisktemplate_diskoffering_list={}): + rootdiskcontroller=None, macaddress=None, datadisktemplate_diskoffering_list={}, + properties=None, nicnetworklist=None): """Create the instance""" cmd = deployVirtualMachine.deployVirtualMachineCmd() @@ -631,6 +632,12 @@ class VirtualMachine: elif macaddress in services: cmd.macaddress = services["macaddress"] + if properties: + cmd.properties = properties + + if nicnetworklist: + cmd.nicnetworklist = nicnetworklist + virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) if 'password' in virtual_machine.__dict__.keys(): @@ -1414,6 +1421,9 @@ class Template: if "directdownload" in services: cmd.directdownload = services["directdownload"] + if "deployasis" in services: + cmd.deployasis = services["deployasis"] + # Register Template template = apiclient.registerTemplate(cmd) diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py index 1c873a3d97a..fc9c72d88d6 100644 --- a/tools/marvin/marvin/lib/common.py +++ b/tools/marvin/marvin/lib/common.py @@ -395,6 +395,74 @@ def get_test_template(apiclient, zone_id=None, hypervisor=None, test_templates=N return FAILED +def get_test_ovf_templates(apiclient, zone_id=None, test_ovf_templates=None, hypervisor=None): + """ + @Name : get_test_ovf_templates + @Desc : Retrieves the list of test ovf templates used to running tests. When the template + is missing it will be download at most one in a zone for a hypervisor. + @Input : returns a list of templates + """ + result = [] + + if test_ovf_templates is None: + test_ovf_templates = test_data["test_ovf_templates"] + if test_ovf_templates is None: + return result + if hypervisor is None: + return result + hypervisor = hypervisor.lower() + if hypervisor != 'vmware': + return result + + for test_template in test_ovf_templates: + + cmd = listTemplates.listTemplatesCmd() + cmd.name = test_template['name'] + cmd.templatefilter = 'all' + if zone_id is not None: + cmd.zoneid = zone_id + if hypervisor is not None: + cmd.hypervisor = hypervisor + templates = apiclient.listTemplates(cmd) + + if validateList(templates)[0] != PASS: + template = Template.register(apiclient, test_template, zoneid=zone_id, hypervisor=hypervisor.lower(), randomize_name=False) + template.download(apiclient) + retries = 3 + while (template.details == None or len(template.details.__dict__) == 0) and retries > 0: + time.sleep(10) + template_list = Template.list(apiclient, id=template.id, zoneid=zone_id, templatefilter='all') + if isinstance(template_list, list): + template = Template(template_list[0].__dict__) + retries = retries - 1 + if template.details == None or len(template.details.__dict__) == 0: + template.delete(apiclient) + else: + result.append(template) + + if templates: + for template in templates: + if template.isready and template.ispublic and template.details != None and len(template.details.__dict__) > 0: + result.append(template.__dict__) + + return result + +def get_vm_vapp_configs(apiclient, config, setup_zone, vm_name): + zoneDetailsInConfig = [zone for zone in config.zones + if zone.name == setup_zone.name][0] + vcenterusername = zoneDetailsInConfig.vmwaredc.username + vcenterpassword = zoneDetailsInConfig.vmwaredc.password + vcenterip = zoneDetailsInConfig.vmwaredc.vcenter + vcenterObj = Vcenter( + vcenterip, + vcenterusername, + vcenterpassword) + + vms = vcenterObj.get_vms(vm_name) + if vms: + return vms[0]['vm']['properties'] + + def get_windows_template( apiclient, zone_id=None, ostype_desc=None, template_filter="featured", template_type='USER', template_id=None, template_name=None, account=None, domain_id=None, project_id=None, diff --git a/tools/marvin/marvin/lib/vcenter.py b/tools/marvin/marvin/lib/vcenter.py index d14f364bd1c..78ca50e19d8 100644 --- a/tools/marvin/marvin/lib/vcenter.py +++ b/tools/marvin/marvin/lib/vcenter.py @@ -114,6 +114,12 @@ class Vcenter(): for network in obj.network: vm_details['networks'].append({'name': network.name}) vm_details['raw'] = obj + vm_details['properties'] = {} + config = obj.config + if config and config.vAppConfig: + for prop in config.vAppConfig.property: + vm_details['properties'][prop.id] = prop.value + return vm_details def parse_details(self, obj, vimtype): diff --git a/ui/l10n/en.js b/ui/l10n/en.js index 8e25c54b04c..7e705131bcf 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -674,6 +674,7 @@ var dictionary = { "label.deleting.processing":"Deleting....", "label.deny":"Deny", "label.deployment.planner":"Deployment planner", +"label.deploy.as.is":"Deploy As-Is", "label.description":"Description", "label.destination.physical.network.id":"Destination physical network ID", "label.destination.zone":"Destination Zone", diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js index a801a6b52e0..19a7ad0441b 100755 --- a/ui/scripts/docs.js +++ b/ui/scripts/docs.js @@ -1243,6 +1243,10 @@ cloudStack.docs = { desc: 'The Management Server will download the file from the specified URL, such as http://my.web.server/filename.vhd.gz', externalLink: '' }, + helpRegisterTemplateDeployAsIs: { + desc: 'Vmware Only: Deploy with specifications from OVF instead of orchestrated specs', + externalLink: '' + }, helpRegisterTemplateDirectDownload: { desc: 'KVM Only: Secondary Storage is bypassed and template/ISO is downloaded to Primary Storage on deployment', externalLink: '' diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index f06cd9046d4..466db99788b 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -965,17 +965,6 @@ } }); - if (selectedTemplateObj) { - $.ajax({ - url: createURL("listTemplateOvfProperties&id=" + selectedTemplateObj.id), - dataType: "json", - async: false, - success: function(json) { - ovfProps = json.listtemplateovfpropertiesresponse.ovfproperty; - } - }); - } - var $step = $('.step.sshkeyPairs:visible'); if (ovfProps == null || ovfProps.length === 0) { $step.addClass('next-skip-ovf-properties'); @@ -984,15 +973,6 @@ } }, - // Step PRE-8: Configure OVF Properties (if available) for the template - function(args) { - args.response.success({ - data: { - ovfProperties: ovfProps - } - }); - }, - // Step 8: Review function(args) { var $step = $('.step.review:visible'); @@ -1054,8 +1034,8 @@ } }); for (var k = 0; k < deployOvfProperties.length; k++) { - deployVmData["ovfproperties[" + k + "].key"] = deployOvfProperties[k].key; - deployVmData["ovfproperties[" + k + "].value"] = deployOvfProperties[k].value; + deployVmData["properties[" + k + "].key"] = deployOvfProperties[k].key; + deployVmData["properties[" + k + "].value"] = deployOvfProperties[k].value; } } diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 1516286f01a..aeae6f04cc0 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -248,6 +248,7 @@ $form.find('.form-item[rel=rootDiskControllerType]').css('display', 'inline-block'); $form.find('.form-item[rel=nicAdapterType]').css('display', 'inline-block'); $form.find('.form-item[rel=keyboardType]').css('display', 'inline-block'); + $form.find('.form-item[rel=deployAsIs]').css('display', 'inline-block'); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); @@ -258,6 +259,7 @@ $form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); + $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); if (isAdmin()) { @@ -268,6 +270,7 @@ $form.find('.form-item[rel=nicAdapterType]').hide(); $form.find('.form-item[rel=keyboardType]').hide(); $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); + $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').css('display', 'inline-block'); $('#label_root_disk_controller').prop('selectedIndex', 2); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); @@ -281,6 +284,7 @@ $form.find('.form-item[rel=xenserverToolsVersion61plus]').hide(); $form.find('.form-item[rel=rootDiskControllerTypeKVM]').hide(); $form.find('.form-item[rel=directdownload]').hide(); + $form.find('.form-item[rel=deployAsIs]').hide(); $form.find('.form-item[rel=requireshvm]').css('display', 'inline-block'); } }); @@ -463,6 +467,13 @@ }); } }, + deployAsIs : { + label: 'label.deploy.as.is', + docID: 'helpRegisterTemplateDeployAsIs', + isBoolean: true, + dependsOn: 'hypervisor', + isHidden: true + }, // fields for hypervisor == "VMware" (ends here) format: { @@ -683,6 +694,11 @@ 'details[0].keyboard': args.data.keyboardType }); } + if (args.$form.find('.form-item[rel=deployAsIs]').css("display") != "none" && args.data.deployAsIs != "") { + $.extend(data, { + deployAsIs: (args.data.deployAsIs == "on") ? "true" : "false" + }); + } // for hypervisor == VMware (ends here) $.ajax({ @@ -1823,18 +1839,7 @@ } }, tabFilter: function (args) { - $.ajax({ - url: createURL("listTemplateOvfProperties&id=" + args.context.templates[0].id), - dataType: "json", - async: false, - success: function(json) { - ovfprops = json.listtemplateovfpropertiesresponse.ovfproperty; - } - }); var hiddenTabs = []; - if (ovfprops == null || ovfprops.length === 0) { - hiddenTabs.push("ovfpropertiestab"); - } return hiddenTabs; }, tabs: { @@ -1919,6 +1924,11 @@ isBoolean: true, converter: cloudStack.converters.toBooleanText }, + deployAsIs: { + label: 'label.deploy.as.is', + isBoolean: true, + converter: cloudStack.converters.toBooleanText + }, isextractable: { label: 'label.extractable.lower', isBoolean: true, @@ -2605,57 +2615,7 @@ } } }) - }, - - /** - * OVF properties tab (only displayed when OVF properties are available) - */ - ovfpropertiestab: { - title: 'label.ovf.properties', - listView: { - id: 'ovfproperties', - fields: { - label: { - label: 'label.label' - }, - description: { - label: 'label.description' - }, - value: { - label: 'label.value' - } - }, - hideSearchBar: true, - dataProvider: function(args) { - $.ajax({ - url: createURL("listTemplateOvfProperties"), - data: { - id: args.context.templates[0].id - }, - success: function(json) { - var ovfprops = json.listtemplateovfpropertiesresponse.ovfproperty; - var listDetails = []; - for (index in ovfprops){ - var prop = ovfprops[index]; - var det = {}; - det['label'] = prop['label']; - det['description'] = prop['description']; - det['value'] = prop['value']; - listDetails.push(det); - } - args.response.success({ - data: listDetails - }); - }, - - error: function(json) { - args.response.error(parseXMLHttpResponse(json)); - } - }); - - } - } - } + } } } } @@ -2851,6 +2811,11 @@ docID: 'helpRegisterISOFeatured', isBoolean: true, isHidden: true + }, + deployAsIs : { + label: 'label.deploy.as.is', + docID: 'helpRegisterTemplateDeployAsIs', + isBoolean: true } } }, @@ -2864,7 +2829,8 @@ zoneid: args.data.zone, isextractable: (args.data.isExtractable == "on"), bootable: (args.data.isBootable == "on"), - directdownload: (args.data.directdownload == "on") + directdownload: (args.data.directdownload == "on"), + deployAsIs: (args.data.deployAsIs == "on") }; if (args.$form.find('.form-item[rel=osTypeId]').css("display") != "none") { @@ -3701,6 +3667,11 @@ isBoolean: true, converter: cloudStack.converters.toBooleanText }, + deployAsIs: { + label: 'label.deploy.as.is', + isBoolean: true, + converter: cloudStack.converters.toBooleanText + }, size: { label: 'label.size', converter: function(args) { diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 4aefa97b335..2004257b2c6 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -172,10 +172,20 @@ .html(qualifier) propertyField.append(option); }); - } else if (qualifiers.startsWith("MaxLen")) { - var length = qualifiers.replace("MaxLen(","").slice(0,-1); + } else if (qualifiers.includes("MinLen") || qualifiers.includes("MaxLen") ) { + var split = qualifiers.split(","); + var minLen = 0; + var maxLen = 524288; /* 524288 being the default according to w3schools */ + for ( var i = 0; i < split.length; i++ ) { + if (split[i].startsWith("MaxLen")) { + maxLen = split[i].replace("MaxLen(","").replace(")",""); + } else if (split[i].startsWith("MinLen")) { + minLen = split[i].replace("MinLen(","").replace(")",""); + } + } propertyField = $('') - .attr({maxlength : length, type: fieldType}) + .attr({pattern : '.{' + minLen + ',' + maxLen + '}'}) + .attr({type: fieldType}) .addClass('name').val(_s(this[fields.value])) } } else { diff --git a/utils/pom.xml b/utils/pom.xml index 8a745aa21a7..75c9cd463aa 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -178,6 +178,10 @@ jackson-databind ${cs.jackson.version} + + org.apache.commons + commons-compress + diff --git a/utils/src/main/java/com/cloud/utils/compression/CompressionUtil.java b/utils/src/main/java/com/cloud/utils/compression/CompressionUtil.java new file mode 100644 index 00000000000..20f0bc8eb7c --- /dev/null +++ b/utils/src/main/java/com/cloud/utils/compression/CompressionUtil.java @@ -0,0 +1,58 @@ +// +// 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.utils.compression; + +import org.apache.log4j.Logger; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + +public class CompressionUtil { + + private static final Logger s_logger = Logger.getLogger(CompressionUtil.class); + + public byte[] compressString(String inputStr) throws IOException { + ByteArrayOutputStream obj = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(obj); + gzip.write(inputStr.getBytes(StandardCharsets.UTF_8)); + gzip.close(); + return obj.toByteArray(); + } + + public String decompressByteArary(byte[] compressed) throws IOException { + GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(compressed)); + BufferedReader bf = new BufferedReader(new InputStreamReader(gis, StandardCharsets.UTF_8)); + String line = bf.readLine(); + StringBuilder builder = new StringBuilder(); + while (line != null) { + builder.append(line); + line = bf.readLine(); + if (line != null) { + builder.append("\n"); + } + } + return builder.toString(); + } +} diff --git a/utils/src/test/java/com/cloud/utils/compression/CompressionUtilTest.java b/utils/src/test/java/com/cloud/utils/compression/CompressionUtilTest.java new file mode 100644 index 00000000000..e247d6c9435 --- /dev/null +++ b/utils/src/test/java/com/cloud/utils/compression/CompressionUtilTest.java @@ -0,0 +1,128 @@ +// +// 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.utils.compression; + +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; + +public class CompressionUtilTest { + + private CompressionUtil util = new CompressionUtil(); + + private String testEula = "END USER LICENSE AGREEMENT\n" + + "\n" + + "IMPORTANT: PLEASE READ THIS END USER LICENSE AGREEMENT CAREFULLY. IT IS VERY IMPORTANT THAT YOU CHECK THAT YOU ARE PURCHASING CISCO SOFTWARE OR EQUIPMENT FROM AN APPROVED SOURCE AND THAT YOU, OR THE ENTITY YOU REPRESENT (COLLECTIVELY, THE \"CUSTOMER\") HAVE BEEN REGISTERED AS THE END USER FOR THE PURPOSES OF THIS CISCO END USER LICENSE AGREEMENT. IF YOU ARE NOT REGISTERED AS THE END USER YOU HAVE NO LICENSE TO USE THE SOFTWARE AND THE LIMITED WARRANTY IN THIS END USER LICENSE AGREEMENT DOES NOT APPLY. ASSUMING YOU HAVE PURCHASED FROM AN APPROVED SOURCE, DOWNLOADING, INSTALLING OR USING CISCO OR CISCO-SUPPLIED SOFTWARE CONSTITUTES ACCEPTANCE OF THIS AGREEMENT.\n" + + "\n" + + "CISCO SYSTEMS, INC. OR ITS AFFILIATE LICENSING THE SOFTWARE (\"CISCO\") IS WILLING TO LICENSE THIS SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU PURCHASED THE SOFTWARE FROM AN APPROVED SOURCE AND THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS END USER LICENSE AGREEMENT PLUS ANY ADDITIONAL LIMITATIONS ON THE LICENSE SET FORTH IN A SUPPLEMENTAL LICENSE AGREEMENT ACCOMPANYING THE PRODUCT, MADE AVAILABLE AT THE TIME OF YOUR ORDER, OR POSTED ON THE CISCO WEBSITE AT www.cisco.com/go/terms (COLLECTIVELY THE \"AGREEMENT\"). TO THE EXTENT OF ANY CONFLICT BETWEEN THE TERMS OF THIS END USER LICENSE AGREEMENT AND ANY SUPPLEMENTAL LICENSE AGREEMENT, THE SUPPLEMENTAL " + + "LICENSE AGREEMENT SHALL APPLY. BY DOWNLOADING, INSTALLING, OR USING THE SOFTWARE, YOU ARE REPRESENTING THAT YOU PURCHASED THE SOFTWARE FROM AN APPROVED SOURCE AND BINDING YOURSELF TO THE AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THE AGREEMENT, THEN CISCO IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND (A) YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE, AND (B) YOU MAY RETURN THE SOFTWARE (INCLUDING ANY UNOPENED CD PACKAGE AND ANY WRITTEN MATERIALS) FOR A FULL REFUND, OR, IF THE SOFTWARE AND WRITTEN MATERIALS ARE SUPPLIED AS PART OF ANOTHER PRODUCT, YOU MAY RETURN THE ENTIRE PRODUCT FOR A FULL REFUND. YOUR RIGHT TO RETURN AND REFUND EXPIRES 30 " + + "DAYS AFTER PURCHASE FROM AN APPROVED SOURCE, AND APPLIES ONLY IF YOU ARE THE ORIGINAL AND REGISTERED END USER PURCHASER. FOR THE PURPOSES OF THIS END USER LICENSE AGREEMENT, AN \"APPROVED SOURCE\" MEANS (A) CISCO; OR (B) A DISTRIBUTOR OR SYSTEMS INTEGRATOR AUTHORIZED BY CISCO TO DISTRIBUTE / SELL CISCO EQUIPMENT, SOFTWARE AND SERVICES WITHIN YOUR TERRITORY TO END USERS; OR (C) A RESELLER AUTHORIZED BY ANY SUCH DISTRIBUTOR OR SYSTEMS INTEGRATOR IN ACCORDANCE WITH THE TERMS OF THE DISTRIBUTOR'S AGREEMENT WITH CISCO TO DISTRIBUTE / SELL THE CISCO EQUIPMENT, SOFTWARE AND SERVICES WITHIN YOUR TERRITORY TO END USERS.\n" + + "\n" + + "THE FOLLOWING TERMS OF THE AGREEMENT GOVERN CUSTOMER'S USE OF THE SOFTWARE (DEFINED BELOW), EXCEPT TO THE EXTENT: (A) THERE IS A SEPARATE SIGNED CONTRACT BETWEEN CUSTOMER AND CISCO GOVERNING CUSTOMER'S USE OF THE SOFTWARE, OR (B) THE SOFTWARE INCLUDES A SEPARATE \"CLICK-ACCEPT\" LICENSE AGREEMENT OR THIRD PARTY LICENSE AGREEMENT AS PART OF THE INSTALLATION OR DOWNLOAD PROCESS GOVERNING CUSTOMER'S USE OF THE SOFTWARE. TO THE EXTENT OF A CONFLICT BETWEEN THE PROVISIONS OF THE FOREGOING DOCUMENTS, THE ORDER OF PRECEDENCE SHALL BE (1)THE SIGNED CONTRACT, (2) THE CLICK-ACCEPT AGREEMENT OR THIRD PARTY LICENSE AGREEMENT, AND (3) THE AGREEMENT. FOR PURPOSES OF THE " + + "AGREEMENT, \"SOFTWARE\" SHALL MEAN COMPUTER PROGRAMS, INCLUDING FIRMWARE AND COMPUTER PROGRAMS EMBEDDED IN CISCO EQUIPMENT, AS PROVIDED TO CUSTOMER BY AN APPROVED SOURCE, AND ANY UPGRADES, UPDATES, BUG FIXES OR MODIFIED VERSIONS THERETO (COLLECTIVELY, \"UPGRADES\"), ANY OF THE SAME WHICH HAS BEEN RELICENSED UNDER THE CISCO SOFTWARE TRANSFER AND RE-LICENSING POLICY (AS MAY BE AMENDED BY CISCO FROM TIME TO TIME) OR BACKUP COPIES OF ANY OF THE FOREGOING.\n" + + "\n" + + "License. Conditioned upon compliance with the terms and conditions of the Agreement, Cisco grants to Customer a nonexclusive and nontransferable license to use for Customer's internal business purposes the Software and the Documentation for which Customer has paid the required license fees to an Approved Source. \"Documentation\" means written information (whether contained in user or technical manuals, training materials, specifications or otherwise) pertaining to the Software and made available by an Approved Source with the Software in any manner (including on CD-Rom, or on-line). In order to use the Software, Customer may be required to input a registration number or product authorization key and register Customer's copy of the Software online at Cisco's website to obtain the necessary license key or license file.\n" + + "\n" + + "Customer's license to use the Software shall be limited to, and Customer shall not use the Software in excess of, a single hardware chassis or card or such other limitations as are set forth in the applicable Supplemental License Agreement or in the applicable purchase order which has been accepted by an Approved Source and for which Customer has paid to an Approved Source the required license fee (the \"Purchase Order\").\n" + + "\n" + + "Unless otherwise expressly provided in the Documentation or any applicable Supplemental License Agreement, Customer shall use the Software solely as embedded in, for execution on, or (where the applicable Documentation permits installation on non-Cisco equipment) for communication with Cisco equipment owned or leased by Customer and used for Customer's internal business purposes. No other licenses are granted by implication, estoppel or otherwise.\n" + + "\n" + + "For evaluation or beta copies for which Cisco does not charge a license fee, the above requirement to pay license fees does not apply.\n" + + "\n" + + "General Limitations. This is a license, not a transfer of title, to the Software and Documentation, and Cisco retains ownership of all copies of the Software and Documentation. Customer acknowledges that the Software and Documentation contain trade secrets of Cisco or its suppliers or licensors, including but not limited to the specific internal design and structure of individual programs and associated interface information. Except as otherwise expressly provided under the Agreement, Customer shall only use the Software in connection with the use of Cisco equipment purchased by the Customer from an Approved Source and Customer shall have no right, and Customer specifically agrees not to:\n" + + "\n" + + "(i) transfer, assign or sublicense its license rights to any other person or entity (other than in compliance with any Cisco relicensing/transfer policy then in force), or use the Software on Cisco equipment not purchased by the Customer from an Approved Source or on secondhand Cisco equipment, and Customer acknowledges that any attempted transfer, assignment, sublicense or use shall be void;\n" + + "\n" + + "(ii) make error corrections to or otherwise modify or adapt the Software or create derivative works based upon the Software, or permit third parties to do the same;\n" + + "\n" + + "(iii) reverse engineer or decompile, decrypt, disassemble or otherwise reduce the Software to human-readable form, except to the extent otherwise expressly permitted under applicable law notwithstanding this restriction or except to the extent that Cisco is legally required to permit such specific activity pursuant to any applicable open source license;\n" + + "\n" + + "(iv) publish any results of benchmark tests run on the Software;\n" + + "\n" + + "(v) use or permit the Software to be used to perform services for third parties, whether on a service bureau or time sharing basis or otherwise, without the express written authorization of Cisco; or\n" + + "\n" + + "(vi) disclose, provide, or otherwise make available trade secrets contained within the Software and Documentation in any form to any third party without the prior written consent of Cisco. Customer shall implement reasonable security measures to protect such trade secrets.\n" + + "\n" + + "To the extent required by applicable law, and at Customer's written request, Cisco shall provide Customer with the interface information needed to achieve interoperability between the Software and another independently created program, on payment of Cisco's applicable fee, if any. Customer shall observe strict obligations of confidentiality with respect to such information and shall use such information in compliance with any applicable terms and conditions upon which Cisco makes such information available.\n" + + "\n" + + "Software, Upgrades and Additional Copies. NOTWITHSTANDING ANY OTHER PROVISION OF THE AGREEMENT: (1) CUSTOMER HAS NO LICENSE OR RIGHT TO MAKE OR USE ANY ADDITIONAL COPIES OR UPGRADES UNLESS CUSTOMER, AT THE TIME OF MAKING OR ACQUIRING SUCH COPY OR UPGRADE, ALREADY HOLDS A VALID LICENSE TO THE ORIGINAL SOFTWARE AND HAS PAID THE APPLICABLE FEE TO AN APPROVED SOURCE FOR THE UPGRADE OR ADDITIONAL COPIES; (2) USE OF UPGRADES IS LIMITED TO CISCO EQUIPMENT SUPPLIED BY AN APPROVED SOURCE FOR WHICH CUSTOMER IS THE ORIGINAL END USER PURCHASER OR LESSEE OR OTHERWISE HOLDS A VALID LICENSE TO USE THE SOFTWARE WHICH IS BEING UPGRADED; AND (3) THE MAKING AND USE OF ADDITIONAL COPIES IS LIMITED TO NECESSARY BACKUP PURPOSES ONLY.\n" + + "\n" + + "Proprietary Notices. Customer agrees to maintain and reproduce all copyright, proprietary, and other notices on all copies, in any form, of the Software in the same form and manner that such copyright and other proprietary notices are included on the Software. Except as expressly authorized in the Agreement, Customer shall not make any copies or duplicates of any Software without the prior written permission of Cisco.\n" + + "\n" + + "Term and Termination. The Agreement and the license granted herein shall remain effective until terminated. Customer may terminate the Agreement and the license at any time by destroying all copies of Software and any Documentation. Customer's rights under the Agreement will terminate immediately without notice from Cisco if Customer fails to comply with any provision of the Agreement. Upon termination, Customer shall destroy all copies of Software and Documentation in its possession or control. All confidentiality obligations of Customer, " + + "all restrictions and limitations imposed on the Customer under the section titled \"General Limitations\" and all limitations of liability and disclaimers and restrictions of warranty shall survive termination of this Agreement. In addition, the provisions of the sections titled \"U.S. Government End User Purchasers\" and \"General Terms Applicable to the Limited Warranty Statement and End User License Agreement\" shall survive termination of the Agreement.\n" + + "\n" + + "Customer Records. Customer grants to Cisco and its independent accountants the right to examine Customer's books, records and accounts during Customer's normal business hours to verify compliance with this Agreement. In the event such audit discloses non-compliance with this Agreement, Customer shall promptly pay to Cisco the appropriate license fees, plus the reasonable cost of conducting the audit.\n" + + "\n" + + "Export, Re-Export, Transfer and Use Controls. The Software, Documentation and technology or direct products thereof (hereafter referred to as Software and Technology), supplied by Cisco under the Agreement are subject to export controls under the laws and regulations of the United States (\"U.S.\") and any other applicable countries' laws and regulations. Customer shall comply with such laws and regulations governing export, re-export, import, transfer and use of Cisco Software and Technology and will obtain all required U.S. and local authorizations, permits, or licenses. Cisco and Customer each agree to provide the other information, support documents, and assistance as may reasonably be required by the other in connection with securing authorizations or licenses. Information regarding compliance with export, re-export, transfer and use may be located at the following URL: www.cisco.com/web/about/doing_business/legal/global_export_trade/general_export/contract_compliance.html\n" + + "\n" + + "U.S. Government End User Purchasers. The Software and Documentation qualify as \"commercial items,\" as that term is defined at Federal Acquisition Regulation (\"FAR\") (48 C.F.R.) 2.101, consisting of \"commercial computer software\" and \"commercial computer software documentation\" as such terms are used in FAR 12.212. Consistent with FAR 12.212 and DoD FAR Supp. 227.7202-1 through 227.7202-4, and notwithstanding any other FAR or other contractual clause to the contrary in any agreement into which the Agreement may be incorporated, Customer may provide to Government end user or, if the Agreement is direct, Government end user will acquire, the Software and Documentation with only those rights set forth in the Agreement. Use of either the Software or Documentation or both constitutes agreement by the Government that the Software and Documentation are \"commercial computer software\" and \"commercial " + + "computer software documentation,\" and constitutes acceptance of the rights and restrictions herein.\n" + + "\n" + + "Identified Components; Additional Terms. The Software may contain or be delivered with one or more components, which may include third-party components, identified by Cisco in the Documentation, readme.txt file, third-party click-accept or elsewhere (e.g. on www.cisco.com) (the \"Identified Component(s)\") as being subject to different license agreement terms, disclaimers of warranties, limited warranties or other terms and conditions (collectively, \"Additional Terms\") than those set forth herein. You agree to the applicable Additional Terms for any such Identified Component(s).\n" + + "\n" + + "Limited Warranty\n" + + "\n" + + "Subject to the limitations and conditions set forth herein, Cisco warrants that commencing from the date of shipment to Customer (but in case of resale by an Approved Source other than Cisco, commencing not more than ninety (90) days after original shipment by Cisco), and continuing for a period of the longer of (a) ninety (90) days or (b) the warranty period (if any) expressly set forth as applicable specifically to software in the warranty card accompanying the product of which the Software is a part (the \"Product\") (if any): (a) the media on which the Software is furnished will be free of defects in materials and workmanship under normal use; and (b) the Software substantially conforms to the Documentation. The date of shipment of a Product by Cisco is set forth " + + "on the packaging material in which the Product is shipped. Except for the foregoing, the Software is provided \"AS IS\". This limited warranty extends only to the Software purchased from an Approved Source by a Customer who is the first registered end user. Customer's sole and exclusive remedy and the entire liability of Cisco and its suppliers under this limited warranty will be (i) replacement of defective media and/or (ii) at Cisco's option, repair, replacement, or refund of the purchase price of the Software, in both cases subject to the condition that any error or defect constituting a breach of this limited warranty is reported to the Approved Source supplying the Software to Customer, within the warranty period. Cisco or the Approved Source supplying the Software to Customer may, at its option, require return of the Software and/or Documentation as a condition to the remedy. " + + "In no event does Cisco warrant that the Software is error free or that Customer will be able to operate the Software without problems or interruptions. In addition, due to the continual development of new techniques for intruding upon and attacking networks, Cisco does not warrant that the Software or any equipment, system or network on which the Software is used will be free of vulnerability to intrusion or attack.\n" + + "\n" + + "Restrictions. This warranty does not apply if the Software, Product or any other equipment upon which the Software is authorized to be used (a) has been altered, except by Cisco or its authorized representative, (b) has not been installed, operated, repaired, or maintained in accordance with instructions supplied by Cisco, (c) has been subjected to abnormal physical or electrical stress, abnormal environmental conditions, misuse, negligence, or accident; or (d) is licensed for beta, evaluation, testing or demonstration purposes. The Software warranty also does not apply to (e) any temporary Software modules; (f) any Software not posted on Cisco's Software Center; (g) any Software that Cisco expressly provides on an \"AS IS\" basis on Cisco's Software Center; (h) any Software for which an Approved Source does not receive a license fee; and (i) Software supplied by any third party which is not an Approved Source.\n" + + "\n" + + "DISCLAIMER OF WARRANTY\n" + + "\n" + + "EXCEPT AS SPECIFIED IN THIS WARRANTY SECTION, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS, AND WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OR CONDITION OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, SATISFACTORY QUALITY, NON-INTERFERENCE, ACCURACY OF INFORMATIONAL CONTENT, OR ARISING FROM A COURSE OF DEALING, LAW, USAGE, OR TRADE PRACTICE, ARE HEREBY EXCLUDED TO THE EXTENT ALLOWED BY APPLICABLE LAW AND ARE EXPRESSLY DISCLAIMED BY CISCO, ITS SUPPLIERS AND LICENSORS. TO THE EXTENT THAT ANY OF THE SAME CANNOT BE EXCLUDED, SUCH IMPLIED CONDITION, REPRESENTATION AND/OR WARRANTY IS LIMITED IN DURATION TO THE EXPRESS WARRANTY PERIOD REFERRED TO IN THE \"LIMITED WARRANTY\" SECTION ABOVE. BECAUSE SOME STATES OR JURISDICTIONS " + + "DO NOT ALLOW LIMITATIONS ON HOW LONG AN IMPLIED WARRANTY LASTS, THE ABOVE LIMITATION MAY NOT APPLY IN SUCH STATES. THIS WARRANTY GIVES CUSTOMER SPECIFIC LEGAL RIGHTS, AND CUSTOMER MAY ALSO HAVE OTHER RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION. This disclaimer and exclusion shall apply even if the express warranty set forth above fails of its essential purpose.\n" + + "\n" + + "Disclaimer of Liabilities-Limitation of Liability. IF YOU ACQUIRED THE SOFTWARE IN THE UNITED STATES, LATIN AMERICA, CANADA, JAPAN OR THE CARIBBEAN, NOTWITHSTANDING ANYTHING ELSE IN THE AGREEMENT TO THE CONTRARY, ALL LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS COLLECTIVELY, TO CUSTOMER, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), BREACH OF WARRANTY OR OTHERWISE, SHALL NOT EXCEED THE PRICE PAID BY CUSTOMER TO ANY APPROVED SOURCE FOR THE SOFTWARE THAT GAVE RISE TO THE CLAIM OR IF THE SOFTWARE IS PART OF ANOTHER PRODUCT, THE PRICE PAID FOR SUCH OTHER PRODUCT. THIS LIMITATION OF LIABILITY FOR SOFTWARE IS CUMULATIVE AND NOT PER INCIDENT (I.E. THE EXISTENCE OF TWO OR MORE CLAIMS WILL NOT ENLARGE THIS LIMIT).\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN EUROPE, THE MIDDLE EAST, AFRICA, ASIA OR OCEANIA, NOTWITHSTANDING ANYTHING ELSE IN THE AGREEMENT TO THE CONTRARY, ALL LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS COLLECTIVELY, TO CUSTOMER, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), BREACH OF WARRANTY OR OTHERWISE, SHALL NOT EXCEED THE PRICE PAID BY CUSTOMER TO CISCO FOR THE SOFTWARE THAT GAVE RISE TO THE CLAIM OR IF THE SOFTWARE IS PART OF ANOTHER PRODUCT, THE PRICE PAID FOR SUCH OTHER PRODUCT. THIS LIMITATION OF LIABILITY FOR SOFTWARE IS CUMULATIVE AND NOT PER INCIDENT (I.E. THE EXISTENCE OF TWO OR MORE CLAIMS WILL NOT ENLARGE THIS LIMIT). NOTHING IN THE AGREEMENT SHALL LIMIT (I) THE LIABILITY OF CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS TO CUSTOMER FOR PERSONAL " + + "INJURY OR DEATH CAUSED BY THEIR NEGLIGENCE, (II) CISCO'S LIABILITY FOR FRAUDULENT MISREPRESENTATION, OR (III) ANY LIABILITY OF CISCO WHICH CANNOT BE EXCLUDED UNDER APPLICABLE LAW.\n" + + "\n" + + "Disclaimer of Liabilities-Waiver of Consequential Damages and Other Losses. IF YOU ACQUIRED THE SOFTWARE IN THE UNITED STATES, LATIN AMERICA, THE CARIBBEAN OR CANADA, REGARDLESS OF WHETHER ANY REMEDY SET FORTH HEREIN FAILS OF ITS ESSENTIAL PURPOSE OR OTHERWISE, IN NO EVENT WILL CISCO OR ITS SUPPLIERS BE LIABLE FOR ANY LOST REVENUE, PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE OR OTHERWISE AND EVEN IF CISCO OR ITS SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATION OR EXCLUSION OF CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU.\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN JAPAN, EXCEPT FOR LIABILITY ARISING OUT OF OR IN CONNECTION WITH DEATH OR PERSONAL INJURY, FRAUDULENT MISREPRESENTATION, AND REGARDLESS OF WHETHER ANY REMEDY SET FORTH HEREIN FAILS OF ITS ESSENTIAL PURPOSE OR OTHERWISE, IN NO EVENT WILL CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE OR OTHERWISE AND EVEN IF CISCO OR ANY APPROVED SOURCE OR THEIR SUPPLIERS OR LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\n" + + "\n" + + "IF YOU ACQUIRED THE SOFTWARE IN EUROPE, THE MIDDLE EAST, AFRICA, ASIA OR OCEANIA, IN NO EVENT WILL CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS, BE LIABLE FOR ANY LOST REVENUE, LOST PROFIT, OR LOST OR DAMAGED DATA, BUSINESS INTERRUPTION, LOSS OF CAPITAL, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR PUNITIVE DAMAGES, HOWSOEVER ARISING, INCLUDING, WITHOUT LIMITATION, IN CONTRACT, TORT (INCLUDING NEGLIGENCE) OR WHETHER ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF, IN EACH CASE, CISCO, ITS AFFILIATES, OFFICERS, DIRECTORS, EMPLOYEES, AGENTS, SUPPLIERS AND LICENSORS, HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME STATES OR JURISDICTIONS DO NOT ALLOW LIMITATION OR EXCLUSION OF CONSEQUENTIAL OR INCIDENTAL" + + " DAMAGES, THE ABOVE LIMITATION MAY NOT FULLY APPLY TO YOU. THE FOREGOING EXCLUSION SHALL NOT APPLY TO ANY LIABILITY ARISING OUT OF OR IN CONNECTION WITH: (I) DEATH OR PERSONAL INJURY, (II) FRAUDULENT MISREPRESENTATION, OR (III) CISCO'S LIABILITY IN CONNECTION WITH ANY TERMS THAT CANNOT BE EXCLUDED UNDER APPLICABLE LAW.\n" + + "\n" + + "Customer acknowledges and agrees that Cisco has set its prices and entered into the Agreement in reliance upon the disclaimers of warranty and the limitations of liability set forth herein, that the same reflect an allocation of risk between the parties (including the risk that a contract remedy may fail of its essential purpose and cause consequential loss), and that the same form an essential basis of the bargain between the parties.\n" + + "\n" + + "Controlling Law, Jurisdiction. If you acquired, by reference to the address on the purchase order accepted by the Approved Source, the Software in the United States, Latin America, or the Caribbean, the Agreement and warranties (\"Warranties\") are controlled by and construed under the laws of the State of California, United States of America, notwithstanding any conflicts of law provisions; and the state and federal courts of California shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in Canada, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the Province of Ontario, Canada, notwithstanding any conflicts of law provisions; and the courts of the " + + "Province of Ontario shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in Europe, the Middle East, Africa, Asia or Oceania (excluding Australia), unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of England, notwithstanding any conflicts of law provisions; and the English courts shall have exclusive jurisdiction over any " + + "claim arising under the Agreement or Warranties. In addition, if the Agreement is controlled by the laws of England, no person who is not a party to the Agreement shall be entitled to enforce or take the benefit of any of its terms under the Contracts (Rights of Third Parties) Act 1999. If you acquired the Software in Japan, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of Japan, notwithstanding any conflicts of law provisions; and the Tokyo District Court of Japan shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in Australia, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the " + + "State of New South Wales, Australia, notwithstanding any conflicts of law provisions; and the State and federal courts of New South Wales shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties. If you acquired the Software in any other country, unless expressly prohibited by local law, the Agreement and Warranties are controlled by and construed under the laws of the State of California, United States of America, " + + "notwithstanding any conflicts of law provisions; and the state and federal courts of California shall have exclusive jurisdiction over any claim arising under the Agreement or Warranties.\n" + + "\n" + + "For all countries referred to above, the parties specifically disclaim the application of the UN Convention on Contracts for the International Sale of Goods. Notwithstanding the foregoing, either party may seek interim injunctive relief in any court of appropriate jurisdiction with respect to any alleged breach of such party's intellectual property or proprietary rights. If any portion hereof is found to be void or unenforceable, the remaining provisions of the Agreement and Warranties shall remain in full force and effect. Except as expressly provided herein, the Agreement constitutes the entire agreement between the parties with respect to the license of the Software and Documentation and supersedes any conflicting or additional terms contained in any Purchase Order or elsewhere, all of which terms are excluded. The Agreement has been written in the English language, and the parties agree that the English version will govern.\n" + + "\n" + + "Product warranty terms and other information applicable to Cisco products are available at the following URL: www.cisco.com/go/warranty\n" + + "\n" + + "Cisco and the Cisco logo are trademarks or registered trademarks of Cisco and/or its affiliates in the U.S. and other countries. To view a list of Cisco trademarks, go to this URL: www.cisco.com/go/trademarks. Third-party trademarks mentioned are the property of their respective owners. The use of the word partner does not imply a partnership relationship between Cisco and any other company. (1110R)\n" + + "\n" + + "© 1998, 2001, 2003, 2008-2014 Cisco Systems, Inc. All rights reserved."; + + @Test + public void testCompressDecompressString() throws IOException { + byte[] compressed = util.compressString(testEula); + String decompressed = util.decompressByteArary(compressed); + Assert.assertEquals(decompressed, testEula); + } +} diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java index e4926472824..1bcebc9eab3 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ClusterMO.java @@ -386,7 +386,7 @@ public class ClusterMO extends BaseMO implements VmwareHypervisorHost { } @Override - public void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption) throws Exception { + public void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption, String configurationId) throws Exception { if (s_logger.isTraceEnabled()) s_logger.trace("vCenter API trace - importVmFromOVF(). target MOR: " + _mor.getValue() + ", ovfFilePath: " + ovfFilePath + ", vmName: " + vmName + ", datastore: " + dsMo.getMor().getValue() + ", diskOption: " + diskOption); @@ -397,7 +397,7 @@ public class ClusterMO extends BaseMO implements VmwareHypervisorHost { if (s_logger.isTraceEnabled()) s_logger.trace("vCenter API trace - importVmFromOVF(). resource pool: " + morRp.getValue()); - HypervisorHostHelper.importVmFromOVF(this, ovfFilePath, vmName, dsMo, diskOption, morRp, null); + HypervisorHostHelper.importVmFromOVF(this, ovfFilePath, vmName, dsMo, diskOption, morRp, null, configurationId); if (s_logger.isTraceEnabled()) s_logger.trace("vCenter API trace - importVmFromOVF() done"); diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 057c4f8f769..0457039293a 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -760,7 +760,7 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost { return dsList; } - public void importVmFromOVF(String ovfFilePath, String vmName, String datastoreName, String diskOption) throws Exception { + public void importVmFromOVF(String ovfFilePath, String vmName, String datastoreName, String diskOption, String configurationId) throws Exception { if (s_logger.isTraceEnabled()) s_logger.trace("vCenter API trace - importVmFromOVF(). target MOR: " + _mor.getValue() + ", ovfFilePath: " + ovfFilePath + ", vmName: " + vmName + ",datastoreName: " + datastoreName + ", diskOption: " + diskOption); @@ -769,19 +769,19 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost { if (dsMo == null) throw new Exception("Invalid datastore name: " + datastoreName); - importVmFromOVF(ovfFilePath, vmName, dsMo, diskOption); + importVmFromOVF(ovfFilePath, vmName, dsMo, diskOption, configurationId); if (s_logger.isTraceEnabled()) s_logger.trace("vCenter API trace - importVmFromOVF() done"); } @Override - public void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption) throws Exception { + public void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption, String configurationId) throws Exception { ManagedObjectReference morRp = getHyperHostOwnerResourcePool(); assert (morRp != null); - HypervisorHostHelper.importVmFromOVF(this, ovfFilePath, vmName, dsMo, diskOption, morRp, _mor); + HypervisorHostHelper.importVmFromOVF(this, ovfFilePath, vmName, dsMo, diskOption, morRp, _mor, configurationId); } @Override diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 3bb0d16b992..e8ea88207ac 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -37,6 +37,17 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import com.vmware.vim25.ConcurrentAccessFaultMsg; +import com.vmware.vim25.DuplicateNameFaultMsg; +import com.vmware.vim25.FileFaultFaultMsg; +import com.vmware.vim25.InsufficientResourcesFaultFaultMsg; +import com.vmware.vim25.InvalidDatastoreFaultMsg; +import com.vmware.vim25.InvalidNameFaultMsg; +import com.vmware.vim25.InvalidStateFaultMsg; +import com.vmware.vim25.OutOfBoundsFaultMsg; +import com.vmware.vim25.RuntimeFaultFaultMsg; +import com.vmware.vim25.TaskInProgressFaultMsg; +import com.vmware.vim25.VmConfigFaultFaultMsg; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; @@ -1563,20 +1574,35 @@ public class HypervisorHostHelper { * - If the cluster hardware version is not set, check datacenter hardware version. If it is set, then it is set to vmConfig * - In case both cluster and datacenter hardware version are not set, hardware version is not set to vmConfig */ - protected static void setVMHardwareVersion(VirtualMachineConfigSpec vmConfig, ClusterMO clusterMO, DatacenterMO datacenterMO) throws Exception { + public static void setVMHardwareVersion(VirtualMachineConfigSpec vmConfig, ClusterMO clusterMO, DatacenterMO datacenterMO) throws Exception { + String version = getNewVMHardwareVersion(clusterMO, datacenterMO); + if (StringUtils.isNotBlank(version)) { + vmConfig.setVersion(version); + } + } + + /** + * Return the VM hardware version based on the information retrieved by the cluster and datacenter: + * - If the cluster hardware version is set, then return this hardware version + * - If the cluster hardware version is not set, check datacenter hardware version. If it is set, then return it + * - In case both cluster and datacenter hardware version are not set, return null + */ + public static String getNewVMHardwareVersion(ClusterMO clusterMO, DatacenterMO datacenterMO) throws Exception { + String version = null; ClusterConfigInfoEx clusterConfigInfo = clusterMO != null ? clusterMO.getClusterConfigInfo() : null; String clusterHardwareVersion = clusterConfigInfo != null ? clusterConfigInfo.getDefaultHardwareVersionKey() : null; if (StringUtils.isNotBlank(clusterHardwareVersion)) { s_logger.debug("Cluster hardware version found: " + clusterHardwareVersion + ". Creating VM with this hardware version"); - vmConfig.setVersion(clusterHardwareVersion); + version = clusterHardwareVersion; } else { DatacenterConfigInfo datacenterConfigInfo = datacenterMO != null ? datacenterMO.getDatacenterConfigInfo() : null; String datacenterHardwareVersion = datacenterConfigInfo != null ? datacenterConfigInfo.getDefaultHardwareVersionKey() : null; if (StringUtils.isNotBlank(datacenterHardwareVersion)) { s_logger.debug("Datacenter hardware version found: " + datacenterHardwareVersion + ". Creating VM with this hardware version"); - vmConfig.setVersion(datacenterHardwareVersion); + version = datacenterHardwareVersion; } } + return version; } private static VirtualDeviceConfigSpec getControllerSpec(String diskController, int busNum) { @@ -1714,6 +1740,11 @@ public class HypervisorHostHelper { return url; } + /** + * removes the NetworkSection element from the {ovfString} if it is an ovf xml file + * @param ovfString input string + * @return like the input string but if xml elements by name {NetworkSection} removed + */ public static String removeOVFNetwork(final String ovfString) { if (ovfString == null || ovfString.isEmpty()) { return ovfString; @@ -1748,8 +1779,12 @@ public class HypervisorHostHelper { return ovfString; } - public static void importVmFromOVF(VmwareHypervisorHost host, String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption, ManagedObjectReference morRp, - ManagedObjectReference morHost) throws Exception { + /** + * deploys a new VM from a ovf spec. It ignores network, defaults locale to 'US' + * @throws Exception shoud be a VmwareResourceException + */ + public static void importVmFromOVF(VmwareHypervisorHost host, String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption, ManagedObjectReference morRp, + ManagedObjectReference morHost, String configurationId) throws CloudRuntimeException, IOException { assert (morRp != null); @@ -1757,24 +1792,34 @@ public class HypervisorHostHelper { importSpecParams.setHostSystem(morHost); importSpecParams.setLocale("US"); importSpecParams.setEntityName(vmName); - importSpecParams.setDeploymentOption(""); + String deploymentOption = StringUtils.isNotBlank(configurationId) ? configurationId : ""; + importSpecParams.setDeploymentOption(deploymentOption); importSpecParams.setDiskProvisioning(diskOption); // diskOption: thin, thick, etc String ovfDescriptor = removeOVFNetwork(HttpNfcLeaseMO.readOvfContent(ovfFilePath)); VmwareContext context = host.getContext(); - OvfCreateImportSpecResult ovfImportResult = - context.getService().createImportSpec(context.getServiceContent().getOvfManager(), ovfDescriptor, morRp, dsMo.getMor(), importSpecParams); - + OvfCreateImportSpecResult ovfImportResult = null; + try { + ovfImportResult = context.getService().createImportSpec(context.getServiceContent().getOvfManager(), ovfDescriptor, morRp, dsMo.getMor(), importSpecParams); + } catch (ConcurrentAccessFaultMsg + | FileFaultFaultMsg + | InvalidDatastoreFaultMsg + | InvalidStateFaultMsg + | RuntimeFaultFaultMsg + | TaskInProgressFaultMsg + | VmConfigFaultFaultMsg error) { + throw new CloudRuntimeException("ImportSpec creation failed", error); + } if (ovfImportResult == null) { String msg = "createImportSpec() failed. ovfFilePath: " + ovfFilePath + ", vmName: " + vmName + ", diskOption: " + diskOption; s_logger.error(msg); - throw new Exception(msg); + throw new CloudRuntimeException(msg); } if(!ovfImportResult.getError().isEmpty()) { for (LocalizedMethodFault fault : ovfImportResult.getError()) { s_logger.error("createImportSpec error: " + fault.getLocalizedMessage()); } - throw new CloudException("Failed to create an import spec from " + ovfFilePath + ". Check log for details."); + throw new CloudRuntimeException("Failed to create an import spec from " + ovfFilePath + ". Check log for details."); } if (!ovfImportResult.getWarning().isEmpty()) { @@ -1783,22 +1828,55 @@ public class HypervisorHostHelper { } } - DatacenterMO dcMo = new DatacenterMO(context, host.getHyperHostDatacenter()); - ManagedObjectReference morLease = context.getService().importVApp(morRp, ovfImportResult.getImportSpec(), dcMo.getVmFolder(), morHost); + DatacenterMO dcMo = null; + try { + dcMo = new DatacenterMO(context, host.getHyperHostDatacenter()); + } catch (Exception e) { + throw new CloudRuntimeException(String.format("no datacenter for host '%s' available in context", context.getServerAddress()), e); + } + ManagedObjectReference folderMO = null; + try { + folderMO = dcMo.getVmFolder(); + } catch (Exception e) { + throw new CloudRuntimeException("no management handle for VmFolder", e); + } + ManagedObjectReference morLease = null; + try { + morLease = context.getService().importVApp(morRp, ovfImportResult.getImportSpec(), folderMO, morHost); + } catch (DuplicateNameFaultMsg + | FileFaultFaultMsg + | InsufficientResourcesFaultFaultMsg + | InvalidDatastoreFaultMsg + | InvalidNameFaultMsg + | OutOfBoundsFaultMsg + | RuntimeFaultFaultMsg + | VmConfigFaultFaultMsg fault) { + throw new CloudRuntimeException("import vApp failed",fault); + } if (morLease == null) { String msg = "importVApp() failed. ovfFilePath: " + ovfFilePath + ", vmName: " + vmName + ", diskOption: " + diskOption; s_logger.error(msg); - throw new Exception(msg); + throw new CloudRuntimeException(msg); } boolean importSuccess = true; final HttpNfcLeaseMO leaseMo = new HttpNfcLeaseMO(context, morLease); - HttpNfcLeaseState state = leaseMo.waitState(new HttpNfcLeaseState[] {HttpNfcLeaseState.READY, HttpNfcLeaseState.ERROR}); + HttpNfcLeaseState state = null; + try { + state = leaseMo.waitState(new HttpNfcLeaseState[] {HttpNfcLeaseState.READY, HttpNfcLeaseState.ERROR}); + } catch (Exception e) { + throw new CloudRuntimeException("exception while waiting for leaseMO", e); + } try { if (state == HttpNfcLeaseState.READY) { final long totalBytes = HttpNfcLeaseMO.calcTotalBytes(ovfImportResult); File ovfFile = new File(ovfFilePath); - HttpNfcLeaseInfo httpNfcLeaseInfo = leaseMo.getLeaseInfo(); + HttpNfcLeaseInfo httpNfcLeaseInfo = null; + try { + httpNfcLeaseInfo = leaseMo.getLeaseInfo(); + } catch (Exception e) { + throw new CloudRuntimeException("error waiting for lease info", e); + } List deviceUrls = httpNfcLeaseInfo.getDeviceUrl(); long bytesAlreadyWritten = 0; @@ -1809,6 +1887,7 @@ public class HypervisorHostHelper { for (OvfFileItem ovfFileItem : ovfImportResult.getFileItem()) { if (deviceKey.equals(ovfFileItem.getDeviceId())) { String absoluteFile = ovfFile.getParent() + File.separator + ovfFileItem.getPath(); + s_logger.info("Uploading file: " + absoluteFile); File f = new File(absoluteFile); if (f.exists()){ String urlToPost = deviceUrl.getUrl(); @@ -1828,31 +1907,44 @@ public class HypervisorHostHelper { String erroMsg = "File upload task failed to complete due to: " + e.getMessage(); s_logger.error(erroMsg); importSuccess = false; // Set flag to cleanup the stale template left due to failed import operation, if any - throw new Exception(erroMsg, e); + throw new CloudRuntimeException(erroMsg, e); } catch (Throwable th) { String errorMsg = "throwable caught during file upload task: " + th.getMessage(); s_logger.error(errorMsg); importSuccess = false; // Set flag to cleanup the stale template left due to failed import operation, if any - throw new Exception(errorMsg, th); + throw new CloudRuntimeException(errorMsg, th); } finally { progressReporter.close(); } if (bytesAlreadyWritten == totalBytes) { - leaseMo.updateLeaseProgress(100); + try { + leaseMo.updateLeaseProgress(100); + } catch (Exception e) { + throw new CloudRuntimeException("error while waiting for lease update", e); + } } } else if (state == HttpNfcLeaseState.ERROR) { - LocalizedMethodFault error = leaseMo.getLeaseError(); + LocalizedMethodFault error = null; + try { + error = leaseMo.getLeaseError(); + } catch (Exception e) { + throw new CloudRuntimeException("error getting lease error", e); + } MethodFault fault = error.getFault(); String erroMsg = "Object creation on vCenter failed due to: Exception: " + fault.getClass().getName() + ", message: " + error.getLocalizedMessage(); s_logger.error(erroMsg); - throw new Exception(erroMsg); + throw new CloudRuntimeException(erroMsg); } } finally { - if (!importSuccess) { - s_logger.error("Aborting the lease on " + vmName + " after import operation failed."); - leaseMo.abortLease(); - } else { - leaseMo.completeLease(); + try { + if (!importSuccess) { + s_logger.error("Aborting the lease on " + vmName + " after import operation failed."); + leaseMo.abortLease(); + } else { + leaseMo.completeLease(); + } + } catch (Exception e) { + throw new CloudRuntimeException("error completing lease", e); } } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index 4650be3d73d..ed60d9157b7 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -35,6 +35,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.commons.lang.StringUtils; @@ -3474,4 +3475,29 @@ public class VirtualMachineMO extends BaseMO { } return false; } + + /** + * Upgrades this virtual machine's virtual hardware to the latest revision that is supported by the virtual machine's current host. + * @param version If specified, upgrade to that specified version. If not specified, upgrade to the most current virtual hardware supported on the host. + * @return true if success, false if not + */ + public boolean upgradeVirtualHardwareVersion(String version) { + try { + String targetHwVersion = StringUtils.isNotBlank(version) ? version : "the highest available"; + s_logger.info("Upgrading the VM hardware version to " + targetHwVersion); + ManagedObjectReference morTask = _context.getService().upgradeVMTask(_mor, version); + boolean result = _context.getVimClient().waitForTask(morTask); + if (result) { + _context.waitForTaskProgressDone(morTask); + } else { + s_logger.error("VMware upgradeVMTask failed due to " + TaskMO.getTaskFailureInfo(_context, morTask)); + return false; + } + return true; + } catch (Exception e) { + String msg = "Attempted to upgrade VM hardware version failed: " + e.getMessage(); + s_logger.error(msg, e); + return false; + } + } } diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java index bfa9db7a19b..ce2f178ef3f 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VmwareHypervisorHost.java @@ -65,7 +65,7 @@ public interface VmwareHypervisorHost { int memoryReserveMB, String guestOsIdentifier, ManagedObjectReference morDs, boolean snapshotDirToParent, Pair controllerInfo, Boolean systemVm) throws Exception; - void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption) throws Exception; + void importVmFromOVF(String ovfFilePath, String vmName, DatastoreMO dsMo, String diskOption, String configurationId) throws Exception; ObjectContent[] getVmPropertiesOnHyperHost(String[] propertyPaths) throws Exception; diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java index 807289f8bdf..ec11899ad3b 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareContext.java @@ -367,32 +367,32 @@ public class VmwareContext { out.close(); } - public void uploadFile(String urlString, String localFileFullName) throws Exception { - uploadFile(urlString, new File(localFileFullName)); - } + public void uploadFile(String httpMethod, String urlString, String localFileName) throws Exception { + HttpURLConnection conn = getRawHTTPConnection(urlString); - public void uploadFile(String urlString, File localFile) throws Exception { - HttpURLConnection conn = getHTTPConnection(urlString, "PUT"); + conn.setDoOutput(true); + conn.setUseCaches(false); + + conn.setChunkedStreamingMode(ChunkSize); + conn.setRequestMethod(httpMethod); + conn.setRequestProperty("Connection", "Keep-Alive"); + String contentType = "application/octet-stream"; + conn.setRequestProperty("Content-Type", contentType); + conn.setRequestProperty("Content-Length", Long.toString(new File(localFileName).length())); + connectWithRetry(conn); OutputStream out = null; InputStream in = null; BufferedReader br = null; try { out = conn.getOutputStream(); - in = new FileInputStream(localFile); + in = new FileInputStream(localFileName); byte[] buf = new byte[ChunkSize]; int len = 0; while ((len = in.read(buf)) > 0) { out.write(buf, 0, len); } out.flush(); - - br = new BufferedReader(new InputStreamReader(conn.getInputStream(), getCharSetFromConnection(conn))); - String line; - while ((line = br.readLine()) != null) { - if (s_logger.isTraceEnabled()) - s_logger.trace("Upload " + urlString + " response: " + line); - } } finally { if (in != null) in.close(); @@ -402,6 +402,7 @@ public class VmwareContext { if (br != null) br.close(); + conn.disconnect(); } } @@ -427,7 +428,10 @@ public class VmwareContext { conn.setChunkedStreamingMode(ChunkSize); conn.setRequestMethod(httpMethod); conn.setRequestProperty("Connection", "Keep-Alive"); - conn.setRequestProperty("Content-Type", "application/x-vnd.vmware-streamVmdk"); + String contentType = urlString.endsWith(".iso") ? + "application/octet-stream" : + "application/x-vnd.vmware-streamVmdk"; + conn.setRequestProperty("Content-Type", contentType); conn.setRequestProperty("Content-Length", Long.toString(new File(localFileName).length())); connectWithRetry(conn);