Start addressing review comments

This commit is contained in:
nvazquez 2020-09-30 01:24:43 -03:00 committed by Harikrishna Patnala
parent b0d3168e0b
commit 6e81efa2c9
6 changed files with 23 additions and 5 deletions

View File

@ -21,6 +21,9 @@ import com.cloud.agent.api.LogLevel;
import java.util.HashMap;
import java.util.Map;
/**
* TO class sent to the hypervisor layer with the information needed to handle deploy-as-is VM deployments
*/
public class DeployAsIsInfoTO {
private String templatePath;

View File

@ -27,6 +27,9 @@ import com.cloud.utils.Pair;
import java.util.List;
/**
* Placeholder class for all the subclasses obtained from the OVF parsing
*/
public class OVFInformationTO {
@LogLevel(LogLevel.Log4jLevel.Off)

View File

@ -20,6 +20,9 @@ package com.cloud.agent.api.to.deployasis;
import java.util.List;
/**
* This class represents a template deployment option (configuration) parsed from the OVF
*/
public class OVFConfigurationTO implements TemplateDeployAsIsInformationTO {
private final String id;

View File

@ -16,10 +16,16 @@
// under the License.
package com.cloud.agent.api.to.deployasis;
// From: https://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData.xsd
/**
* A hardware item class representing a hardware item read from the OVF.
* From: https://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData.xsd
*/
public class OVFVirtualHardwareItemTO implements TemplateDeployAsIsInformationTO{
//From: https://schemas.dmtf.org/wbem/cim-html/2/CIM_ResourceAllocationSettingData.html
/**
* The hardware item type
* From: https://schemas.dmtf.org/wbem/cim-html/2/CIM_ResourceAllocationSettingData.html
*/
public enum HardwareResourceType {
Other("Other", 1),
ComputerSystem ("Computer System", 2),

View File

@ -89,7 +89,8 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
@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]")
since = "4.15",
description = "comma separated list of template details requested, value can be a list of [ all, min]")
private List<String> viewDetails;
/////////////////////////////////////////////////////

View File

@ -196,11 +196,13 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
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.")
@Param(description = "VMware only: true if template is deployed without orchestrating disks and networks but \"as-is\" defined in the template.",
since = "4.15")
private Boolean deployAsIs;
@SerializedName(ApiConstants.DEPLOY_AS_IS_DETAILS)
@Param(description = "VMware only: additional key/value details tied with deploy-as-is template")
@Param(description = "VMware only: additional key/value details tied with deploy-as-is template",
since = "4.15")
private Map<String, String> deployAsIsDetails;
@SerializedName("parenttemplateid")