Skip to content

Commit 1267076

Browse files
zhaomuzhiVinayRSoniSubaMoorthyjopet@microsoft.comjoshanator
authored
[Ready for Review]New Azure Machine Learning api version 2021-07-01 (Azure#15141)
* Add Identity to createWorkpace example * change for getTransitivePEUsages * update * prettier code * add another new endpoint * address comments * change for getTransitivePEUsages * update * prettier code * add another new endpoint * address comments * revert change on transitivePE and notebookKeys * revert change on transitivePE and notebookKeys * add new stable version 2021-01-01 * add ListNotebookAccessToken * add primaryUserAssignedIdentity * fix missing properties and apis * fix one more missing property * 202 status for start and stop CI * make resync keys long runnin operation in version Jan2021 * resync keys 204 * update resync keys example * Dont throw 204 for resync * update resync keys * Formatting * revert Jan2021changes and add new version * start apr2021 version for azure ml rp * undo remove new line in jan2021 * use systemData definition in common * removed old files * fix small swagger bugs * run prettier * remove reference to sku * update readme * minimum agentCount should be 0 * add createdOn and ModifiedOn to compute properties * add LoadBalancerType to aks compute * add isNotebookInstanceCompute to virtualMachine * add leafDomainLabel to SslConfiguration * add overwriteExistingDomain to SslConfiguration * add synapseSpark as supported compute-type * update patch compute response to 202 * remove location from example responses * Revert "remove location from example responses" This reverts commit 048bf2551513afae842a9c4fbb5861aeddc6c33a. * MachineLearningCompute_Update should have a 200 response * sys data to use local def due to naming conflicts. * Fix enum casing * Fix operationId PR comment. * Change opId in apr version * remove 20210401 for easy review * only change api version * merge changes for 20210401 version * Add x-ms-discriminator-value for Synapse spark * camelcase loadbalancer properties * add createdOn and Modified on to examples * address AvoidAnonymousTypes error for SynapseSpark * Minor fixes + new property * Remove subscription state. * copy over from baseline api version 2021-03-01-preview * removed preview features from 2021-03-01-preview and added more apis and properties in 2021-07-01 * remove more preview features and examples * delete more examples of preview features * do some fixes * add a new enum value in DiagnoseResult * fix bug * update example * add x-ms-secret to some fields of KubernetesProperties * fix example * fix build error * add one new diagnosis category * fix swagger example * address comments on ListNodes api Co-authored-by: Vinay Rajmal Soni <[email protected]> Co-authored-by: Suba <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Josh Peterson <[email protected]> Co-authored-by: Suba <[email protected]> Co-authored-by: RichardZhaoW <[email protected]> Co-authored-by: Richard Zhao <[email protected]>
1 parent 038eccb commit 1267076

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+8525
-1
lines changed

‎custom-words.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,6 +1156,7 @@ Mkdirs
11561156
mktorest
11571157
ML's
11581158
mlapi
1159+
mlFlowTrackingUri
11591160
mnist
11601161
modelmanagement
11611162
modifiedtime

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/AKSCompute.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"description": "some compute",
12+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
13+
"computeType": "AKS",
14+
"properties": {
15+
"agentCount": 4
16+
}
17+
}
18+
}
19+
},
20+
"responses": {
21+
"200": {
22+
"body": {
23+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
24+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
25+
"name": "compute123",
26+
"location": "eastus",
27+
"properties": {
28+
"description": "some compute",
29+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
30+
"computeType": "AKS",
31+
"provisioningState": "Succeeded",
32+
"properties": {
33+
"agentCount": 4
34+
}
35+
}
36+
}
37+
},
38+
"201": {
39+
"body": {
40+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
41+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
42+
"name": "compute123",
43+
"location": "eastus",
44+
"properties": {
45+
"description": "some compute",
46+
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
47+
"computeType": "AKS",
48+
"provisioningState": "Updating"
49+
}
50+
},
51+
"headers": {
52+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
53+
}
54+
}
55+
}
56+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/AmlCompute.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AmlCompute",
12+
"description": "some compute",
13+
"properties": {
14+
"scaleSettings": {
15+
"maxNodeCount": 4,
16+
"minNodeCount": 4,
17+
"nodeIdleTimeBeforeScaleDown": "PT5M"
18+
}
19+
}
20+
}
21+
}
22+
},
23+
"responses": {
24+
"200": {
25+
"body": {
26+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
27+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
28+
"name": "compute123",
29+
"location": "eastus2",
30+
"properties": {
31+
"description": "some compute",
32+
"createdOn": "2021-04-01T22:00:00.0000000+00:00",
33+
"modifiedOn": "2021-04-01T22:00:00.0000000+00:00",
34+
"computeType": "AmlCompute",
35+
"provisioningState": "Succeeded",
36+
"properties": {
37+
"vmSize": "STANDARD_NC6",
38+
"vmPriority": "Dedicated",
39+
"osType": "Windows",
40+
"virtualMachineImage": null,
41+
"isolatedNetwork": false,
42+
"subnet": "test-subnet-resource-id",
43+
"scaleSettings": {
44+
"maxNodeCount": 1,
45+
"minNodeCount": 0,
46+
"nodeIdleTimeBeforeScaleDown": "PT5M"
47+
},
48+
"remoteLoginPortPublicAccess": "Enabled",
49+
"allocationState": "Resizing",
50+
"allocationStateTransitionTime": "2017-09-27T22:28:08.998Z",
51+
"errors": null,
52+
"currentNodeCount": 0,
53+
"targetNodeCount": 1,
54+
"nodeStateCounts": {
55+
"preparingNodeCount": 0,
56+
"runningNodeCount": 0,
57+
"idleNodeCount": 0,
58+
"unusableNodeCount": 0,
59+
"leavingNodeCount": 0,
60+
"preemptedNodeCount": 0
61+
},
62+
"enableNodePublicIp": true
63+
}
64+
}
65+
}
66+
},
67+
"201": {
68+
"body": {
69+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
70+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
71+
"name": "compute123",
72+
"location": "eastus2",
73+
"properties": {
74+
"description": "some compute",
75+
"computeType": "AmlCompute",
76+
"provisioningState": "Updating"
77+
}
78+
},
79+
"headers": {
80+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
81+
}
82+
}
83+
}
84+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/BasicAKSCompute.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AKS"
12+
}
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
19+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
20+
"name": "compute123",
21+
"location": "eastus",
22+
"properties": {
23+
"computeType": "AKS",
24+
"provisioningState": "Creating"
25+
}
26+
}
27+
},
28+
"201": {
29+
"body": {
30+
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
31+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
32+
"name": "compute123",
33+
"location": "eastus",
34+
"properties": {
35+
"computeType": "AKS",
36+
"provisioningState": "Creating"
37+
}
38+
},
39+
"headers": {
40+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
41+
}
42+
}
43+
}
44+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/BasicAmlCompute.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "AmlCompute",
12+
"properties": {
13+
"vmSize": "STANDARD_NC6",
14+
"vmPriority": "Dedicated",
15+
"osType": "Windows",
16+
"virtualMachineImage": {
17+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Compute/galleries/myImageGallery/images/myImageDefinition/versions/0.0.1"
18+
},
19+
"isolatedNetwork": false,
20+
"scaleSettings": {
21+
"maxNodeCount": 1,
22+
"minNodeCount": 0,
23+
"nodeIdleTimeBeforeScaleDown": "PT5M"
24+
},
25+
"remoteLoginPortPublicAccess": "NotSpecified",
26+
"enableNodePublicIp": true
27+
}
28+
}
29+
}
30+
},
31+
"responses": {
32+
"200": {
33+
"body": {
34+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
35+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
36+
"name": "compute123",
37+
"location": "eastus",
38+
"properties": {
39+
"computeType": "AmlCompute",
40+
"provisioningState": "Creating"
41+
}
42+
}
43+
},
44+
"201": {
45+
"body": {
46+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
47+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
48+
"name": "compute123",
49+
"location": "eastus",
50+
"properties": {
51+
"computeType": "AmlCompute",
52+
"provisioningState": "Creating"
53+
}
54+
},
55+
"headers": {
56+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
57+
}
58+
}
59+
}
60+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/BasicDataFactoryCompute.json‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "DataFactory"
12+
}
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
19+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
20+
"name": "compute123",
21+
"location": "eastus",
22+
"properties": {
23+
"computeType": "DataFactory",
24+
"provisioningState": "Creating"
25+
}
26+
}
27+
},
28+
"201": {
29+
"body": {
30+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
31+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
32+
"name": "compute123",
33+
"location": "eastus",
34+
"properties": {
35+
"computeType": "DataFactory",
36+
"provisioningState": "Creating"
37+
}
38+
},
39+
"headers": {
40+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
41+
}
42+
}
43+
}
44+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2021-07-01/examples/Compute/createOrUpdate/ComputeInstance.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2021-07-01",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"computeType": "ComputeInstance",
12+
"properties": {
13+
"vmSize": "STANDARD_NC6",
14+
"subnet": "test-subnet-resource-id",
15+
"applicationSharingPolicy": "Personal",
16+
"sshSettings": {
17+
"sshPublicAccess": "Disabled"
18+
},
19+
"computeInstanceAuthorizationType": "personal",
20+
"personalComputeInstanceSettings": {
21+
"assignedUser": {
22+
"objectId": "00000000-0000-0000-0000-000000000000",
23+
"tenantId": "00000000-0000-0000-0000-000000000000"
24+
}
25+
}
26+
}
27+
}
28+
}
29+
},
30+
"responses": {
31+
"200": {
32+
"body": {
33+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
34+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
35+
"name": "compute123",
36+
"location": "eastus",
37+
"properties": {
38+
"computeType": "ComputeInstance",
39+
"provisioningState": "Creating"
40+
}
41+
}
42+
},
43+
"201": {
44+
"body": {
45+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
46+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
47+
"name": "compute123",
48+
"location": "eastus",
49+
"properties": {
50+
"computeType": "ComputeInstance",
51+
"provisioningState": "Creating"
52+
}
53+
},
54+
"headers": {
55+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
56+
}
57+
}
58+
}
59+
}

0 commit comments

Comments
 (0)