Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Compute spec to 2016-03-30 #948

Merged
merged 1 commit into from
Jul 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@


/**
* Gets or sets additional XML formatted information that can be included in
* the Unattend.xml file, which is used by Windows Setup. Contents are
* defined by setting name, component name, and the pass in which the content
* is a applied.
* additional XML formatted information that can be included in the
* Unattend.xml file, which is used by Windows Setup. Contents are defined by
* setting name, component name, and the pass in which the content is a
* applied.
*/
public class AdditionalUnattendContent {
/**
* Gets or sets the pass name. Currently, the only allowable value is
* oobeSystem. Possible values include: 'oobeSystem'.
* the pass name. Currently, the only allowable value is oobeSystem.
* Possible values include: 'oobeSystem'.
*/
private PassNames passName;

/**
* Gets or sets the component name. Currently, the only allowable value is
* the component name. Currently, the only allowable value is
* Microsoft-Windows-Shell-Setup. Possible values include:
* 'Microsoft-Windows-Shell-Setup'.
*/
private ComponentNames componentName;

/**
* Gets or sets setting name (e.g. FirstLogonCommands, AutoLogon ).
* Possible values include: 'AutoLogon', 'FirstLogonCommands'.
* setting name (e.g. FirstLogonCommands, AutoLogon ). Possible values
* include: 'AutoLogon', 'FirstLogonCommands'.
*/
private SettingNames settingName;

/**
* Gets or sets XML formatted content that is added to the unattend.xml
* file in the specified pass and component.The XML must be less than 4
* KB and must include the root element for the setting or feature that
* is being inserted.
* XML formatted content that is added to the unattend.xml file in the
* specified pass and component.The XML must be less than 4 KB and must
* include the root element for the setting or feature that is being
* inserted.
*/
private String content;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
public class ApiEntityReference {
/**
* Gets or sets ARM resource id in the form of
* the ARM resource id in the form of
* /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
*/
private String id;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
*/
public class ApiError {
/**
* Gets or sets the Api error details.
* the Api error details.
*/
private List<ApiErrorBase> details;

/**
* Gets or sets the Api inner error.
* the Api inner error.
*/
private InnerError innererror;

/**
* Gets or sets the error code.
* the error code.
*/
private String code;

/**
* Gets or sets the target of the particular error.
* the target of the particular error.
*/
private String target;

/**
* Gets or sets the error message.
* the error message.
*/
private String message;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
*/
public class ApiErrorBase {
/**
* Gets or sets the error code.
* the error code.
*/
private String code;

/**
* Gets or sets the target of the particular error.
* the target of the particular error.
*/
private String target;

/**
* Gets or sets the error message.
* the error message.
*/
private String message;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
*/
public class BootDiagnostics {
/**
* Gets or sets whether boot diagnostics should be enabled on the Virtual
* Machine.
* whether boot diagnostics should be enabled on the Virtual Machine.
*/
private Boolean enabled;

/**
* Gets or sets the boot diagnostics storage Uri. It should be a valid Uri.
* the boot diagnostics storage Uri. It should be a valid Uri.
*/
private String storageUri;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
*/
public class BootDiagnosticsInstanceView {
/**
* Gets or sets the console screenshot blob Uri.
* the console screenshot blob Uri.
*/
private String consoleScreenshotBlobUri;

/**
* Gets or sets the Linux serial console log blob Uri.
* the Linux serial console log blob Uri.
*/
private String serialConsoleLogBlobUri;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,46 @@
*/
public class DataDisk {
/**
* Gets or sets the logical unit number.
* the logical unit number.
*/
@JsonProperty(required = true)
private int lun;

/**
* Gets or sets the disk name.
* the disk name.
*/
@JsonProperty(required = true)
private String name;

/**
* Gets or sets the Virtual Hard Disk.
* the Virtual Hard Disk.
*/
@JsonProperty(required = true)
private VirtualHardDisk vhd;

/**
* Gets or sets the Source User Image VirtualHardDisk. This
* VirtualHardDisk will be copied before using it to attach to the
* Virtual Machine.If SourceImage is provided, the destination
* VirtualHardDisk should not exist.
* the Source User Image VirtualHardDisk. This VirtualHardDisk will be
* copied before using it to attach to the Virtual Machine.If SourceImage
* is provided, the destination VirtualHardDisk should not exist.
*/
private VirtualHardDisk image;

/**
* Gets or sets the caching type. Possible values include: 'None',
* 'ReadOnly', 'ReadWrite'.
* the caching type. Possible values include: 'None', 'ReadOnly',
* 'ReadWrite'.
*/
private CachingTypes caching;

/**
* Gets or sets the create option. Possible values include: 'fromImage',
* 'empty', 'attach'.
* the create option. Possible values include: 'fromImage', 'empty',
* 'attach'.
*/
@JsonProperty(required = true)
private DiskCreateOptionTypes createOption;

/**
* Gets or sets the initial disk size in GB for blank data disks, and the
* new desired size for existing OS and Data disks.
* the initial disk size in GB for blank data disks, and the new desired
* size for existing OS and Data disks.
*/
private Integer diskSizeGB;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
public class DataDiskImage {
/**
* Gets the LUN number for a data disk.This value is used to identify data
* disk image inside the VMImage therefore it must be unique for each
* data disk.The allowed character for the value is digit.
* the LUN number for a data disk.This value is used to identify data disk
* image inside the VMImage therefore it must be unique for each data
* disk.The allowed character for the value is digit.
*/
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private Integer lun;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
public class DiagnosticsProfile {
/**
* Gets or sets the boot diagnostics.
* the boot diagnostics.
*/
private BootDiagnostics bootDiagnostics;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,23 @@

package com.microsoft.azure.management.compute;

import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Describes a Encryption Settings for a Disk.
*/
public class DiskEncryptionSettings {
/**
* Gets or sets the disk encryption key which is a KeyVault Secret.
* the disk encryption key which is a KeyVault Secret.
*/
@JsonProperty(required = true)
private KeyVaultSecretReference diskEncryptionKey;

/**
* Gets or sets the key encryption key which is KeyVault Key.
* the key encryption key which is KeyVault Key.
*/
private KeyVaultKeyReference keyEncryptionKey;

/**
* Gets or sets whether disk encryption should be enabled on the Virtual
* Machine.
* whether disk encryption should be enabled on the Virtual Machine.
*/
private Boolean enabled;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/
public class DiskInstanceView {
/**
* Gets or sets the disk name.
* the disk name.
*/
private String name;

/**
* Gets or sets the resource status information.
* the resource status information.
*/
private List<InstanceViewStatus> statuses;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ public class HardwareProfile {
* 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2',
* 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
* 'Standard_D5_v2', 'Standard_D11_v2', 'Standard_D12_v2',
* 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_DS1', 'Standard_DS2',
* 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
* 'Standard_DS13', 'Standard_DS14', 'Standard_G1', 'Standard_G2',
* 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
* 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5'.
* 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2',
* 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4',
* 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14',
* 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2',
* 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2',
* 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
* 'Standard_DS15_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3',
* 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
* 'Standard_GS3', 'Standard_GS4', 'Standard_GS5'.
*/
private String vmSize;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
*/
public class ImageReference {
/**
* Gets or sets the image publisher.
* the image publisher.
*/
private String publisher;

/**
* Gets or sets the image offer.
* the image offer.
*/
private String offer;

/**
* Gets or sets the image sku.
* the image sku.
*/
private String sku;

/**
* Gets or sets the image version. The allowed formats are
* Major.Minor.Build or 'latest'. Major, Minor and Build being decimal
* numbers. Specify 'latest' to use the latest version of image.
* the image version. The allowed formats are Major.Minor.Build or
* 'latest'. Major, Minor and Build being decimal numbers. Specify
* 'latest' to use the latest version of image.
*/
private String version;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
*/
public class InnerError {
/**
* Gets or sets the exception type.
* the exception type.
*/
private String exceptiontype;

/**
* Gets or sets the internal error message or exception dump.
* the internal error message or exception dump.
*/
private String errordetail;

Expand Down
Loading