From 2a89553ed75702af3b6ca244e5da3987404b4780 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:07:37 -0800 Subject: [PATCH 01/11] Fix GetAmlCompute examples for isolatedNetwork --- .../preview/2020-05-15-preview/examples/getAmlCompute.json | 2 +- .../preview/2020-09-01-preview/examples/getAmlCompute.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-15-preview/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-15-preview/examples/getAmlCompute.json index bcd93f48347a..ddecac95991d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-15-preview/examples/getAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-05-15-preview/examples/getAmlCompute.json @@ -23,7 +23,7 @@ "vmPriority": "Dedicated", "osType": "Windows", "virtualMachineImage": null, - "isolatedNetwork": null, + "isolatedNetwork": false, "subnet": "test-subnet-resource-id", "scaleSettings": { "maxNodeCount": 1, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getAmlCompute.json index bcd93f48347a..ddecac95991d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getAmlCompute.json @@ -23,7 +23,7 @@ "vmPriority": "Dedicated", "osType": "Windows", "virtualMachineImage": null, - "isolatedNetwork": null, + "isolatedNetwork": false, "subnet": "test-subnet-resource-id", "scaleSettings": { "maxNodeCount": 1, From af614725eea5d472d5998271cdabad0a3ede1551 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:11:11 -0800 Subject: [PATCH 02/11] add computeInstanceAuthorizationType to 20200801 --- .../2020-08-01/machineLearningServices.json | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index 8e05c90bac12..01e70c5dcebb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2993,6 +2993,24 @@ "$ref": "#/definitions/ComputeInstanceState", "readOnly": true }, + "computeInstanceAuthorizationType": { + "type": "string", + "title": "Compute Instance Authorization type.", + "description": "The Compute Instance Authorization type. Available values are personal (default).", + "default": "personal", + "enum": [ + "personal" + ], + "x-ms-enum": { + "name": "ComputeInstanceAuthorizationType", + "modelAsString": true + } + }, + "personalComputeInstanceSettings": { + "title": "Personal Compute Instance settings.", + "description": "Settings for a personal compute instance.", + "$ref": "#/definitions/PersonalComputeInstanceSettings" + }, "lastOperation": { "description": "The last operation on ComputeInstance.", "$ref": "#/definitions/ComputeInstanceLastOperation", @@ -4260,6 +4278,35 @@ "description": "Uniquely identifies the user within his/her organization." } } + }, + "PersonalComputeInstanceSettings": { + "type": "object", + "properties": { + "assignedUser": { + "$ref": "#/definitions/AssignedUser", + "title": "Assigned User.", + "description": "A user explicitly assigned to a personal compute instance." + } + }, + "description": "Settings for a personal compute instance." + }, + "AssignedUser": { + "type": "object", + "description": "A user that can be assigned to a compute instance.", + "properties": { + "objectId": { + "type": "string", + "description": "User’s AAD Object Id." + }, + "tenantId": { + "type": "string", + "description": "User’s AAD Tenant Id." + } + }, + "required": [ + "objectId", + "tenantId" + ] } } } From 6dec55e30d089f3468504fb4efaa532102039c9a Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:11:49 -0800 Subject: [PATCH 03/11] add OsType to amlcompute 20200801 --- .../stable/2020-08-01/machineLearningServices.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index 01e70c5dcebb..c48946de6929 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2819,6 +2819,18 @@ "description": "AML Compute properties", "type": "object", "properties": { + "osType": { + "description": "Compute OS Type", + "type": "string", + "enum": [ + "Linux", + "Windows" + ], + "x-ms-enum": { + "name": "OsType", + "modelAsString": true + } + }, "vmSize": { "description": "Virtual Machine Size", "type": "string" From 8372b49437ac31ee0ccb6bc5723d7d05c58ed5e2 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:12:35 -0800 Subject: [PATCH 04/11] give default ostype for amlcompute --- .../preview/2020-09-01-preview/machineLearningServices.json | 1 + .../stable/2020-08-01/machineLearningServices.json | 1 + 2 files changed, 2 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index 067f48ddf6c9..e067630469d6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -3325,6 +3325,7 @@ "osType": { "description": "Compute OS Type", "type": "string", + "default": "Linux", "enum": [ "Linux", "Windows" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index c48946de6929..484f046d6ea8 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2822,6 +2822,7 @@ "osType": { "description": "Compute OS Type", "type": "string", + "default": "Linux", "enum": [ "Linux", "Windows" From 205113a77cae1eff3c00fad9d555a3595c699ee7 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:13:08 -0800 Subject: [PATCH 05/11] Update nodeIdleTimeBeforeScaleDown description 20200801 --- .../stable/2020-08-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index 484f046d6ea8..d5f7baca3f13 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -3286,7 +3286,7 @@ "nodeIdleTimeBeforeScaleDown": { "type": "string", "format": "duration", - "description": "Node Idle Time before scaling down amlCompute" + "description": "Node Idle Time before scaling down amlCompute. This string needs to be in the RFC Format." } }, "required": [ From 3682b05d1d05085980e13d8bf3bef47cc67c9d77 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:14:16 -0800 Subject: [PATCH 06/11] add "auto" to SslConfiguration enum --- .../preview/2020-09-01-preview/machineLearningServices.json | 3 ++- .../stable/2020-08-01/machineLearningServices.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index e067630469d6..2c9549f0ac67 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -3724,7 +3724,8 @@ "type": "string", "enum": [ "Disabled", - "Enabled" + "Enabled", + "Auto" ] }, "cert": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index d5f7baca3f13..5669bdfc0875 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -3205,7 +3205,8 @@ "type": "string", "enum": [ "Disabled", - "Enabled" + "Enabled", + "Auto" ] }, "cert": { From 18d94408eb0866ee29aa8965a641270ce9cd0f9a Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:14:51 -0800 Subject: [PATCH 07/11] matching identiity.type enum order of future --- .../stable/2020-08-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index 5669bdfc0875..d0f16b5d6150 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2510,8 +2510,8 @@ "description": "The identity type.", "enum": [ "SystemAssigned", - "UserAssigned", "SystemAssigned,UserAssigned", + "UserAssigned", "None" ], "x-ms-enum": { From 5fd280cd33f699c2006852b4b981d12fc4dc16d3 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:15:22 -0800 Subject: [PATCH 08/11] agentvmsize typo fixed --- .../preview/2020-09-01-preview/machineLearningServices.json | 2 +- .../stable/2020-08-01/machineLearningServices.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index 2c9549f0ac67..b502653746a4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -3290,7 +3290,7 @@ "format": "int32", "minimum": 1 }, - "agentVMSize": { + "agentVmSize": { "description": "Agent virtual machine size", "type": "string" }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index d0f16b5d6150..be0bcafbc3a4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2787,7 +2787,7 @@ "type": "integer", "minimum": 1 }, - "agentVMSize": { + "agentVmSize": { "description": "Agent virtual machine size", "type": "string" }, From 709e9450122da68fecd7c6808cb9fb9c0965ef38 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:16:12 -0800 Subject: [PATCH 09/11] add setupScripts to computeInstance 09-01 --- .../machineLearningServices.json | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index b502653746a4..a60be937d0e8 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -3541,6 +3541,10 @@ "description": "Settings for a personal compute instance.", "$ref": "#/definitions/PersonalComputeInstanceSettings" }, + "setupScripts": { + "description": "Details of customized scripts to execute for setting up the cluster.", + "$ref": "#/definitions/SetupScripts" + }, "lastOperation": { "description": "The last operation on ComputeInstance.", "$ref": "#/definitions/ComputeInstanceLastOperation", @@ -6458,6 +6462,52 @@ "type": "string" } } + }, + "SetupScripts": { + "type": "object", + "description": "Details of customized scripts to execute for setting up the cluster.", + "properties": { + "scripts": { + "description": "Customized setup scripts", + "$ref": "#/definitions/ScriptsToExecute" + } + } + }, + "ScriptsToExecute": { + "type": "object", + "description": "Customized setup scripts", + "properties": { + "startupScript": { + "description": "Script that's run every time the machine starts.", + "$ref": "#/definitions/ScriptReference" + }, + "creationScript": { + "description": "Script that's run only once during provision of the compute.", + "$ref": "#/definitions/ScriptReference" + } + } + }, + "ScriptReference": { + "type": "object", + "description": "Script reference", + "properties": { + "scriptSource": { + "description": "The storage source of the script: inline, workspace.", + "type": "string" + }, + "scriptData": { + "description": "The location of scripts in the mounted volume.", + "type": "string" + }, + "scriptArguments": { + "description": "Optional command line arguments passed to the script to run.", + "type": "string" + }, + "timeout": { + "description": "Optional time period passed to timeout command.", + "type": "string" + } + } } } } From 74bf8f5e28b928a221fe6b2fbe42599cedf70f64 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:16:48 -0800 Subject: [PATCH 10/11] add format to agentCount 20200801 --- .../stable/2020-08-01/machineLearningServices.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index be0bcafbc3a4..375c3beb9e1f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -2785,6 +2785,7 @@ "agentCount": { "description": "Number of agents", "type": "integer", + "format": "int32", "minimum": 1 }, "agentVmSize": { From 92ae07bf0bff830ea81aaac587495ba969f4df1a Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Tue, 26 Jan 2021 15:18:36 -0800 Subject: [PATCH 11/11] mark listnodes as pageable --- .../2020-09-01-preview/machineLearningServices.json | 9 +++++++++ .../stable/2020-08-01/machineLearningServices.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json index a60be937d0e8..f34029e01dd7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json @@ -974,6 +974,10 @@ } } }, + "x-ms-pageable": { + "nextLinkName": "nextLink", + "itemName": "nodes" + }, "x-ms-examples": { "Get compute nodes information for a compute": { "$ref": "./examples/amlComputeListNodes.json" @@ -3934,6 +3938,11 @@ "$ref": "#/definitions/AmlComputeNodeInformation" }, "description": "The collection of returned AmlCompute nodes details." + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The continuation token." } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json index 375c3beb9e1f..ce9d4424b7d3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/machineLearningServices.json @@ -1219,6 +1219,10 @@ } } }, + "x-ms-pageable": { + "nextLinkName": "nextLink", + "itemName": "nodes" + }, "x-ms-examples": { "Get compute nodes information for a compute": { "$ref": "./examples/amlComputeListNodes.json" @@ -3397,6 +3401,11 @@ "$ref": "#/definitions/AmlComputeNodeInformation" }, "description": "The collection of returned AmlCompute nodes details." + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The continuation token." } } }