Skip to content

Commit 2aa376d

Browse files
author
SDKAuto
committed
CodeGen from PR 11806 in Azure/azure-rest-api-specs
Merge f70db4f93dd7f108c3b922a4af8ca6b111ce6d2a into 206d0326939ad6f0ec2e0d83a946a76464648462
1 parent 74efa08 commit 2aa376d

21 files changed

+175
-125
lines changed

‎sdk/compute/mgmt-v2018_04_01/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.2.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-compute</artifactId>
1818
<version>1.0.0-beta</version>
1919
<packaging>jar</packaging>
2020
<name>Microsoft Azure SDK for Compute Management</name>
2121
<description>This package contains Microsoft Compute Management SDK.</description>
22-
<url>https://github.com/Azure/azure-libraries-for-java</url>
22+
<url>https://github.com/Azure/azure-sdk-for-java</url>
2323
<licenses>
2424
<license>
2525
<name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
2828
</license>
2929
</licenses>
3030
<scm>
31-
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
32-
<connection>scm:git:[email protected]:Azure/azure-libraries-for-java.git</connection>
31+
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
32+
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
3333
<tag>HEAD</tag>
3434
</scm>
3535
<properties>
@@ -71,6 +71,8 @@
7171
<artifactId>azure-arm-client-runtime</artifactId>
7272
<type>test-jar</type>
7373
<scope>test</scope>
74+
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
75+
<version>1.6.5</version>
7476
</dependency>
7577
</dependencies>
7678
<build>

‎sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/CreationData.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class CreationData {
5151
private String sourceResourceId;
5252

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

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

7373
/**
74-
* Get the storageAccountId value.
74+
* 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.
7575
*
7676
* @return the storageAccountId value
7777
*/
@@ -80,7 +80,7 @@ public String storageAccountId() {
8080
}
8181

8282
/**
83-
* Set the storageAccountId value.
83+
* 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.
8484
*
8585
* @param storageAccountId the storageAccountId value to set
8686
* @return the CreationData object itself.
@@ -91,7 +91,7 @@ public CreationData withStorageAccountId(String storageAccountId) {
9191
}
9292

9393
/**
94-
* Get the imageReference value.
94+
* Get disk source information.
9595
*
9696
* @return the imageReference value
9797
*/
@@ -100,7 +100,7 @@ public ImageDiskReference imageReference() {
100100
}
101101

102102
/**
103-
* Set the imageReference value.
103+
* Set disk source information.
104104
*
105105
* @param imageReference the imageReference value to set
106106
* @return the CreationData object itself.
@@ -111,7 +111,7 @@ public CreationData withImageReference(ImageDiskReference imageReference) {
111111
}
112112

113113
/**
114-
* Get the sourceUri value.
114+
* Get if createOption is Import, this is the URI of a blob to be imported into a managed disk.
115115
*
116116
* @return the sourceUri value
117117
*/
@@ -120,7 +120,7 @@ public String sourceUri() {
120120
}
121121

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

133133
/**
134-
* Get the sourceResourceId value.
134+
* Get if createOption is Copy, this is the ARM id of the source snapshot or disk.
135135
*
136136
* @return the sourceResourceId value
137137
*/
@@ -140,7 +140,7 @@ public String sourceResourceId() {
140140
}
141141

142142
/**
143-
* Set the sourceResourceId value.
143+
* Set if createOption is Copy, this is the ARM id of the source snapshot or disk.
144144
*
145145
* @param sourceResourceId the sourceResourceId value to set
146146
* @return the CreationData object itself.

‎sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/Disk.java‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import com.microsoft.azure.arm.model.HasInner;
1212
import com.microsoft.azure.arm.resources.models.Resource;
13+
import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
1314
import com.microsoft.azure.arm.resources.models.HasResourceGroup;
1415
import com.microsoft.azure.arm.model.Refreshable;
1516
import com.microsoft.azure.arm.model.Updatable;
1617
import com.microsoft.azure.arm.model.Appliable;
1718
import com.microsoft.azure.arm.model.Creatable;
18-
import com.microsoft.azure.arm.resources.models.GroupableResourceCore;
1919
import com.microsoft.azure.arm.resources.models.HasManager;
2020
import com.microsoft.azure.management.compute.v2018_04_01.implementation.ComputeManager;
2121
import java.util.List;
@@ -99,56 +99,68 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
9999
interface WithCreationData {
100100
/**
101101
* Specifies creationData.
102-
*/
102+
* @param creationData Disk source information. CreationData information cannot be changed after the disk has been created
103+
* @return the next definition stage
104+
*/
103105
WithCreate withCreationData(CreationData creationData);
104106
}
105107

106108
/**
107-
* The stage of the disk update allowing to specify DiskSizeGB.
109+
* The stage of the disk definition allowing to specify DiskSizeGB.
108110
*/
109111
interface WithDiskSizeGB {
110112
/**
111113
* Specifies diskSizeGB.
114+
* @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
115+
* @return the next definition stage
112116
*/
113117
WithCreate withDiskSizeGB(Integer diskSizeGB);
114118
}
115119

116120
/**
117-
* The stage of the disk update allowing to specify EncryptionSettings.
121+
* The stage of the disk definition allowing to specify EncryptionSettings.
118122
*/
119123
interface WithEncryptionSettings {
120124
/**
121125
* Specifies encryptionSettings.
126+
* @param encryptionSettings Encryption settings for disk or snapshot
127+
* @return the next definition stage
122128
*/
123129
WithCreate withEncryptionSettings(EncryptionSettings encryptionSettings);
124130
}
125131

126132
/**
127-
* The stage of the disk update allowing to specify OsType.
133+
* The stage of the disk definition allowing to specify OsType.
128134
*/
129135
interface WithOsType {
130136
/**
131137
* Specifies osType.
138+
* @param osType The Operating System type. Possible values include: 'Windows', 'Linux'
139+
* @return the next definition stage
132140
*/
133141
WithCreate withOsType(OperatingSystemTypes osType);
134142
}
135143

136144
/**
137-
* The stage of the disk update allowing to specify Sku.
145+
* The stage of the disk definition allowing to specify Sku.
138146
*/
139147
interface WithSku {
140148
/**
141149
* Specifies sku.
150+
* @param sku the sku parameter value
151+
* @return the next definition stage
142152
*/
143153
WithCreate withSku(DiskSku sku);
144154
}
145155

146156
/**
147-
* The stage of the disk update allowing to specify Zones.
157+
* The stage of the disk definition allowing to specify Zones.
148158
*/
149159
interface WithZones {
150160
/**
151161
* Specifies zones.
162+
* @param zones The Logical zone list for Disk
163+
* @return the next definition stage
152164
*/
153165
WithCreate withZones(List<String> zones);
154166
}
@@ -172,41 +184,49 @@ interface Update extends Appliable<Disk>, Resource.UpdateWithTags<Update>, Updat
172184
*/
173185
interface UpdateStages {
174186
/**
175-
* The stage of the disk {0} allowing to specify DiskSizeGB.
187+
* The stage of the disk update allowing to specify DiskSizeGB.
176188
*/
177189
interface WithDiskSizeGB {
178190
/**
179191
* Specifies diskSizeGB.
192+
* @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
193+
* @return the next update stage
180194
*/
181195
Update withDiskSizeGB(Integer diskSizeGB);
182196
}
183197

184198
/**
185-
* The stage of the disk {0} allowing to specify EncryptionSettings.
199+
* The stage of the disk update allowing to specify EncryptionSettings.
186200
*/
187201
interface WithEncryptionSettings {
188202
/**
189203
* Specifies encryptionSettings.
204+
* @param encryptionSettings Encryption settings for disk or snapshot
205+
* @return the next update stage
190206
*/
191207
Update withEncryptionSettings(EncryptionSettings encryptionSettings);
192208
}
193209

194210
/**
195-
* The stage of the disk {0} allowing to specify OsType.
211+
* The stage of the disk update allowing to specify OsType.
196212
*/
197213
interface WithOsType {
198214
/**
199215
* Specifies osType.
216+
* @param osType the Operating System type. Possible values include: 'Windows', 'Linux'
217+
* @return the next update stage
200218
*/
201219
Update withOsType(OperatingSystemTypes osType);
202220
}
203221

204222
/**
205-
* The stage of the disk {0} allowing to specify Sku.
223+
* The stage of the disk update allowing to specify Sku.
206224
*/
207225
interface WithSku {
208226
/**
209227
* Specifies sku.
228+
* @param sku the sku parameter value
229+
* @return the next update stage
210230
*/
211231
Update withSku(DiskSku sku);
212232
}

‎sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskSku.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212

1313
/**
14-
* The disks sku name. Can be Standard_LRS or Premium_LRS.
14+
* The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
1515
*/
1616
public class DiskSku {
1717
/**
18-
* The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS'.
18+
* The sku name. Possible values include: 'Standard_LRS', 'Premium_LRS',
19+
* 'StandardSSD_LRS'.
1920
*/
2021
@JsonProperty(value = "name")
2122
private StorageAccountTypes name;
@@ -27,7 +28,7 @@ public class DiskSku {
2728
private String tier;
2829

2930
/**
30-
* Get the name value.
31+
* Get the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
3132
*
3233
* @return the name value
3334
*/
@@ -36,7 +37,7 @@ public StorageAccountTypes name() {
3637
}
3738

3839
/**
39-
* Set the name value.
40+
* Set the sku name. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'.
4041
*
4142
* @param name the name value to set
4243
* @return the DiskSku object itself.
@@ -47,7 +48,7 @@ public DiskSku withName(StorageAccountTypes name) {
4748
}
4849

4950
/**
50-
* Get the tier value.
51+
* Get the sku tier.
5152
*
5253
* @return the tier value
5354
*/

‎sdk/compute/mgmt-v2018_04_01/src/main/java/com/microsoft/azure/management/compute/v2018_04_01/DiskUpdate.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class DiskUpdate {
5252
private DiskSku sku;
5353

5454
/**
55-
* Get the osType value.
55+
* Get the Operating System type. Possible values include: 'Windows', 'Linux'.
5656
*
5757
* @return the osType value
5858
*/
@@ -61,7 +61,7 @@ public OperatingSystemTypes osType() {
6161
}
6262

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

7474
/**
75-
* Get the diskSizeGB value.
75+
* 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.
7676
*
7777
* @return the diskSizeGB value
7878
*/
@@ -81,7 +81,7 @@ public Integer diskSizeGB() {
8181
}
8282

8383
/**
84-
* Set the diskSizeGB value.
84+
* 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.
8585
*
8686
* @param diskSizeGB the diskSizeGB value to set
8787
* @return the DiskUpdate object itself.
@@ -92,7 +92,7 @@ public DiskUpdate withDiskSizeGB(Integer diskSizeGB) {
9292
}
9393

9494
/**
95-
* Get the encryptionSettings value.
95+
* Get encryption settings for disk or snapshot.
9696
*
9797
* @return the encryptionSettings value
9898
*/
@@ -101,7 +101,7 @@ public EncryptionSettings encryptionSettings() {
101101
}
102102

103103
/**
104-
* Set the encryptionSettings value.
104+
* Set encryption settings for disk or snapshot.
105105
*
106106
* @param encryptionSettings the encryptionSettings value to set
107107
* @return the DiskUpdate object itself.
@@ -112,7 +112,7 @@ public DiskUpdate withEncryptionSettings(EncryptionSettings encryptionSettings)
112112
}
113113

114114
/**
115-
* Get the tags value.
115+
* Get resource tags.
116116
*
117117
* @return the tags value
118118
*/
@@ -121,7 +121,7 @@ public Map<String, String> tags() {
121121
}
122122

123123
/**
124-
* Set the tags value.
124+
* Set resource tags.
125125
*
126126
* @param tags the tags value to set
127127
* @return the DiskUpdate object itself.

0 commit comments

Comments
 (0)