Skip to content

Commit ddbcfca

Browse files
author
SDKAuto
committed
CodeGen from PR 12969 in Azure/azure-rest-api-specs
Merge c37dfe3670c451f6d7dcc377417247a22c9caf2e into fdb32f2623c550dd4ff18a45bebbe7bd8050ae33
1 parent 5cce369 commit ddbcfca

File tree

3 files changed

+35
-149
lines changed

3 files changed

+35
-149
lines changed

‎schemas/2015-05-21-preview/Microsoft.DevTestLab.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,4 +1832,4 @@
18321832
"description": "Information about a Windows OS."
18331833
}
18341834
}
1835-
}
1835+
}

‎schemas/2016-05-15/Microsoft.DevTestLab.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4077,4 +4077,4 @@
40774077
"description": "Information about a Windows OS."
40784078
}
40794079
}
4080-
}
4080+
}

‎schemas/2018-09-15/Microsoft.DevTestLab.json

Lines changed: 33 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,38 +1197,6 @@
11971197
},
11981198
"description": "Properties of an Azure Resource Manager template parameter."
11991199
},
1200-
"ArtifactDeploymentStatusProperties": {
1201-
"type": "object",
1202-
"properties": {
1203-
"artifactsApplied": {
1204-
"oneOf": [
1205-
{
1206-
"type": "integer"
1207-
},
1208-
{
1209-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1210-
}
1211-
],
1212-
"description": "The total count of the artifacts that were successfully applied."
1213-
},
1214-
"deploymentStatus": {
1215-
"type": "string",
1216-
"description": "The deployment status of the artifact."
1217-
},
1218-
"totalArtifacts": {
1219-
"oneOf": [
1220-
{
1221-
"type": "integer"
1222-
},
1223-
{
1224-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1225-
}
1226-
],
1227-
"description": "The total count of the artifacts that were tentatively applied."
1228-
}
1229-
},
1230-
"description": "Properties of an artifact deployment."
1231-
},
12321200
"ArtifactInstallProperties": {
12331201
"type": "object",
12341202
"properties": {
@@ -1317,7 +1285,8 @@
13171285
"type": "string",
13181286
"enum": [
13191287
"VsoGit",
1320-
"GitHub"
1288+
"GitHub",
1289+
"StorageAccount"
13211290
]
13221291
},
13231292
{
@@ -1364,7 +1333,7 @@
13641333
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
13651334
}
13661335
],
1367-
"description": "Size of the disk to be attached in GibiBytes."
1336+
"description": "Size of the disk to be attached in Gibibytes."
13681337
},
13691338
"diskType": {
13701339
"oneOf": [
@@ -1716,7 +1685,7 @@
17161685
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17171686
}
17181687
],
1719-
"description": "The size of the disk in GibiBytes."
1688+
"description": "The size of the disk in Gibibytes."
17201689
},
17211690
"diskType": {
17221691
"oneOf": [
@@ -1749,6 +1718,10 @@
17491718
"managedDiskId": {
17501719
"type": "string",
17511720
"description": "When backed by managed disk, this is the ID of the compute disk resource."
1721+
},
1722+
"storageAccountId": {
1723+
"type": "string",
1724+
"description": "When backed by a blob, the storage account where the blob is."
17521725
}
17531726
},
17541727
"description": "Properties of a disk."
@@ -1822,10 +1795,6 @@
18221795
"FormulaProperties": {
18231796
"type": "object",
18241797
"properties": {
1825-
"author": {
1826-
"type": "string",
1827-
"description": "The author of the formula."
1828-
},
18291798
"description": {
18301799
"type": "string",
18311800
"description": "The description of the formula."
@@ -1928,7 +1897,20 @@
19281897
"description": "The tenant identifier of resource."
19291898
},
19301899
"type": {
1931-
"type": "string",
1900+
"oneOf": [
1901+
{
1902+
"type": "string",
1903+
"enum": [
1904+
"None",
1905+
"SystemAssigned",
1906+
"UserAssigned",
1907+
"SystemAssigned,UserAssigned"
1908+
]
1909+
},
1910+
{
1911+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1912+
}
1913+
],
19321914
"description": "Managed identity."
19331915
}
19341916
},
@@ -3173,25 +3155,15 @@
31733155
"allowClaim": {
31743156
"oneOf": [
31753157
{
3176-
"type": "boolean"
3158+
"type": "boolean",
3159+
"default": false
31773160
},
31783161
{
31793162
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
31803163
}
31813164
],
31823165
"description": "Indicates whether another user can take ownership of the virtual machine"
31833166
},
3184-
"artifactDeploymentStatus": {
3185-
"oneOf": [
3186-
{
3187-
"$ref": "#/definitions/ArtifactDeploymentStatusProperties"
3188-
},
3189-
{
3190-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3191-
}
3192-
],
3193-
"description": "Properties of an artifact deployment."
3194-
},
31953167
"artifacts": {
31963168
"oneOf": [
31973169
{
@@ -3217,18 +3189,6 @@
32173189
],
32183190
"description": "Parameters for creating multiple virtual machines as a single action."
32193191
},
3220-
"computeId": {
3221-
"type": "string",
3222-
"description": "The resource identifier (Microsoft.Compute) of the virtual machine."
3223-
},
3224-
"createdByUser": {
3225-
"type": "string",
3226-
"description": "The email address of creator of the virtual machine."
3227-
},
3228-
"createdByUserId": {
3229-
"type": "string",
3230-
"description": "The object identifier of the creator of the virtual machine."
3231-
},
32323192
"createdDate": {
32333193
"type": "string",
32343194
"format": "date-time",
@@ -3255,7 +3215,8 @@
32553215
"disallowPublicIpAddress": {
32563216
"oneOf": [
32573217
{
3258-
"type": "boolean"
3218+
"type": "boolean",
3219+
"default": false
32593220
},
32603221
{
32613222
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3272,10 +3233,6 @@
32723233
"format": "date-time",
32733234
"description": "The expiration date for VM."
32743235
},
3275-
"fqdn": {
3276-
"type": "string",
3277-
"description": "The fully-qualified domain name of the virtual machine."
3278-
},
32793236
"galleryImageReference": {
32803237
"oneOf": [
32813238
{
@@ -3306,10 +3263,6 @@
33063263
"type": "string",
33073264
"description": "The lab virtual network identifier of the virtual machine."
33083265
},
3309-
"lastKnownPowerState": {
3310-
"type": "string",
3311-
"description": "Last known compute power state captured in DTL"
3312-
},
33133266
"networkInterface": {
33143267
"oneOf": [
33153268
{
@@ -3325,12 +3278,9 @@
33253278
"type": "string",
33263279
"description": "The notes of the virtual machine."
33273280
},
3328-
"osType": {
3329-
"type": "string",
3330-
"description": "The OS type of the virtual machine."
3331-
},
33323281
"ownerObjectId": {
33333282
"type": "string",
3283+
"default": "dynamicValue",
33343284
"description": "The object identifier of the owner of the virtual machine."
33353285
},
33363286
"ownerUserPrincipalName": {
@@ -3374,22 +3324,6 @@
33743324
"userName": {
33753325
"type": "string",
33763326
"description": "The user name of the virtual machine."
3377-
},
3378-
"virtualMachineCreationSource": {
3379-
"oneOf": [
3380-
{
3381-
"type": "string",
3382-
"enum": [
3383-
"FromCustomImage",
3384-
"FromGalleryImage",
3385-
"FromSharedGalleryImage"
3386-
]
3387-
},
3388-
{
3389-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3390-
}
3391-
],
3392-
"description": "Tells source of creation of lab virtual machine. Output property only."
33933327
}
33943328
},
33953329
"description": "Properties for virtual machine creation."
@@ -3400,25 +3334,15 @@
34003334
"allowClaim": {
34013335
"oneOf": [
34023336
{
3403-
"type": "boolean"
3337+
"type": "boolean",
3338+
"default": false
34043339
},
34053340
{
34063341
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
34073342
}
34083343
],
34093344
"description": "Indicates whether another user can take ownership of the virtual machine"
34103345
},
3411-
"artifactDeploymentStatus": {
3412-
"oneOf": [
3413-
{
3414-
"$ref": "#/definitions/ArtifactDeploymentStatusProperties"
3415-
},
3416-
{
3417-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3418-
}
3419-
],
3420-
"description": "Properties of an artifact deployment."
3421-
},
34223346
"artifacts": {
34233347
"oneOf": [
34243348
{
@@ -3433,18 +3357,6 @@
34333357
],
34343358
"description": "The artifacts to be installed on the virtual machine."
34353359
},
3436-
"computeId": {
3437-
"type": "string",
3438-
"description": "The resource identifier (Microsoft.Compute) of the virtual machine."
3439-
},
3440-
"createdByUser": {
3441-
"type": "string",
3442-
"description": "The email address of creator of the virtual machine."
3443-
},
3444-
"createdByUserId": {
3445-
"type": "string",
3446-
"description": "The object identifier of the creator of the virtual machine."
3447-
},
34483360
"createdDate": {
34493361
"type": "string",
34503362
"format": "date-time",
@@ -3471,7 +3383,8 @@
34713383
"disallowPublicIpAddress": {
34723384
"oneOf": [
34733385
{
3474-
"type": "boolean"
3386+
"type": "boolean",
3387+
"default": false
34753388
},
34763389
{
34773390
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3488,10 +3401,6 @@
34883401
"format": "date-time",
34893402
"description": "The expiration date for VM."
34903403
},
3491-
"fqdn": {
3492-
"type": "string",
3493-
"description": "The fully-qualified domain name of the virtual machine."
3494-
},
34953404
"galleryImageReference": {
34963405
"oneOf": [
34973406
{
@@ -3522,10 +3431,6 @@
35223431
"type": "string",
35233432
"description": "The lab virtual network identifier of the virtual machine."
35243433
},
3525-
"lastKnownPowerState": {
3526-
"type": "string",
3527-
"description": "Last known compute power state captured in DTL"
3528-
},
35293434
"networkInterface": {
35303435
"oneOf": [
35313436
{
@@ -3541,12 +3446,9 @@
35413446
"type": "string",
35423447
"description": "The notes of the virtual machine."
35433448
},
3544-
"osType": {
3545-
"type": "string",
3546-
"description": "The OS type of the virtual machine."
3547-
},
35483449
"ownerObjectId": {
35493450
"type": "string",
3451+
"default": "dynamicValue",
35503452
"description": "The object identifier of the owner of the virtual machine."
35513453
},
35523454
"ownerUserPrincipalName": {
@@ -3590,22 +3492,6 @@
35903492
"userName": {
35913493
"type": "string",
35923494
"description": "The user name of the virtual machine."
3593-
},
3594-
"virtualMachineCreationSource": {
3595-
"oneOf": [
3596-
{
3597-
"type": "string",
3598-
"enum": [
3599-
"FromCustomImage",
3600-
"FromGalleryImage",
3601-
"FromSharedGalleryImage"
3602-
]
3603-
},
3604-
{
3605-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3606-
}
3607-
],
3608-
"description": "Tells source of creation of lab virtual machine. Output property only."
36093495
}
36103496
},
36113497
"description": "Properties of a virtual machine."
@@ -4458,4 +4344,4 @@
44584344
"description": "Information about a Windows OS."
44594345
}
44604346
}
4461-
}
4347+
}

0 commit comments

Comments
 (0)