Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mlc swagger fixes #4

Merged
merged 11 commits into from
Jan 5, 2021
Merged

Mlc swagger fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b108a25
ListNodes should be marked as pageable
Dec 28, 2020
8bde1df
Default value for IsolatedNetwork should be false not null
Dec 30, 2020
c9b52f3
update aksProperties for agentVmSize and clusterPurpose
Jan 4, 2021
3f144f0
Add "auto" enum to SslConfiguration.status
Jan 4, 2021
bc1649f
add setupScripts property to computeInstance
Jan 5, 2021
a968595
add workspaceUrl to databricks
Jan 5, 2021
29f4180
mark osType readonly
Jan 5, 2021
3b96fcd
set default of ostype. dont make readonly
Jan 5, 2021
ccf54a0
dont capitalize setupscripts
Jan 5, 2021
3ddeb95
fix property clusterPurpose
Jan 5, 2021
fdc6640
define SetupScripts
Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e-manager/Microsoft.MachineLearningServices/stable/2021-01-01/examples/getAmlCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"vmPriority": "Dedicated",
"osType": "Windows",
"virtualMachineImage": null,
"isolatedNetwork": null,
"isolatedNetwork": false,
"subnet": "test-subnet-resource-id",
"scaleSettings": {
"maxNodeCount": 1,
Expand Down
77 changes: 75 additions & 2 deletions ...-manager/Microsoft.MachineLearningServices/stable/2021-01-01/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,9 @@
}
}
},
"x-ms-pageable": {
"nextLinkName": "nextLink"
},
"x-ms-examples": {
"Get compute nodes information for a compute": {
"$ref": "./examples/amlComputeListNodes.json"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -3453,6 +3470,7 @@
"osType": {
"description": "Compute OS Type",
"type": "string",
"default": "Linux",
"enum": [
"Linux",
"Windows"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -3772,6 +3794,10 @@
"databricksAccessToken": {
"description": "Databricks access token",
"type": "string"
},
"workspaceUrl": {
"description": "Workspace Url",
"type": "string"
}
}
}
Expand Down Expand Up @@ -3851,7 +3877,8 @@
"type": "string",
"enum": [
"Disabled",
"Enabled"
"Enabled",
"Auto"
]
},
"cert": {
Expand Down Expand Up @@ -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"
}
}
}
}
}