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.

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

[READY FOR DESIGN REVIEW] -> MachineLearningServices: Adding new API version and definition for AmlInstance compute type #7323

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5996396
Adding version 2019-11-01
vhamine Sep 25, 2019
cff591b
Adding definition for AmlInstance compute type
vhamine Sep 25, 2019
9c97737
Modifying examples to use the new API version 2019-11-01
vhamine Sep 25, 2019
0dd6452
Changing readme files to reflect the new API version
vhamine Sep 25, 2019
7c540de
Bug fixes
vhamine Sep 25, 2019
bb0c6f6
Bug fix: Adding properties to AmlInstance definitions
vhamine Sep 26, 2019
7e539e7
Bug fix: Adding missing properties in all object types
vhamine Sep 26, 2019
1dc7da5
Bug fix: Adding missing properties in startupScript object
vhamine Sep 26, 2019
a49c4ae
Adding POST APIs for start, stop, and restart operations
vhamine Sep 26, 2019
7e83290
Adding state, lastOperation, lastOperationStatus to AmlInstance compu…
vhamine Sep 26, 2019
385cd5f
Adding examples for start, stop, restart post actions
vhamine Sep 26, 2019
4fa488e
Adding support for Windows OS in AmlCompute compute type
vhamine Sep 26, 2019
c795cc5
Refactoring AmlInstance compute specific properties into separate def…
vhamine Sep 26, 2019
de6aebc
Adding AmlInstance compute updatable properties to ClusterUpdatePrope…
vhamine Sep 26, 2019
9df4d82
Adding examples for creating AmlInstance compute
vhamine Sep 26, 2019
e16d41e
Adding example for get AmlInstance
vhamine Sep 27, 2019
ce2f9b2
Referring to get AmlInstance example in swagger
vhamine Sep 27, 2019
11f66c4
Adding scriptLogLocation as readOnly to custom scripts and updating e…
vhamine Sep 27, 2019
5b9bb9a
Fixing a bug in latest update
vhamine Sep 27, 2019
18f28ec
Adding connectivityEndpoints and createdBy as readOnly properties to …
vhamine Oct 1, 2019
0ed4a6f
Removing lastOperation and lastOperationStatus properties from AmlIns…
vhamine Oct 1, 2019
492e87e
Adding updateVersion property as string to available SDK updates in A…
vhamine Oct 1, 2019
9d38cc1
Removing scriptLogLocation from AmlInstance custom script properties
vhamine Oct 1, 2019
3c4687b
Addressing code review comments
vhamine Oct 1, 2019
f0bdbde
Adding adminUserName as readOnly property to AmlInstanceSshSettings
vhamine Oct 1, 2019
fe1846c
Renaming AmlInstance to ComputeInstance
vhamine Oct 4, 2019
a39326d
Adding instanceSharing property to ComputeInstance
vhamine Oct 4, 2019
bc06bc8
Internal review feedback: Adding sshPort to sshSettings and separatin…
vhamine Oct 9, 2019
da577a8
Fixing SpellCheck error
vhamine Oct 9, 2019
eb66cb9
Keeping minimal set of properties (for Ignite) in ComputeInstance spec
vhamine Oct 9, 2019
4e3a7bf
Renaming virtualMachineImageId to virtualMachineImage
vhamine Oct 10, 2019
220de67
Addressing ARM review feedback
vhamine Oct 11, 2019
5ad61b9
Making Linux the default OS type in AmlCompute
vhamine Oct 11, 2019
2678804
Updating the ComputeInstance state list
ramagott Oct 28, 2019
0abfa64
Updating return type in examples for CI start, stop and restart opera…
ramagott Oct 28, 2019
9a2ab25
Fixing braces
ramagott Oct 29, 2019
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01"
},
"responses": {
"200": {
"body": {
"computeType": "AmlCompute",
"nodes": [
{
"nodeId": "tvm-3601533753_1-20170719t162906z",
"privateIpAddress": "13.84.190.124",
"publicIpAddress": "13.84.190.134",
"port": 50000,
"nodeState": "running",
"runId": "2f378a44-38f2-443a-9f0d-9909d0b47890"
},
{
"nodeId": "tvm-3601533753_2-20170719t162906z",
"privateIpAddress": "13.84.190.124",
"publicIpAddress": "13.84.190.134",
"port": 50001,
"nodeState": "idle"
}
],
"nextLink": "nextLink"
}
}
}
}
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": "2019-11-01",
"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..."
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "AmlCompute",
"properties": {
"vmSize": "STANDARD_NC6",
"osType": "Linux",
"vmPriority": "Dedicated",
"scaleSettings": {
"maxNodeCount": 1,
"minNodeCount": 0,
"nodeIdleTimeBeforeScaleDown": "PT5M"
},
"remoteLoginPortPublicAccess": "NotSpecified"
}
}
}
},
"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..."
}
}
}
}
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": "2019-11-01",
"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..."
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "ComputeInstance",
"properties": {
"vmSize": "STANDARD_NC6",
"subnet": "test-subnet-resource-id",
"applicationSharingPolicy": "Personal",
vhamine marked this conversation as resolved.
Show resolved Hide resolved
"sshSettings": {
"sshPublicAccess": "Disabled"
}
}
}
}
},
"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": "ComputeInstance",
"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": "ComputeInstance",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "ComputeInstance",
"properties": {
"vmSize": "STANDARD_NC6"
}
}
}
},
"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": "ComputeInstance",
"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": "ComputeInstance",
"provisioningState": "Creating"
}
},
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..."
}
}
}
}
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": "2019-11-01",
"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"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01",
"underlyingResourceAction": "Delete"
},
"responses": {
"200": {},
"202": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus...",
"Location": "https://management.azure.com/subscriptions/...pathToOperationResult..."
}
}
}
}
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": "2019-11-01"
},
"responses": {
"200": {},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-11-01"
},
"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": {
"description": "some compute",
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2",
"computeType": "AKS",
"provisioningState": "Succeeded"
}
}
}
}
}
Loading