Projects >> CloudStack-archive >>0f4a245f0a3740a6afcae3c2550d32caf859dd82

Chunk
Conflicting content 
    @Parameter(name="group", type=CommandType.STRING, description="an optional group for the virtual machine")
    private String group;

<<<<<<< HEAD
    @Parameter(name="hypervisor", type=CommandType.STRING)
    private String hypervisor;

    @Parameter(name="networkgrouplist", type=CommandType.LIST, collectionType=CommandType.STRING)
=======
    @Parameter(name="networkgrouplist", type=CommandType.LIST, collectionType=CommandType.STRING, description="comma separated list of network groups that going to be applied to the virtual machine. Should be passed only when vm is created from service offering with Direct Attach Network support")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private List networkGroupList;

    @Parameter(name="serviceofferingid", type=CommandType.LONG, required=true, description="the ID of the service offering for the virtual machine")
Solution content 
    @Parameter(name="group", type=CommandType.STRING, description="an optional group for the virtual machine")
    private String group;

    @Parameter(name="hypervisor", type=CommandType.STRING, description="the hypervisor on which to deploy the virtual machine")
    private String hypervisor;

    @Parameter(name="networkgrouplist", type=CommandType.LIST, collectionType=CommandType.STRING, description="comma separated list of network groups that going to be applied to the virtual machine. Should be passed only when vm is created from service offering with Direct Attach Network support")
    private List networkGroupList;

    @Parameter(name="serviceofferingid", type=CommandType.LONG, required=true, description="the ID of the service offering for the virtual machine")
File
DeployVMCmd.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    @Parameter(name="domainid", type=CommandType.LONG, description="lists all available ISO files by ID of a domain. If used with the account parameter, lists all available ISO files for the account in the ID of a domain.")
    private Long domainId;

<<<<<<< HEAD
    @Parameter(name="hypervisor", type=CommandType.STRING)
    private String hypervisor;

    @Parameter(name="id", type=CommandType.LONG)
=======
    @Parameter(name="id", type=CommandType.LONG, description="list all isos by id")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Long id;

    @Parameter(name="ispublic", type=CommandType.BOOLEAN, description="true if the ISO is publicly available to all users, false otherwise.")
Solution content 
    @Parameter(name="domainid", type=CommandType.LONG, description="lists all available ISO files by ID of a domain. If used with the account parameter, lists all available ISO files for the account in the ID of a domain.")
    private Long domainId;

    @Parameter(name="hypervisor", type=CommandType.STRING, description="the hypervisor for which to restrict the search")
    private String hypervisor;

    @Parameter(name="id", type=CommandType.LONG, description="list all isos by id")
    private Long id;

    @Parameter(name="ispublic", type=CommandType.BOOLEAN, description="true if the ISO is publicly available to all users, false otherwise.")
File
ListIsosCmd.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    @Parameter(name="domainid", type=CommandType.LONG, description="list all templates in specified domain. If used with the account parameter, lists all templates for an account in the specified domain.")
    private Long domainId;

<<<<<<< HEAD
    @Parameter(name="hypervisor", type=CommandType.STRING)
    private String hypervisor;

    @Parameter(name="id", type=CommandType.LONG)
=======
    @Parameter(name="id", type=CommandType.LONG, description="the template ID")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Long id;

    @Parameter(name="name", type=CommandType.STRING, description="the template name")
Solution content 
    @Parameter(name="domainid", type=CommandType.LONG, description="list all templates in specified domain. If used with the account parameter, lists all templates for an account in the specified domain.")
    private Long domainId;

    @Parameter(name="hypervisor", type=CommandType.STRING, description="the hypervisor for which to restrict the search")
    private String hypervisor;

    @Parameter(name="id", type=CommandType.LONG, description="the template ID")
    private Long id;

    @Parameter(name="name", type=CommandType.STRING, description="the template name")
File
ListTemplatesCmd.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
<<<<<<< HEAD
    @Parameter(name="format", type=CommandType.STRING, required=true, description="the format for the template. Possible values include QCOW2, RAW, and VHD.")
    private String format;
    @Parameter(name="hypervisor", type=CommandType.STRING, required=true)
    private String hypervisor;

    @Parameter(name="isfeatured", type=CommandType.BOOLEAN)
=======
    @Parameter(name="isfeatured", type=CommandType.BOOLEAN, description="true if this template is a featured template, false otherwise")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Boolean featured;

    @Parameter(name="ispublic", type=CommandType.BOOLEAN, description="true if the template is available to all accounts; default is true")
Solution content 
    @Parameter(name="format", type=CommandType.STRING, required=true, description="the format for the template. Possible values include QCOW2, RAW, and VHD.")
    private String format;

    @Parameter(name="hypervisor", type=CommandType.STRING, required=true, description="the target hypervisor for the template")
    private String hypervisor;

    @Parameter(name="isfeatured", type=CommandType.BOOLEAN, description="true if this template is a featured template, false otherwise")
    private Boolean featured;

    @Parameter(name="ispublic", type=CommandType.BOOLEAN, description="true if the template is available to all accounts; default is true")
File
RegisterTemplateCmd.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
import com.google.gson.annotations.SerializedName;

public class AlertResponse extends BaseResponse {
<<<<<<< HEAD
    @SerializedName("id")
    private Long id;

    @SerializedName("type")
=======
    @SerializedName("type") @Param(description="the alert type")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Short alertType;

    @SerializedName("description") @Param(description="description of the alert")
Solution content 
import com.google.gson.annotations.SerializedName;

public class AlertResponse extends BaseResponse {
    @SerializedName("id") @Param(description="the id of the alert")
    private Long id;

    @SerializedName("type") @Param(description="the alert type")
    private Short alertType;

    @SerializedName("description") @Param(description="description of the alert")
File
AlertResponse.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
import com.cloud.host.Host;
import com.cloud.host.Status;
<<<<<<< HEAD
import com.cloud.hypervisor.Hypervisor.HypervisorType;
=======
import com.cloud.hypervisor.Hypervisor;
import com.cloud.serializer.Param;
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
import com.google.gson.annotations.SerializedName;

public class HostResponse extends BaseResponse {
Solution content 
import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;

public class HostResponse extends BaseResponse {
File
HostResponse.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    @SerializedName("version") @Param(description="the host version")
    private String version;

<<<<<<< HEAD
    @SerializedName("hypervisor")
    private HypervisorType hypervisor;
=======
    @SerializedName("hypervisor") @Param(description="the host hypervisor")
    private Hypervisor.Type hypervisor;
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3

    @SerializedName("cpunumber") @Param(description="the CPU number of the host")
    private Integer cpuNumber;
Solution content 
    @SerializedName("version") @Param(description="the host version")
    private String version;

    @SerializedName("hypervisor") @Param(description="the host hypervisor")
    private HypervisorType hypervisor;

    @SerializedName("cpunumber") @Param(description="the CPU number of the host")
    private Integer cpuNumber;
File
HostResponse.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    @SerializedName("size") @Param(description="the size of the template")
    private Long size;

<<<<<<< HEAD
    @SerializedName("templatetype")
    private String templateType;

    @SerializedName("hypervisor")
    private String hypervisor;

    @SerializedName("jobid")
=======
    @SerializedName("jobid") @Param(description="shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the template")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Long jobId;

    @SerializedName("jobstatus") @Param(description="shows the current pending asynchronous job status")
Solution content 
    @SerializedName("size") @Param(description="the size of the template")
    private Long size;

    @SerializedName("templatetype") @Param(description="the type of the template")
    private String templateType;

    @SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs")
    private String hypervisor;

    @SerializedName("jobid") @Param(description="shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the template")
    private Long jobId;

    @SerializedName("jobstatus") @Param(description="shows the current pending asynchronous job status")
File
TemplateResponse.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    @SerializedName("storagetype") @Param(description="shared or local storage")
    private String storageType;

<<<<<<< HEAD
    @SerializedName("sourceid")
    private Long sourceId;

    @SerializedName("sourcetype")
    private String sourceType;

    @SerializedName("hypervisor")
    private String hypervisor;

    @SerializedName("diskofferingid")
=======
    @SerializedName("diskofferingid") @Param(description="ID of the disk offering")
>>>>>>> fb50fe624c577c866beb18d72e31c404f26aa3f3
    private Long diskOfferingId;

    @SerializedName("diskofferingname") @Param(description="name of the disk offering")
Solution content 
    @SerializedName("storagetype") @Param(description="shared or local storage")
    private String storageType;

    @SerializedName("sourceid")
    private Long sourceId;

    @SerializedName("sourcetype")
    private String sourceType;

    @SerializedName("hypervisor")
    private String hypervisor;

    @SerializedName("diskofferingid") @Param(description="ID of the disk offering")
    private Long diskOfferingId;

    @SerializedName("diskofferingname") @Param(description="name of the disk offering")
File
VolumeResponse.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute