From b108a258663152f256168fcb9074701a3bdbe955 Mon Sep 17 00:00:00 2001 From: Joshua Peterson Date: Mon, 28 Dec 2020 14:30:58 -0800 Subject: [PATCH 01/11] ListNodes should be marked as pageable --- .../stable/2021-01-01/machineLearningServices.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index a2ca4357bddb..55e40d362004 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -974,6 +974,9 @@ } } }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, "x-ms-examples": { "Get compute nodes information for a compute": { "$ref": "./examples/amlComputeListNodes.json" From 8bde1df333073a2e58da44d2b96dbed38d3c7c84 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Wed, 30 Dec 2020 11:13:06 -0800 Subject: [PATCH 02/11] Default value for IsolatedNetwork should be false not null --- .../stable/2021-01-01/examples/getAmlCompute.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/examples/getAmlCompute.json index 7371ddc23148..a3981a2e3c36 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/examples/getAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/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 c9b52f33de958158a933f42126442acf77a82c69 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 12:49:22 -0800 Subject: [PATCH 03/11] update aksProperties for agentVmSize and clusterPurpose --- .../stable/2021-01-01/machineLearningServices.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 55e40d362004..3050175f47a5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3421,10 +3421,14 @@ "format": "int32", "minimum": 1 }, - "agentVMSize": { + "agentVmSize": { "description": "Agent virtual machine size", "type": "string" }, + "clusterPurpose": { + "Description": "Intended usage of the cluster", + "$ref": "#/definitions/ClusterPurpose" + }, "sslConfiguration": { "description": "SSL configuration", "$ref": "#/definitions/SslConfiguration" From 3f144f0dbab062031f8f52bf4d4842efc37f62c2 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 15:34:58 -0800 Subject: [PATCH 04/11] Add "auto" enum to SslConfiguration.status --- .../stable/2021-01-01/machineLearningServices.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 3050175f47a5..e5333108d5f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3858,7 +3858,8 @@ "type": "string", "enum": [ "Disabled", - "Enabled" + "Enabled", + "Auto" ] }, "cert": { From bc1649fdc54e14c843394619afc0edbae9adfb23 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 16:49:47 -0800 Subject: [PATCH 05/11] add setupScripts property to computeInstance --- .../stable/2021-01-01/machineLearningServices.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index e5333108d5f4..6ffdee1fd17e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3675,6 +3675,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", From a9685959ffdc42b9c11f8feacdd21336583b5a82 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 17:00:04 -0800 Subject: [PATCH 06/11] add workspaceUrl to databricks --- .../stable/2021-01-01/machineLearningServices.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 6ffdee1fd17e..3189e525067d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3783,6 +3783,10 @@ "databricksAccessToken": { "description": "Databricks access token", "type": "string" + }, + "workspaceUrl": { + "description": "Workspace Url", + "type": "string" } } } From 29f418079e5c22ae3d4bf2ecc406e9d1c1eaff13 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 17:15:07 -0800 Subject: [PATCH 07/11] mark osType readonly --- .../stable/2021-01-01/machineLearningServices.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 3189e525067d..e5953f5f801d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3460,6 +3460,7 @@ "osType": { "description": "Compute OS Type", "type": "string", + "readOnly": true, "enum": [ "Linux", "Windows" From 3b96fcdc15b6e5107e7b384f67711f4dd93ee414 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 17:18:13 -0800 Subject: [PATCH 08/11] set default of ostype. dont make readonly --- .../stable/2021-01-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index e5953f5f801d..7a76072a9c92 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3460,7 +3460,7 @@ "osType": { "description": "Compute OS Type", "type": "string", - "readOnly": true, + "default": "Linux", "enum": [ "Linux", "Windows" From ccf54a0a72e5407d7052fdc2ecd5fbe602a19851 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 19:32:28 -0800 Subject: [PATCH 09/11] dont capitalize setupscripts --- .../stable/2021-01-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 7a76072a9c92..3dc73a258e95 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3676,7 +3676,7 @@ "description": "Settings for a personal compute instance.", "$ref": "#/definitions/PersonalComputeInstanceSettings" }, - "SetupScripts": { + "setupScripts": { "description": "Details of customized scripts to execute for setting up the cluster.", "$ref": "#/definitions/SetupScripts" }, From 3ddeb95908530971f48d8085a25055fd90a62c27 Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 19:41:34 -0800 Subject: [PATCH 10/11] fix property clusterPurpose --- .../stable/2021-01-01/machineLearningServices.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 3dc73a258e95..4c5ad0323406 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -3427,7 +3427,17 @@ }, "clusterPurpose": { "Description": "Intended usage of the cluster", - "$ref": "#/definitions/ClusterPurpose" + "type": "string", + "default": "FastProd", + "enum": [ + "FastProd", + "DenseProd", + "DevTest" + ], + "x-ms-enum": { + "name": "ClusterPurpose", + "modelAsString": true + } }, "sslConfiguration": { "description": "SSL configuration", From fdc6640c3e28486e36e2188ed53559295332376a Mon Sep 17 00:00:00 2001 From: "jopet@microsoft.com" Date: Mon, 4 Jan 2021 20:02:32 -0800 Subject: [PATCH 11/11] define SetupScripts --- .../2021-01-01/machineLearningServices.json | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json index 4c5ad0323406..107dca9ba35d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json @@ -6614,6 +6614,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" + } + } } } }