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.

Sign up for GitHub

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

Jump to bottom

[ReleasePR mgmt-v2018_04_01] Update description to indicate force delete is in preview #17717

Closed
wants to merge 1 commit into from
Closed

[ReleasePR mgmt-v2018_04_01] Update description to indicate force delete is in preview #17717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions sdk/compute/mgmt-v2018_04_01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-compute</artifactId>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Compute Management</name>
<description>This package contains Microsoft Compute Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
20 changes: 10 additions & 10 deletions ..._04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class CreationData {
private String sourceResourceId;

/**
* Get the createOption value.
* Get this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy', 'Restore'.
*
* @return the createOption value
*/
Expand All @@ -60,7 +60,7 @@ public DiskCreateOption createOption() {
}

/**
* Set the createOption value.
* Set this enumerates the possible sources of a disk's creation. Possible values include: 'Empty', 'Attach', 'FromImage', 'Import', 'Copy', 'Restore'.
*
* @param createOption the createOption value to set
* @return the CreationData object itself.
Expand All @@ -71,7 +71,7 @@ public CreationData withCreateOption(DiskCreateOption createOption) {
}

/**
* Get the storageAccountId value.
* Get if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
*
* @return the storageAccountId value
*/
Expand All @@ -80,7 +80,7 @@ public String storageAccountId() {
}

/**
* Set the storageAccountId value.
* Set if createOption is Import, the Azure Resource Manager identifier of the storage account containing the blob to import as a disk. Required only if the blob is in a different subscription.
*
* @param storageAccountId the storageAccountId value to set
* @return the CreationData object itself.
Expand All @@ -91,7 +91,7 @@ public CreationData withStorageAccountId(String storageAccountId) {
}

/**
* Get the imageReference value.
* Get disk source information.
*
* @return the imageReference value
*/
Expand All @@ -100,7 +100,7 @@ public ImageDiskReference imageReference() {
}

/**
* Set the imageReference value.
* Set disk source information.
*
* @param imageReference the imageReference value to set
* @return the CreationData object itself.
Expand All @@ -111,7 +111,7 @@ public CreationData withImageReference(ImageDiskReference imageReference) {
}

/**
* Get the sourceUri value.
* Get if createOption is Import, this is the URI of a blob to be imported into a managed disk.
*
* @return the sourceUri value
*/
Expand All @@ -120,7 +120,7 @@ public String sourceUri() {
}

/**
* Set the sourceUri value.
* Set if createOption is Import, this is the URI of a blob to be imported into a managed disk.
*
* @param sourceUri the sourceUri value to set
* @return the CreationData object itself.
Expand All @@ -131,7 +131,7 @@ public CreationData withSourceUri(String sourceUri) {
}

/**
* Get the sourceResourceId value.
* Get if createOption is Copy, this is the ARM id of the source snapshot or disk.
*
* @return the sourceResourceId value
*/
Expand All @@ -140,7 +140,7 @@ public String sourceResourceId() {
}

/**
* Set the sourceResourceId value.
* Set if createOption is Copy, this is the ARM id of the source snapshot or disk.
*
* @param sourceResourceId the sourceResourceId value to set
* @return the CreationData object itself.
Expand Down
42 changes: 31 additions & 11 deletions ...mt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.arm.resources.models.Resource;
import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
import com.microsoft.azure.arm.resources.models.HasResourceGroup;
import com.microsoft.azure.arm.model.Refreshable;
import com.microsoft.azure.arm.model.Updatable;
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.compute.v2018_04_01.implementation.ComputeManager;
import java.util.List;
Expand Down Expand Up @@ -99,56 +99,68 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
interface WithCreationData {
/**
* Specifies creationData.
*/
* @param creationData Disk source information. CreationData information cannot be changed after the disk has been created
* @return the next definition stage
*/
WithCreate withCreationData(CreationData creationData);
}

/**
* The stage of the disk update allowing to specify DiskSizeGB.
* The stage of the disk definition allowing to specify DiskSizeGB.
*/
interface WithDiskSizeGB {
/**
* Specifies diskSizeGB.
* @param diskSizeGB If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size
* @return the next definition stage
*/
WithCreate withDiskSizeGB(Integer diskSizeGB);
}

/**
* The stage of the disk update allowing to specify EncryptionSettings.
* The stage of the disk definition allowing to specify EncryptionSettings.
*/
interface WithEncryptionSettings {
/**
* Specifies encryptionSettings.
* @param encryptionSettings Encryption settings for disk or snapshot
* @return the next definition stage
*/
WithCreate withEncryptionSettings(EncryptionSettings encryptionSettings);
}

/**
* The stage of the disk update allowing to specify OsType.
* The stage of the disk definition allowing to specify OsType.
*/
interface WithOsType {
/**
* Specifies osType.
* @param osType The Operating System type. Possible values include: 'Windows', 'Linux'
* @return the next definition stage
*/
WithCreate withOsType(OperatingSystemTypes osType);
}

/**
* The stage of the disk update allowing to specify Sku.
* The stage of the disk definition allowing to specify Sku.
*/
interface WithSku {
/**
* Specifies sku.
* @param sku the sku parameter value
* @return the next definition stage
*/
WithCreate withSku(DiskSku sku);
}

/**
* The stage of the disk update allowing to specify Zones.
* The stage of the disk definition allowing to specify Zones.
*/
interface WithZones {
/**
* Specifies zones.
* @param zones The Logical zone list for Disk
* @return the next definition stage
*/
WithCreate withZones(List<String> zones);
}
Expand All @@ -172,41 +184,49 @@ interface Update extends Appliable<Disk>, Resource.UpdateWithTags<Update>, Updat
*/
interface UpdateStages {
/**
* The stage of the disk {0} allowing to specify DiskSizeGB.
* The stage of the disk update allowing to specify DiskSizeGB.
*/
interface WithDiskSizeGB {
/**
* Specifies diskSizeGB.
* @param diskSizeGB If creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size
* @return the next update stage
*/
Update withDiskSizeGB(Integer diskSizeGB);
}

/**
* The stage of the disk {0} allowing to specify EncryptionSettings.
* The stage of the disk update allowing to specify EncryptionSettings.
*/
interface WithEncryptionSettings {
/**
* Specifies encryptionSettings.
* @param encryptionSettings Encryption settings for disk or snapshot
* @return the next update stage
*/
Update withEncryptionSettings(EncryptionSettings encryptionSettings);
}

/**
* The stage of the disk {0} allowing to specify OsType.
* The stage of the disk update allowing to specify OsType.
*/
interface WithOsType {
/**
* Specifies osType.
* @param osType the Operating System type. Possible values include: 'Windows', 'Linux'
* @return the next update stage
*/
Update withOsType(OperatingSystemTypes osType);
}

/**
* The stage of the disk {0} allowing to specify Sku.
* The stage of the disk update allowing to specify Sku.
*/
interface WithSku {
/**
* Specifies sku.
* @param sku the sku parameter value
* @return the next update stage
*/
Update withSku(DiskSku sku);
}
Expand Down
11 changes: 6 additions & 5 deletions ...v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The disks sku name. Can be Standard_LRS or Premium_LRS.
* The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
*/
public class DiskSku {
/**
* The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS'.
* The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS',
* 'StandardSSD_LRS'.
*/
@JsonProperty(value = "name")
private StorageAccountTypes name;
Expand All @@ -27,7 +28,7 @@ public class DiskSku {
private String tier;

/**
* Get the name value.
* Get the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
*
* @return the name value
*/
Expand All @@ -36,7 +37,7 @@ public StorageAccountTypes name() {
}

/**
* Set the name value.
* Set the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
*
* @param name the name value to set
* @return the DiskSku object itself.
Expand All @@ -47,7 +48,7 @@ public DiskSku withName(StorageAccountTypes name) {
}

/**
* Get the tier value.
* Get the sku tier.
*
* @return the tier value
*/
Expand Down
16 changes: 8 additions & 8 deletions ...18_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class DiskUpdate {
private DiskSku sku;

/**
* Get the osType value.
* Get the Operating System type. Possible values include: 'Windows', 'Linux'.
*
* @return the osType value
*/
Expand All @@ -61,7 +61,7 @@ public OperatingSystemTypes osType() {
}

/**
* Set the osType value.
* Set the Operating System type. Possible values include: 'Windows', 'Linux'.
*
* @param osType the osType value to set
* @return the DiskUpdate object itself.
Expand All @@ -72,7 +72,7 @@ public DiskUpdate withOsType(OperatingSystemTypes osType) {
}

/**
* Get the diskSizeGB value.
* Get if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
*
* @return the diskSizeGB value
*/
Expand All @@ -81,7 +81,7 @@ public Integer diskSizeGB() {
}

/**
* Set the diskSizeGB value.
* Set if creationData.createOption is Empty, this field is mandatory and it indicates the size of the VHD to create. If this field is present for updates or creation with other options, it indicates a resize. Resizes are only allowed if the disk is not attached to a running VM, and can only increase the disk's size.
*
* @param diskSizeGB the diskSizeGB value to set
* @return the DiskUpdate object itself.
Expand All @@ -92,7 +92,7 @@ public DiskUpdate withDiskSizeGB(Integer diskSizeGB) {
}

/**
* Get the encryptionSettings value.
* Get encryption settings for disk or snapshot.
*
* @return the encryptionSettings value
*/
Expand All @@ -101,7 +101,7 @@ public EncryptionSettings encryptionSettings() {
}

/**
* Set the encryptionSettings value.
* Set encryption settings for disk or snapshot.
*
* @param encryptionSettings the encryptionSettings value to set
* @return the DiskUpdate object itself.
Expand All @@ -112,7 +112,7 @@ public DiskUpdate withEncryptionSettings(EncryptionSettings encryptionSettings)
}

/**
* Get the tags value.
* Get resource tags.
*
* @return the tags value
*/
Expand All @@ -121,7 +121,7 @@ public Map<String, String> tags() {
}

/**
* Set the tags value.
* Set resource tags.
*
* @param tags the tags value to set
* @return the DiskUpdate object itself.
Expand Down
Loading