Skip to content

Commit ec1bf6c

Browse files
erjmsZhidaLiulibc16weshaggard
authored and
harryli0108
committed
[Hub Generated] Review request for Microsoft.MachineLearningServices to add version preview/2023-06-01-preview (Azure#24049)
* Adds base for updating Microsoft.MachineLearningServices from version preview/2023-04-01-preview to version 2023-06-01-preview * Updates readme * Updates API version in new specs and examples * MFE 2023-06-01-preview staging (Azure#24051) * Updated mfe.json * Added package example * Updated custom-words.txt * Updated package examples * Added pattern retriction to resource name parameters * Fixed cross-api breaking changes * Fixed cross-api breaking changes * Added descriptions * Added description * Separate workspace rp swagger from mlc (Azure#24249) * separate workspace rp swagger from mlc * add missing parameter * Updated mfe.json descriptions for put 200 responses (Azure#24295) * update EnableNodePublicIp for computeInstance of MLC (Azure#24231) Co-authored-by: Bingchen Li <bingchenli@microsoft.com> * Update workspaceRP swagger with automation result (Azure#24333) * Update workspace rp swagger with automation result rename pe definition to avoid conflict fix update PE name Update connection credential hide armid fix more things Fix enum issue fix polymorphism Update examples Update body name and example fix more issue update response body Fix Revert "file change" This reverts commit 4a1fdccf6eb22e1dda82d3acce8065fae171f422. file change Update swagger fix errors update format add example for connetion list secrets api run prettier * Fixing more issue * revert custom-words * run prettier * Update securityDefinitions * Revert operation id * Update description and summary. * fix prettier issue and add description * remove redundent object definition * fixing swagger issue revert PaginationParameter * Revert back to old file with only reorder for better compare * Revert "Revert back to old file with only reorder for better compare" This reverts commit 8feb7d8. * Revert connection v2 tag issue * Add back delete op for network rule * Add back example for the removed API * Suppress header check caused by old design * fix delete rule in path * Update example error * Update delete rule api and remove suppression * Fixed merge conflicts in custom-words.txt (Azure#24532) --------- Co-authored-by: ZhidaLiu <zhili@microsoft.com> Co-authored-by: libc16 <88697960+libc16@users.noreply.github.com> Co-authored-by: Bingchen Li <bingchenli@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
1 parent e0d03f1 commit ec1bf6c

File tree

247 files changed

+51135
-5
lines changed

Some content is hidden

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

247 files changed

+51135
-5
lines changed

‎custom-words.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,7 @@ granularities
10631063
graphrbac
10641064
graphservice
10651065
greenplum
1066+
groundedness
10661067
groundstation
10671068
groupby
10681069
groupedby

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/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": "2023-06-01-preview",
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/preview/2023-06-01-preview/examples/Compute/createOrUpdate/AmlCompute.json‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
4+
"resourceGroupName": "testrg123",
5+
"workspaceName": "workspaces123",
6+
"computeName": "compute123",
7+
"api-version": "2023-06-01-preview",
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": {
43+
"id": "test-subnet-resource-id"
44+
},
45+
"scaleSettings": {
46+
"maxNodeCount": 1,
47+
"minNodeCount": 0,
48+
"nodeIdleTimeBeforeScaleDown": "PT5M"
49+
},
50+
"remoteLoginPortPublicAccess": "Enabled",
51+
"allocationState": "Resizing",
52+
"allocationStateTransitionTime": "2017-09-27T22:28:08.998Z",
53+
"errors": null,
54+
"currentNodeCount": 0,
55+
"targetNodeCount": 1,
56+
"nodeStateCounts": {
57+
"preparingNodeCount": 0,
58+
"runningNodeCount": 0,
59+
"idleNodeCount": 0,
60+
"unusableNodeCount": 0,
61+
"leavingNodeCount": 0,
62+
"preemptedNodeCount": 0
63+
},
64+
"enableNodePublicIp": true
65+
}
66+
}
67+
}
68+
},
69+
"201": {
70+
"body": {
71+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
72+
"type": "Microsoft.MachineLearningServices/workspaces/computes",
73+
"name": "compute123",
74+
"location": "eastus2",
75+
"properties": {
76+
"description": "some compute",
77+
"computeType": "AmlCompute",
78+
"provisioningState": "Updating"
79+
}
80+
},
81+
"headers": {
82+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
83+
}
84+
}
85+
}
86+
}

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-06-01-preview/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": "2023-06-01-preview",
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/preview/2023-06-01-preview/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": "2023-06-01-preview",
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/preview/2023-06-01-preview/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": "2023-06-01-preview",
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+
}

0 commit comments

Comments
 (0)