Skip to content

Commit 7c043f3

Browse files
joshanatorjopet@microsoft.com
joshanator
and
jopet@microsoft.com
authored
Swagger Correctness Fixes MachineLearningServices (#12662)
* Fix GetAmlCompute examples for isolatedNetwork * add computeInstanceAuthorizationType to 20200801 * add OsType to amlcompute 20200801 * give default ostype for amlcompute * Update nodeIdleTimeBeforeScaleDown description 20200801 * add "auto" to SslConfiguration enum * matching identiity.type enum order of future * agentvmsize typo fixed * add setupScripts to computeInstance 09-01 * add format to agentCount 20200801 * mark listnodes as pageable Co-authored-by: jopet@microsoft.com <jopet@microsoft.com>
1 parent c44ebe5 commit 7c043f3

File tree

4 files changed

+140
-8
lines changed

4 files changed

+140
-8
lines changed

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-15-preview/examples/getAmlCompute.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"vmPriority": "Dedicated",
2424
"osType": "Windows",
2525
"virtualMachineImage": null,
26-
"isolatedNetwork": null,
26+
"isolatedNetwork": false,
2727
"subnet": "test-subnet-resource-id",
2828
"scaleSettings": {
2929
"maxNodeCount": 1,

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getAmlCompute.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"vmPriority": "Dedicated",
2424
"osType": "Windows",
2525
"virtualMachineImage": null,
26-
"isolatedNetwork": null,
26+
"isolatedNetwork": false,
2727
"subnet": "test-subnet-resource-id",
2828
"scaleSettings": {
2929
"maxNodeCount": 1,

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,10 @@
974974
}
975975
}
976976
},
977+
"x-ms-pageable": {
978+
"nextLinkName": "nextLink",
979+
"itemName": "nodes"
980+
},
977981
"x-ms-examples": {
978982
"Get compute nodes information for a compute": {
979983
"$ref": "./examples/amlComputeListNodes.json"
@@ -3290,7 +3294,7 @@
32903294
"format": "int32",
32913295
"minimum": 1
32923296
},
3293-
"agentVMSize": {
3297+
"agentVmSize": {
32943298
"description": "Agent virtual machine size",
32953299
"type": "string"
32963300
},
@@ -3325,6 +3329,7 @@
33253329
"osType": {
33263330
"description": "Compute OS Type",
33273331
"type": "string",
3332+
"default": "Linux",
33283333
"enum": [
33293334
"Linux",
33303335
"Windows"
@@ -3540,6 +3545,10 @@
35403545
"description": "Settings for a personal compute instance.",
35413546
"$ref": "#/definitions/PersonalComputeInstanceSettings"
35423547
},
3548+
"setupScripts": {
3549+
"description": "Details of customized scripts to execute for setting up the cluster.",
3550+
"$ref": "#/definitions/SetupScripts"
3551+
},
35433552
"lastOperation": {
35443553
"description": "The last operation on ComputeInstance.",
35453554
"$ref": "#/definitions/ComputeInstanceLastOperation",
@@ -3723,7 +3732,8 @@
37233732
"type": "string",
37243733
"enum": [
37253734
"Disabled",
3726-
"Enabled"
3735+
"Enabled",
3736+
"Auto"
37273737
]
37283738
},
37293739
"cert": {
@@ -3928,6 +3938,11 @@
39283938
"$ref": "#/definitions/AmlComputeNodeInformation"
39293939
},
39303940
"description": "The collection of returned AmlCompute nodes details."
3941+
},
3942+
"nextLink": {
3943+
"readOnly": true,
3944+
"type": "string",
3945+
"description": "The continuation token."
39313946
}
39323947
}
39333948
}
@@ -6456,6 +6471,52 @@
64566471
"type": "string"
64576472
}
64586473
}
6474+
},
6475+
"SetupScripts": {
6476+
"type": "object",
6477+
"description": "Details of customized scripts to execute for setting up the cluster.",
6478+
"properties": {
6479+
"scripts": {
6480+
"description": "Customized setup scripts",
6481+
"$ref": "#/definitions/ScriptsToExecute"
6482+
}
6483+
}
6484+
},
6485+
"ScriptsToExecute": {
6486+
"type": "object",
6487+
"description": "Customized setup scripts",
6488+
"properties": {
6489+
"startupScript": {
6490+
"description": "Script that's run every time the machine starts.",
6491+
"$ref": "#/definitions/ScriptReference"
6492+
},
6493+
"creationScript": {
6494+
"description": "Script that's run only once during provision of the compute.",
6495+
"$ref": "#/definitions/ScriptReference"
6496+
}
6497+
}
6498+
},
6499+
"ScriptReference": {
6500+
"type": "object",
6501+
"description": "Script reference",
6502+
"properties": {
6503+
"scriptSource": {
6504+
"description": "The storage source of the script: inline, workspace.",
6505+
"type": "string"
6506+
},
6507+
"scriptData": {
6508+
"description": "The location of scripts in the mounted volume.",
6509+
"type": "string"
6510+
},
6511+
"scriptArguments": {
6512+
"description": "Optional command line arguments passed to the script to run.",
6513+
"type": "string"
6514+
},
6515+
"timeout": {
6516+
"description": "Optional time period passed to timeout command.",
6517+
"type": "string"
6518+
}
6519+
}
64596520
}
64606521
}
64616522
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json‎

Lines changed: 75 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,10 @@
12191219
}
12201220
}
12211221
},
1222+
"x-ms-pageable": {
1223+
"nextLinkName": "nextLink",
1224+
"itemName": "nodes"
1225+
},
12221226
"x-ms-examples": {
12231227
"Get compute nodes information for a compute": {
12241228
"$ref": "./examples/amlComputeListNodes.json"
@@ -2510,8 +2514,8 @@
25102514
"description": "The identity type.",
25112515
"enum": [
25122516
"SystemAssigned",
2513-
"UserAssigned",
25142517
"SystemAssigned,UserAssigned",
2518+
"UserAssigned",
25152519
"None"
25162520
],
25172521
"x-ms-enum": {
@@ -2785,9 +2789,10 @@
27852789
"agentCount": {
27862790
"description": "Number of agents",
27872791
"type": "integer",
2792+
"format": "int32",
27882793
"minimum": 1
27892794
},
2790-
"agentVMSize": {
2795+
"agentVmSize": {
27912796
"description": "Agent virtual machine size",
27922797
"type": "string"
27932798
},
@@ -2819,6 +2824,19 @@
28192824
"description": "AML Compute properties",
28202825
"type": "object",
28212826
"properties": {
2827+
"osType": {
2828+
"description": "Compute OS Type",
2829+
"type": "string",
2830+
"default": "Linux",
2831+
"enum": [
2832+
"Linux",
2833+
"Windows"
2834+
],
2835+
"x-ms-enum": {
2836+
"name": "OsType",
2837+
"modelAsString": true
2838+
}
2839+
},
28222840
"vmSize": {
28232841
"description": "Virtual Machine Size",
28242842
"type": "string"
@@ -2993,6 +3011,24 @@
29933011
"$ref": "#/definitions/ComputeInstanceState",
29943012
"readOnly": true
29953013
},
3014+
"computeInstanceAuthorizationType": {
3015+
"type": "string",
3016+
"title": "Compute Instance Authorization type.",
3017+
"description": "The Compute Instance Authorization type. Available values are personal (default).",
3018+
"default": "personal",
3019+
"enum": [
3020+
"personal"
3021+
],
3022+
"x-ms-enum": {
3023+
"name": "ComputeInstanceAuthorizationType",
3024+
"modelAsString": true
3025+
}
3026+
},
3027+
"personalComputeInstanceSettings": {
3028+
"title": "Personal Compute Instance settings.",
3029+
"description": "Settings for a personal compute instance.",
3030+
"$ref": "#/definitions/PersonalComputeInstanceSettings"
3031+
},
29963032
"lastOperation": {
29973033
"description": "The last operation on ComputeInstance.",
29983034
"$ref": "#/definitions/ComputeInstanceLastOperation",
@@ -3174,7 +3210,8 @@
31743210
"type": "string",
31753211
"enum": [
31763212
"Disabled",
3177-
"Enabled"
3213+
"Enabled",
3214+
"Auto"
31783215
]
31793216
},
31803217
"cert": {
@@ -3255,7 +3292,7 @@
32553292
"nodeIdleTimeBeforeScaleDown": {
32563293
"type": "string",
32573294
"format": "duration",
3258-
"description": "Node Idle Time before scaling down amlCompute"
3295+
"description": "Node Idle Time before scaling down amlCompute. This string needs to be in the RFC Format."
32593296
}
32603297
},
32613298
"required": [
@@ -3364,6 +3401,11 @@
33643401
"$ref": "#/definitions/AmlComputeNodeInformation"
33653402
},
33663403
"description": "The collection of returned AmlCompute nodes details."
3404+
},
3405+
"nextLink": {
3406+
"readOnly": true,
3407+
"type": "string",
3408+
"description": "The continuation token."
33673409
}
33683410
}
33693411
}
@@ -4260,6 +4302,35 @@
42604302
"description": "Uniquely identifies the user within his/her organization."
42614303
}
42624304
}
4305+
},
4306+
"PersonalComputeInstanceSettings": {
4307+
"type": "object",
4308+
"properties": {
4309+
"assignedUser": {
4310+
"$ref": "#/definitions/AssignedUser",
4311+
"title": "Assigned User.",
4312+
"description": "A user explicitly assigned to a personal compute instance."
4313+
}
4314+
},
4315+
"description": "Settings for a personal compute instance."
4316+
},
4317+
"AssignedUser": {
4318+
"type": "object",
4319+
"description": "A user that can be assigned to a compute instance.",
4320+
"properties": {
4321+
"objectId": {
4322+
"type": "string",
4323+
"description": "User’s AAD Object Id."
4324+
},
4325+
"tenantId": {
4326+
"type": "string",
4327+
"description": "User’s AAD Tenant Id."
4328+
}
4329+
},
4330+
"required": [
4331+
"objectId",
4332+
"tenantId"
4333+
]
42634334
}
42644335
}
42654336
}

0 commit comments

Comments
 (0)