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

Jump to bottom

Changed machinelearning swagger for new AMLCompute type #4344

Merged
merged 49 commits into from
Dec 4, 2018
Merged

Changed machinelearning swagger for new AMLCompute type #4344

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6ac9759
Adding new GA version 2018-12-01
Oct 18, 2018
f61a0c8
Changed machinelearning swagger for new AMLCompute for 1RP changes
Oct 18, 2018
1b69bb7
Added Supported VMSize List API
Oct 19, 2018
bc438c8
replacing tabs with spaces
Oct 19, 2018
b23e0d2
removing batchai reference from examples
Oct 19, 2018
31af1c4
renaming example files from batchai to amlcompute
Oct 19, 2018
e372280
missed adding renamed files in previous commit
Oct 19, 2018
d2a824e
Added remaining examples
Oct 19, 2018
4c8bed0
removed tabs
Oct 19, 2018
6ce153e
adding more swagger improvements
Oct 21, 2018
98be0fa
removing resource id
Oct 22, 2018
45caa79
added usage api swagger changes
Oct 23, 2018
9469508
CR feedbacks
Oct 25, 2018
be24ecf
CR feedbacks, examples corrected
Oct 26, 2018
b1b8d6d
autorest fixes
Oct 28, 2018
0b00a35
Adding patchAMLCompute.json
Oct 29, 2018
abd3869
build fix for patch operation
Oct 29, 2018
def8ebf
AML GA Swagger updates: Changed machinelearning swagger for new AMLCo…
Oct 29, 2018
52bbe75
Merge branch 'bai1rp/dec18-curr' of https://github.com/msoni3/azure-r…
Oct 29, 2018
3775a3b
updated api version to 2018-11-19
Nov 2, 2018
4707460
CR feedbacks readonly
Nov 2, 2018
bf5ab42
adding missing computes
dagald Nov 2, 2018
85f366b
removing deprecated api
dagald Nov 2, 2018
d18e788
version change
Nov 2, 2018
eca41c6
changing version
Nov 2, 2018
8a48953
Merge pull request #1 from dagald/bai1rp/dec18-curr
msoni3 Nov 2, 2018
41f8014
make patch compute long running operation
Nov 2, 2018
0c0fae1
Add underlyingResourceAction and isAttachedCompute in
Nov 2, 2018
1ca2b72
Update deleteCompute.json sample
Nov 2, 2018
4f28065
Merge remote-tracking branch 'manoj/bai1rp/dec18-curr' into bai1rp/de…
Nov 2, 2018
3c32237
add enum and x-ms-enum for UnderlyingResourceAction
Nov 2, 2018
b422b94
Update Delete/Detach casing just to be safe (although case doesn't ma…
Nov 2, 2018
d8d5c83
Fixing AmlCompute
Nov 7, 2018
7cf4ece
renaming files
Nov 8, 2018
6930f46
renaming
Nov 8, 2018
81bb42a
Merge pull request #2 from hongjj2013/bai1rp/dec18-curr
msoni3 Nov 8, 2018
5185416
adding properties for aks vnet support
dagald Nov 8, 2018
1d01828
Merge pull request #3 from dagald/bai1rp/dec18-curr
msoni3 Nov 8, 2018
3018bd9
patch swagger update
Nov 9, 2018
f7dff16
Added useraccount settings and list remote login info API for aml com…
Nov 13, 2018
a360436
remove unused param
dagald Nov 13, 2018
4698e7e
Merge branch 'bai1rp/dec18-curr' of https://github.com/msoni3/azure-r…
dagald Nov 13, 2018
1867fbb
list nodes
Nov 13, 2018
1500cb9
swagger build fixes
Nov 14, 2018
94e87fe
Merge pull request #4 from dagald/bai1rp/dec18-curr
msoni3 Nov 14, 2018
440eacd
updated swagger for listnodes response simplification
Nov 14, 2018
256d6b6
Merge branch 'bai1rp/dec18-curr' of https://github.com/msoni3/azure-r…
Nov 14, 2018
2a422e1
rename to user account credentials
Nov 14, 2018
11a4b07
Changing vmPriority and allocationState to match MLC and other conven…
Nov 19, 2018
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
168 changes: 168 additions & 0 deletions ...urce-manager/Microsoft.MachineLearningServices/stable/2018-11-19/examples/ListUsages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
{
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"location": "eastus",
"api-version": "2018-11-19"
},
"responses": {
"200": {
"body": {
"value": [
{
"currentValue": 5,
"limit": 20,
"name": {
"localizedValue": "Clusters",
"value": "Clusters"
},
"unit": "Count"
},
{
"currentValue": 49,
"limit": 600,
"name": {
"localizedValue": "Total Cluster Dedicated Regional vCPUs",
"value": "Total Cluster Dedicated Regional vCPUs"
},
"unit": "Count"
},
{
"currentValue": 1,
"limit": 600,
"name": {
"localizedValue": "Standard D Family Cluster Dedicated vCPUs",
"value": "Standard D Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 600,
"name": {
"localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs",
"value": "Standard Dv2 Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 48,
"limit": 600,
"name": {
"localizedValue": "Standard NC Family Cluster Dedicated vCPUs",
"value": "Standard NC Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs",
"value": "Standard NCv2 Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs",
"value": "Standard NCv3 Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard ND Family Cluster Dedicated vCPUs",
"value": "Standard ND Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 600,
"name": {
"localizedValue": "Standard NV Family Cluster Dedicated vCPUs",
"value": "Standard NV Family Cluster Dedicated vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 150,
"name": {
"localizedValue": "Total Cluster Low Priority Regional vCPUs",
"value": "Total Cluster LowPriority Regional vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 150,
"name": {
"localizedValue": "Standard D Family Cluster Low Priority vCPUs",
"value": "Standard D Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 150,
"name": {
"localizedValue": "Standard Dv2 Family Cluster Low Priority vCPUs",
"value": "Standard Dv2 Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 150,
"name": {
"localizedValue": "Standard NC Family Cluster Low Priority vCPUs",
"value": "Standard NC Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard NCv2 Family Cluster Low Priority vCPUs",
"value": "Standard NCv2 Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard NCv3 Family Cluster Low Priority vCPUs",
"value": "Standard NCv3 Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 0,
"name": {
"localizedValue": "Standard ND Family Cluster Low Priority vCPUs",
"value": "Standard ND Family Cluster LowPriority vCPUs"
},
"unit": "Count"
},
{
"currentValue": 0,
"limit": 150,
"name": {
"localizedValue": "Standard NV Family Cluster Low Priority vCPUs",
"value": "Standard NV Family Cluster LowPriority vCPUs"
},
"unit": "Count"
}
]
}
}
}
}
44 changes: 44 additions & 0 deletions ...r/Microsoft.MachineLearningServices/stable/2018-11-19/examples/createBasicAKSCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2018-11-19",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "AKS"
}
}
},
"responses": {
"200": {
"body": {
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "AKS",
"provisioningState": "Creating"
}
}
},
"201": {
"body": {
"id": "subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "AKS",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
44 changes: 44 additions & 0 deletions ...r/Microsoft.MachineLearningServices/stable/2018-11-19/examples/createBasicAMLCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2018-11-19",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "AmlCompute"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "AmlCompute",
"provisioningState": "Creating"
}
}
},
"201": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "AmlCompute",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
44 changes: 44 additions & 0 deletions ...oft.MachineLearningServices/stable/2018-11-19/examples/createBasicDataFactoryCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2018-11-19",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "DataFactory"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "DataFactory",
"provisioningState": "Creating"
}
}
},
"201": {
"body": {
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute123",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute123",
"location": "eastus",
"properties": {
"computeType": "DataFactory",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
57 changes: 57 additions & 0 deletions ...manager/Microsoft.MachineLearningServices/stable/2018-11-19/examples/createWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "workspace-1234",
"workspaceName": "testworkspace",
"api-version": "2018-11-19",
"parameters": {
"location": "eastus2euap",
"properties": {
"friendlyName": "HelloName",
"description": "test description",
"containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistry",
"keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights",
"storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace",
"name": "testworkspace",
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistry",
"keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights",
"storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount",
"discoveryUrl": "http://example.com",
"creationTime": "2017-03-01T23:14:37.0707808Z",
"friendlyName": "HelloName",
"description": "test description"
}
}
},
"201": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace",
"name": "testworkspace",
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistry",
"keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights",
"storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount",
"discoveryUrl": "http://example.com",
"creationTime": "2017-03-01T23:14:37.0707808Z",
"friendlyName": "HelloName",
"description": "test description"
}
}
}
}
}
18 changes: 18 additions & 0 deletions ...e-manager/Microsoft.MachineLearningServices/stable/2018-11-19/examples/deleteCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2018-11-19"
},
"responses": {
"200": {},
"202": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...",
"Location": "https://management.azure.com/subscriptions/...pathToOperationResult..."
}
}
}
}
12 changes: 12 additions & 0 deletions ...manager/Microsoft.MachineLearningServices/stable/2018-11-19/examples/deleteWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "workspace-1234",
"workspaceName": "testworkspace",
"api-version": "2018-11-19"
},
"responses": {
"200": {},
"204": {}
}
}
Loading