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

[Ready To Merge] SSH and Quota changes #6432

Merged
merged 9 commits into from
Aug 23, 2019
Merged

[Ready To Merge] SSH and Quota changes #6432

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0957b1
Merge pull request #1 from Azure/master
akshataP Jun 1, 2019
eeb58f2
Merge pull request #2 from Azure/master
akshataP Jun 21, 2019
b779d41
Version change
Jun 24, 2019
8f0af71
Adding properties for SSH Improvements
Jun 25, 2019
1e3cc93
Correcting naming mistake
Jun 25, 2019
fa59331
Removing null value
Jun 25, 2019
22800a2
Making the property writable by requester
Jun 25, 2019
203c544
Merge pull request #3 from Azure/master
akshataP Aug 21, 2019
a9e6716
Merge branch 'master' into akpati/ssh-property-change
Aug 21, 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
400 changes: 400 additions & 0 deletions ...urce-manager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/ListUsages.json
View file
Open in desktop

Large diffs are not rendered by default.

455 changes: 455 additions & 0 deletions ...nager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/ListVMSizesResult.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions ...ger/Microsoft.MachineLearningServices/stable/2019-06-01/examples/amlComputeListNodes.json
View file
Open in desktop
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-06-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"
}
}
}
}
44 changes: 44 additions & 0 deletions ...r/Microsoft.MachineLearningServices/stable/2019-06-01/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": "2019-06-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..."
}
}
}
}
54 changes: 54 additions & 0 deletions ...r/Microsoft.MachineLearningServices/stable/2019-06-01/examples/createBasicAmlCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-06-01",
"parameters": {
"location": "eastus",
"properties": {
"computeType": "AmlCompute",
"properties": {
"vmSize": "STANDARD_NC6",
"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..."
}
}
}
}
44 changes: 44 additions & 0 deletions ...oft.MachineLearningServices/stable/2019-06-01/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": "2019-06-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..."
}
}
}
}
57 changes: 57 additions & 0 deletions ...manager/Microsoft.MachineLearningServices/stable/2019-06-01/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": "2019-06-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"
}
}
}
}
}
19 changes: 19 additions & 0 deletions ...e-manager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/deleteCompute.json
View file
Open in desktop
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-06-01",
"underlyingResourceAction": "Delete"
},
"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/2019-06-01/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": "2019-06-01"
},
"responses": {
"200": {},
"204": {}
}
}
25 changes: 25 additions & 0 deletions ...e-manager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/getAKSCompute.json
View file
Open in desktop
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-06-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"
}
}
}
}
}
49 changes: 49 additions & 0 deletions ...e-manager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/getAmlCompute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"computeName": "compute123",
"api-version": "2019-06-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": "eastus2",
"properties": {
"description": "some compute",
"computeType": "AmlCompute",
"createdOn": "2017-09-26T22:28:08.327Z",
"provisioningState": "Succeeded",
"properties": {
"vmSize": "STANDARD_NC6",
"vmPriority": "Dedicated",
"subnet": "test-subnet-resource-id",
"scaleSettings": {
"maxNodeCount": 1,
"minNodeCount": 0,
"nodeIdleTimeBeforeScaleDown": "PT5M"
},
"remoteLoginPortPublicAccess": "Enabled",
"allocationState": "Resizing",
"allocationStateTransitionTime": "2017-09-27T22:28:08.998Z",
"errors": null,
"currentNodeCount": 0,
"targetNodeCount": 1,
"nodeStateCounts": {
"preparingNodeCount": 0,
"runningNodeCount": 0,
"idleNodeCount": 0,
"unusableNodeCount": 0,
"leavingNodeCount": 0,
"preemptedNodeCount": 0
}
}
}
}
}
}
}
41 changes: 41 additions & 0 deletions ...rce-manager/Microsoft.MachineLearningServices/stable/2019-06-01/examples/getComputes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"parameters": {
"subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345",
"resourceGroupName": "testrg123",
"workspaceName": "workspaces123",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"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"
}
},
{
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/workspaces/workspaces123/computes/compute1234",
"type": "Microsoft.MachineLearningServices/workspaces/computes",
"name": "compute1234",
"location": "eastus",
"properties": {
"description": "some compute",
"resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute1234-56826-c9b00420020b2",
"computeType": "AKS",
"provisioningState": "Succeeded"
}
}
],
"nextLink": "nextLink"
}
}
}
}
Loading