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, 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..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 @@ -974,6 +974,9 @@ } } }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, "x-ms-examples": { "Get compute nodes information for a compute": { "$ref": "./examples/amlComputeListNodes.json" @@ -3418,10 +3421,24 @@ "format": "int32", "minimum": 1 }, - "agentVMSize": { + "agentVmSize": { "description": "Agent virtual machine size", "type": "string" }, + "clusterPurpose": { + "Description": "Intended usage of the cluster", + "type": "string", + "default": "FastProd", + "enum": [ + "FastProd", + "DenseProd", + "DevTest" + ], + "x-ms-enum": { + "name": "ClusterPurpose", + "modelAsString": true + } + }, "sslConfiguration": { "description": "SSL configuration", "$ref": "#/definitions/SslConfiguration" @@ -3453,6 +3470,7 @@ "osType": { "description": "Compute OS Type", "type": "string", + "default": "Linux", "enum": [ "Linux", "Windows" @@ -3668,6 +3686,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", @@ -3772,6 +3794,10 @@ "databricksAccessToken": { "description": "Databricks access token", "type": "string" + }, + "workspaceUrl": { + "description": "Workspace Url", + "type": "string" } } } @@ -3851,7 +3877,8 @@ "type": "string", "enum": [ "Disabled", - "Enabled" + "Enabled", + "Auto" ] }, "cert": { @@ -6587,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" + } + } } } }