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

Add Batch AI workspace property to machineLearningServices swagger #3910

Merged
merged 4 commits into from
Sep 17, 2018
Merged

Add Batch AI workspace property to machineLearningServices swagger #3910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
185f304
Add BatchAIWorkspace to main swagger and examples
masablemicrosoft Sep 14, 2018
9f1d75e
Fix whitespace
masablemicrosoft Sep 14, 2018
41369f7
Update casing to match swagger definition
masablemicrosoft Sep 17, 2018
59b6b10
Correctly update casing of all usages of batchaiWorkspace
masablemicrosoft Sep 17, 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
3 changes: 3 additions & 0 deletions ...icrosoft.MachineLearningServices/preview/2018-03-01-preview/examples/createWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"properties": {
"friendlyName": "HelloName",
"description": "test description",
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
MattSable marked this conversation as resolved.
Show resolved Hide resolved
"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",
Expand All @@ -24,6 +25,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand All @@ -42,6 +44,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand Down
1 change: 1 addition & 0 deletions ...r/Microsoft.MachineLearningServices/preview/2018-03-01-preview/examples/getWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand Down
2 changes: 2 additions & 0 deletions ...ineLearningServices/preview/2018-03-01-preview/examples/getWorkspacesByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand All @@ -30,6 +31,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistryNew",
"keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkvNew",
"applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights",
Expand Down
2 changes: 2 additions & 0 deletions ...hineLearningServices/preview/2018-03-01-preview/examples/getWorkspacesBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand All @@ -29,6 +30,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistryNew",
"keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkvNew",
"applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights",
Expand Down
1 change: 1 addition & 0 deletions ...icrosoft.MachineLearningServices/preview/2018-03-01-preview/examples/updateWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"type": "Microsoft.MachineLearningServices/workspaces",
"location": "eastus2euap",
"properties": {
"batchaiWorkspace": "/subscriptions/00000000-1111-2222-3333-444444444444resourcegroups/workspace-1234/providers/Microsoft.BatchAI/workspaces/testBatchAIWorkspace",
"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",
Expand Down
4 changes: 4 additions & 0 deletions ...Microsoft.MachineLearningServices/preview/2018-03-01-preview/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,10 @@
"type": "string",
"readOnly": true
},
"batchaiWorkspace": {
"description": "ARM id of the Batch AI workspace associated with this workspace. This cannot be changed once the workspace has been created",
"type": "string"
},
"keyVault": {
"description": "ARM id of the key vault associated with this workspace. This cannot be changed once the workspace has been created",
"type": "string"
Expand Down