From 5996396973c3d574fa4080c6feb6cb42a18999c4 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 14:15:57 -0700 Subject: [PATCH 01/36] Adding version 2019-11-01 Adding new version 2019-11-01 --- .../2019-11-01/examples/ListUsages.json | 400 +++ .../examples/ListVMSizesResult.json | 499 ++++ .../ListWorkspaceQuotasByVMFamily.json | 415 +++ .../examples/amlComputeListNodes.json | 34 + .../examples/createBasicAKSCompute.json | 44 + .../examples/createBasicAmlCompute.json | 54 + .../createBasicDataFactoryCompute.json | 44 + .../2019-11-01/examples/createWorkspace.json | 57 + .../2019-11-01/examples/deleteCompute.json | 19 + .../2019-11-01/examples/deleteWorkspace.json | 12 + .../2019-11-01/examples/getAKSCompute.json | 25 + .../2019-11-01/examples/getAmlCompute.json | 49 + .../2019-11-01/examples/getComputes.json | 41 + .../2019-11-01/examples/getWorkspace.json | 28 + .../getWorkspacesByResourceGroup.json | 48 + .../examples/getWorkspacesBySubscription.json | 47 + .../examples/listKeysAKSCompute.json | 19 + .../examples/listWorkspaceKeys.json | 31 + .../2019-11-01/examples/patchAmlCompute.json | 36 + .../examples/resyncWorkspaceKeys.json | 11 + .../2019-11-01/examples/updateAKSCompute.json | 54 + .../2019-11-01/examples/updateAmlCompute.json | 57 + .../2019-11-01/examples/updateQuota.json | 45 + .../2019-11-01/examples/updateWorkspace.json | 34 + .../2019-11-01/machineLearningServices.json | 2569 +++++++++++++++++ 25 files changed, 4672 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json new file mode 100644 index 000000000000..d8d3fbe121f8 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json @@ -0,0 +1,400 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "location": "eastus", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages", + "type": "Microsoft.MachineLearningServices/totalCores/usages", + "currentValue": 7, + "limit": 100, + "name": { + "localizedValue": "Clusters", + "value": "Clusters" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages", + "type": "Microsoft.MachineLearningServices/dedicatedCores/usages", + "currentValue": 14, + "limit": 24, + "name": { + "localizedValue": "Total Cluster Dedicated Regional vCPUs", + "value": "Total Cluster Dedicated Regional vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_D_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 48, + "name": { + "localizedValue": "Standard D Family Cluster Dedicated vCPUs", + "value": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 2, + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/usages/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/usages", + "currentValue": 2, + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/computes/demo_cluster1_dsv2/usages/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/computes/usages", + "currentValue": 2, + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/computes/demo_cluster2_dsv2/usages/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/computes/usages", + "currentValue": 0, + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_Dv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 24, + "name": { + "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs", + "value": "Standard Dv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_FSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 24, + "name": { + "value": "Standard FSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard FSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 12, + "limit": 24, + "name": { + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs", + "value": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/usages/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/usages", + "currentValue": 6, + "limit": 24, + "name": { + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs", + "value": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/computes/demo_cluster1_nc/usages/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/computes/usages", + "currentValue": 6, + "limit": 24, + "name": { + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs", + "value": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/usages/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/usages", + "currentValue": 6, + "limit": 24, + "name": { + "value": "Standard NC Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/computes/demo_cluser1_nc/usages/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/computes/usages", + "currentValue": 6, + "limit": 24, + "name": { + "value": "Standard NC Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NCv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 0, + "name": { + "localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs", + "value": "Standard NCv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NCv3_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 0, + "name": { + "localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs", + "value": "Standard NCv3 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_ND_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 0, + "name": { + "localizedValue": "Standard ND Family Cluster Dedicated vCPUs", + "value": "Standard ND Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NDv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 0, + "name": { + "value": "Standard NDv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NDv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NV_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": 24, + "name": { + "localizedValue": "Standard NV Family Cluster Dedicated vCPUs", + "value": "Standard NV Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages", + "type": "Microsoft.MachineLearningServices/lowPriorityCores/usages", + "currentValue": 18, + "limit": 50, + "name": { + "localizedValue": "Total Cluster LowPriority Regional vCPUs", + "value": "Total Cluster LowPriority Regional vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_D_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "value": "Standard D Family Cluster LowPriority vCPUs", + "localizedValue": "Standard D Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_DSv2_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard DSv2 Family Cluster LowPriority vCPUs", + "value": "Standard DSv2 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_Dv2_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard Dv2 Family Cluster LowPriority vCPUs", + "value": "Standard Dv2 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_FSv2_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard FSv2 Family Cluster LowPriority vCPUs", + "value": "Standard FSv2 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 18, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/usages", + "currentValue": 6, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/computes/demo_cluster1_lowPriority_nc/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/computes/usages", + "currentValue": 6, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/usages", + "currentValue": 12, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/computes/demo_cluster2_lowPriority_nc/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/computes/usages", + "currentValue": 6, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/computes/demo_cluster3_lowPriority_nc/usages/Standard_NC_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/workspace/computes/usages", + "currentValue": 6, + "limit": -1, + "name": { + "localizedValue": "Standard NC Family Cluster LowPriority vCPUs", + "value": "Standard NC Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NCv2_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard NCv2 Family Cluster LowPriority vCPUs", + "value": "Standard NCv2 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NCv3_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard NCv3 Family Cluster LowPriority vCPUs", + "value": "Standard NCv3 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_ND_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard ND Family Cluster LowPriority vCPUs", + "value": "Standard ND Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NDv2_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard NDv2 Family Cluster LowPriority vCPUs", + "value": "Standard NDv2 Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/usages/Standard_NV_Family_Cluster_LowPriority_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/usages", + "currentValue": 0, + "limit": -1, + "name": { + "localizedValue": "Standard NV Family Cluster LowPriority vCPUs", + "value": "Standard NV Family Cluster LowPriority vCPUs" + }, + "unit": "Count" + } + ] + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json new file mode 100644 index 000000000000..cef0341ad8cb --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json @@ -0,0 +1,499 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "api-version": "2019-06-01", + "location": "eastus" + }, + "responses": { + "200": { + "body": { + "amlCompute": [ + { + "name": "Standard_F2s_v2", + "family": "standardFSv2Family", + "vCPUs": 2, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 16384, + "memoryGB": 4.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F4s_v2", + "family": "standardFSv2Family", + "vCPUs": 4, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 32768, + "memoryGB": 8.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F8s_v2", + "family": "standardFSv2Family", + "vCPUs": 8, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 65536, + "memoryGB": 16.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F16s_v2", + "family": "standardFSv2Family", + "vCPUs": 16, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 131072, + "memoryGB": 32.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F32s_v2", + "family": "standardFSv2Family", + "vCPUs": 32, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 262144, + "memoryGB": 64.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F64s_v2", + "family": "standardFSv2Family", + "vCPUs": 64, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 524288, + "memoryGB": 128.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_F72s_v2", + "family": "standardFSv2Family", + "vCPUs": 72, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 589824, + "memoryGB": 144.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_D1_v2", + "family": "standardDv2Family", + "vCPUs": 1, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 51200, + "memoryGB": 3.5, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D2_v2", + "family": "standardDv2Family", + "vCPUs": 2, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 102400, + "memoryGB": 7.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D3_v2", + "family": "standardDv2Family", + "vCPUs": 4, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 204800, + "memoryGB": 14.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D4_v2", + "family": "standardDv2Family", + "vCPUs": 8, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 409600, + "memoryGB": 28.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D11_v2", + "family": "standardDv2Family", + "vCPUs": 2, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 102400, + "memoryGB": 14.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D12_v2", + "family": "standardDv2Family", + "vCPUs": 4, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 204800, + "memoryGB": 28.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D13_v2", + "family": "standardDv2Family", + "vCPUs": 8, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 409600, + "memoryGB": 56.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_D14_v2", + "family": "standardDv2Family", + "vCPUs": 16, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 819200, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_DS1_v2", + "family": "standardDSv2Family", + "vCPUs": 1, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 7168, + "memoryGB": 3.5, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS2_v2", + "family": "standardDSv2Family", + "vCPUs": 2, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 14336, + "memoryGB": 7.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS3_v2", + "family": "standardDSv2Family", + "vCPUs": 4, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 28672, + "memoryGB": 14.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS4_v2", + "family": "standardDSv2Family", + "vCPUs": 8, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 57344, + "memoryGB": 28.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS5_v2", + "family": "standardDSv2Family", + "vCPUs": 16, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 114688, + "memoryGB": 56.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS11_v2", + "family": "standardDSv2Family", + "vCPUs": 2, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 28672, + "memoryGB": 14.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS12_v2", + "family": "standardDSv2Family", + "vCPUs": 4, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 57344, + "memoryGB": 28.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS13_v2", + "family": "standardDSv2Family", + "vCPUs": 8, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 114688, + "memoryGB": 56.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS14_v2", + "family": "standardDSv2Family", + "vCPUs": 16, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 229376, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_DS15_v2", + "family": "standardDSv2Family", + "vCPUs": 20, + "gpus": 0, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 286720, + "memoryGB": 140.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC6s_v2", + "family": "standardNCSv2Family", + "vCPUs": 6, + "gpus": 1, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 344064, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC12s_v2", + "family": "standardNCSv2Family", + "vCPUs": 12, + "gpus": 2, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 688128, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC24rs_v2", + "family": "standardNCSv2Family", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC24s_v2", + "family": "standardNCSv2Family", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC6s_v3", + "family": "standardNCSv3Family", + "vCPUs": 6, + "gpus": 1, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 344064, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC12s_v3", + "family": "standardNCSv3Family", + "vCPUs": 12, + "gpus": 2, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 688128, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC24rs_v3", + "family": "standardNCSv3Family", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC24s_v3", + "family": "standardNCSv3Family", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_NC6", + "family": "standardNCFamily", + "vCPUs": 6, + "gpus": 1, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 389120, + "memoryGB": 56.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NC12", + "family": "standardNCFamily", + "vCPUs": 12, + "gpus": 2, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 696320, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NC24", + "family": "standardNCFamily", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1474560, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NC24r", + "family": "standardNCFamily", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1474560, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NV6", + "family": "standardNVFamily", + "vCPUs": 6, + "gpus": 1, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 389120, + "memoryGB": 56.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NV12", + "family": "standardNVFamily", + "vCPUs": 12, + "gpus": 2, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 696320, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_NV24", + "family": "standardNVFamily", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1474560, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": false + }, + { + "name": "Standard_ND6s", + "family": "standardNDSFamily", + "vCPUs": 6, + "gpus": 1, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 344064, + "memoryGB": 112.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_ND12s", + "family": "standardNDSFamily", + "vCPUs": 12, + "gpus": 2, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 688128, + "memoryGB": 224.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_ND24rs", + "family": "standardNDSFamily", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + }, + { + "name": "Standard_ND24s", + "family": "standardNDSFamily", + "vCPUs": 24, + "gpus": 4, + "osVhdSizeMB": 1047552, + "maxResourceVolumeMB": 1376256, + "memoryGB": 448.0, + "lowPriorityCapable": true, + "premiumIO": true + } + ] + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json new file mode 100644 index 000000000000..2f32eddbc799 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json @@ -0,0 +1,415 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "location": "eastus", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_D_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 48, + "name": { + "localizedValue": "Standard D Family Cluster Dedicated vCPUs", + "value": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_D_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 12, + "name": { + "value": "Standard D Family Cluster Dedicated vCPUs", + "localizedValue": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_D_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 12, + "name": { + "value": "Standard D Family Cluster Dedicated vCPUs", + "localizedValue": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_D_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard D Family Cluster Dedicated vCPUs", + "localizedValue": "Standard D Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quota", + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 12, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 12, + "name": { + "value": "Standard DSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard DSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_Dv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 24, + "name": { + "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs", + "value": "Standard Dv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_Dv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard Dv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_Dv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard Dv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_Dv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard Dv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard Dv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_FSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 24, + "name": { + "value": "Standard FSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard FSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_FSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard FSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard FSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_FSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard FSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard FSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_FSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 12, + "name": { + "value": "Standard FSv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard FSv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 24, + "name": { + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs", + "value": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NC Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NC Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_NC_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NC Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NC Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_NCv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 0, + "name": { + "localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs", + "value": "Standard NCv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_NCv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_NCv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_NCv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_NCv3_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 0, + "name": { + "localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs", + "value": "Standard NCv3 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_NCv3_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv3 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_NCv3_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv3 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_NCv3_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NCv3 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NCv3 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_ND_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 0, + "name": { + "localizedValue": "Standard ND Family Cluster Dedicated vCPUs", + "value": "Standard ND Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_ND_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard ND Family Cluster Dedicated vCPUs", + "localizedValue": "Standard ND Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_ND_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard ND Family Cluster Dedicated vCPUs", + "localizedValue": "Standard ND Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_ND_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard ND Family Cluster Dedicated vCPUs", + "localizedValue": "Standard ND Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_NDv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 0, + "name": { + "value": "Standard NDv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NDv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_NDv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NDv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NDv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_NDv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NDv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NDv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_NDv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 0, + "name": { + "value": "Standard NDv2 Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NDv2 Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/quotas/Standard_NV_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/vmFamily/quotas", + "limit": 24, + "name": { + "localizedValue": "Standard NV Family Cluster Dedicated vCPUs", + "value": "Standard NV Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_NV_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NV Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NV Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_NV_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NV Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NV Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace3/quotas/Standard_NV_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 24, + "name": { + "value": "Standard NV Family Cluster Dedicated vCPUs", + "localizedValue": "Standard NV Family Cluster Dedicated vCPUs" + }, + "unit": "Count" + } + ] + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json new file mode 100644 index 000000000000..8827193d719b --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json @@ -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" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json new file mode 100644 index 000000000000..06801ab73b97 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json @@ -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..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json new file mode 100644 index 000000000000..399e7bfe1451 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json @@ -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..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json new file mode 100644 index 000000000000..7d3feaff19f6 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json @@ -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..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json new file mode 100644 index 000000000000..79aec9534278 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json @@ -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" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json new file mode 100644 index 000000000000..446dcaf34d24 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json @@ -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..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json new file mode 100644 index 000000000000..7c045e6ba190 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "workspace-1234", + "workspaceName": "testworkspace", + "api-version": "2019-06-01" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json new file mode 100644 index 000000000000..d653a52f7bd1 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json @@ -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" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json new file mode 100644 index 000000000000..2e4d00ec6740 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json @@ -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 + } + } + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json new file mode 100644 index 000000000000..1e994c869ebe --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json @@ -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" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json new file mode 100644 index 000000000000..f7c0ccdd6f1b --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json @@ -0,0 +1,28 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "workspace-1234", + "workspaceName": "testworkspace", + "api-version": "2019-06-01" + }, + "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" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json new file mode 100644 index 000000000000..7d9b3c65734b --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "workspace-1234", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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" + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.MachineLearningServices/workspaces/testworkspace1", + "name": "testworkspace1", + "type": "Microsoft.MachineLearningServices/workspaces", + "location": "eastus2euap", + "properties": { + "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", + "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccountOld", + "discoveryUrl": "http://example.com", + "creationTime": "2017-03-01T23:14:37.0707808Z", + "friendlyName": "HelloName 1", + "description": "test description" + } + } + ], + "nextLink": "nextLink" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json new file mode 100644 index 000000000000..3180aedbc830 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "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" + } + }, + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-5678/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/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", + "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccountOld", + "discoveryUrl": "http://example.com", + "creationTime": "2017-03-01T23:14:37.0707808Z", + "friendlyName": "HelloName", + "description": "test description" + } + } + ], + "nextLink": "nextLink" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json new file mode 100644 index 000000000000..3675bf0dcd45 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "computeType": "AKS", + "userKubeConfig": "user kube config...", + "adminKubeConfig": "admin kube config...", + "imagePullSecretName": "the image pull secret name" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json new file mode 100644 index 000000000000..2e08fa2d657f --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "api-version": "2019-06-01" + }, + "responses": { + "200": { + "body": { + "userStorageKey": "r5rKCJ018TLk+bdAi/9YaVzgcQ0nkLsUqGyUN03KsdCFtqG0SjFGPV8+vT1frWqkvBL0bGoPpLc1BlZSSaZmOA==", + "userStorageResourceId": "/subscriptions/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee/resourceGroups/ragargeastus2euap/providers/Microsoft.Storage/storageAccounts/testdemoworkazashomr", + "appInsightsInstrumentationKey": null, + "containerRegistryCredentials": { + "location": null, + "username": "testdemoworkjmjmeykp", + "passwords": [ + { + "name": "password", + "value": "vBvVhYgAGtUSewVCUv3w95p4/q5Yrsnw" + }, + { + "name": "password2", + "value": "0KARRQoQHSUq1yViPWg7YFernOS=Ic/t" + } + ] + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json new file mode 100644 index 000000000000..d374e4f27709 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json @@ -0,0 +1,36 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2019-06-01", + "parameters": { + "properties": { + "scaleSettings": { + "maxNodeCount": 4, + "minNodeCount": 4, + "nodeIdleTimeBeforeScaleDown": "PT5M" + } + } + } + }, + "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", + "provisioningState": "Updating" + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json new file mode 100644 index 000000000000..9f324f33c347 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "api-version": "2019-06-01" + }, + "responses": { + "200": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json new file mode 100644 index 000000000000..06d4d48cc9d0 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2019-06-01", + "parameters": { + "id": "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", + "properties": { + "agentCount": 4 + } + } + } + }, + "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": "Updating" + } + } + }, + "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": { + "description": "some compute", + "resourceId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/testrg123/providers/Microsoft.ContainerService/managedClusters/compute123-56826-c9b00420020b2", + "computeType": "AKS", + "provisioningState": "Updating" + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json new file mode 100644 index 000000000000..e382eaaf4291 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json @@ -0,0 +1,57 @@ +{ + "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": { + "description": "some compute", + "computeType": "AmlCompute", + "properties": { + "scaleSettings": { + "maxNodeCount": 4, + "minNodeCount": 4, + "nodeIdleTimeBeforeScaleDown": "PT5M" + } + } + } + } + } + }, + "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", + "provisioningState": "Updating" + } + } + }, + "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": "eastus2", + "properties": { + "description": "some compute", + "computeType": "AmlCompute", + "provisioningState": "Updating" + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json new file mode 100644 index 000000000000..a1cf4459b7bf --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "location": "eastus", + "api-version": "2019-06-01", + "parameters": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 100, + "unit": "Count" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 200, + "unit": "Count" + } + ] + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace1/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 100, + "unit": "Count", + "status": "Success" + }, + { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/demo_workspace2/quotas/Standard_DSv2_Family_Cluster_Dedicated_vCPUs", + "type": "Microsoft.MachineLearningServices/workspaces/quotas", + "limit": 200, + "unit": "Count", + "status": "Success" + } + ] + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json new file mode 100644 index 000000000000..75473d19db4f --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "workspace-1234", + "workspaceName": "testworkspace", + "api-version": "2019-06-01", + "parameters": { + "properties": { + "friendlyName": "New friendly name", + "description": "new description" + } + } + }, + "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": "New friendly name", + "description": "new description" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json new file mode 100644 index 000000000000..51cdfcd77548 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -0,0 +1,2569 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Machine Learning Workspaces", + "description": "These APIs allow end users to operate on Azure Machine Learning Workspace resources.", + "version": "2019-11-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/providers/Microsoft.MachineLearningServices/operations": { + "get": { + "tags": [ + "Operation" + ], + "description": "Lists all of the available Azure Machine Learning Workspaces REST API operations.", + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}": { + "get": { + "tags": [ + "Workspaces" + ], + "description": "Gets the properties of the specified machine learning workspace.", + "operationId": "Workspaces_Get", + "x-ms-examples": { + "Get Workspace": { + "$ref": "./examples/getWorkspace.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/Workspace" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "put": { + "tags": [ + "Workspaces" + ], + "description": "Creates or updates a workspace with the specified parameters.", + "operationId": "Workspaces_CreateOrUpdate", + "x-ms-examples": { + "Create Workspace": { + "$ref": "./examples/createWorkspace.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The parameters for creating or updating a machine learning workspace.", + "required": true, + "schema": { + "$ref": "#/definitions/Workspace" + } + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/Workspace" + } + }, + "201": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/Workspace" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "delete": { + "tags": [ + "Workspaces" + ], + "description": "Deletes a machine learning workspace.", + "operationId": "Workspaces_Delete", + "x-ms-examples": { + "Delete Workspace": { + "$ref": "./examples/deleteWorkspace.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly." + }, + "204": { + "description": "The machine learning workspace does not exist in the subscription." + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "patch": { + "tags": [ + "Workspaces" + ], + "description": "Updates a machine learning workspace with the specified parameters.", + "operationId": "Workspaces_Update", + "x-ms-examples": { + "Update Workspace": { + "$ref": "./examples/updateWorkspace.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "name": "parameters", + "in": "body", + "description": "The parameters for updating a machine learning workspace.", + "required": true, + "schema": { + "$ref": "#/definitions/WorkspaceUpdateParameters" + } + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/Workspace" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces": { + "get": { + "tags": [ + "Workspaces" + ], + "description": "Lists all the available machine learning workspaces under the specified resource group.", + "operationId": "Workspaces_ListByResourceGroup", + "x-ms-examples": { + "Get Workspaces by Resource Group": { + "$ref": "./examples/getWorkspacesByResourceGroup.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/PaginationParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/WorkspaceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/listKeys": { + "post": { + "tags": [ + "Workspaces" + ], + "description": "Lists all the keys associated with this workspace. This includes keys for the storage account, app insights and password for container registry", + "operationId": "Workspaces_ListKeys", + "x-ms-examples": { + "List Workspace Keys": { + "$ref": "./examples/listWorkspaceKeys.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/ListWorkspaceKeysResult" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/resyncKeys": { + "post": { + "tags": [ + "Workspaces" + ], + "description": "Resync all the keys associated with this workspace. This includes keys for the storage account, app insights and password for container registry", + "operationId": "Workspaces_ResyncKeys", + "x-ms-examples": { + "Resync Workspace Keys": { + "$ref": "./examples/resyncWorkspaceKeys.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly." + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/usages": { + "get": { + "tags": [ + "Usage" + ], + "operationId": "Usages_List", + "description": "Gets the current usage information as well as limits for AML resources for given subscription and location.", + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/ExpandChildrenParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The location for which resource usage is queried.", + "pattern": "^[-\\w\\._]+$" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ListUsagesResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List Usages": { + "$ref": "./examples/ListUsages.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/vmSizes": { + "get": { + "tags": [ + "VirtualMachineSizes" + ], + "operationId": "VirtualMachineSizes_List", + "description": "Returns supported VM Sizes in a location", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The location upon which virtual-machine-sizes is queried.", + "pattern": "^[-\\w\\._]+$" + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/VirtualMachineSizeListResult" + } + } + }, + "x-ms-examples": { + "List VM Sizes": { + "$ref": "./examples/ListVMSizesResult.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/updateQuotas": { + "post": { + "tags": [ + "Quota" + ], + "operationId": "Quotas_Update", + "description": "Update quota for each VM family in workspace.", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The location for update quota is queried.", + "pattern": "^[-\\w\\._]+$" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/QuotaUpdateParameters" + }, + "description": "Quota update parameters." + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "The operation was successful.", + "schema": { + "$ref": "#/definitions/UpdateWorkspaceQuotasResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + }, + "x-ms-examples": { + "update quotas": { + "$ref": "./examples/updateQuota.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/Quotas": { + "get": { + "tags": [ + "Quota" + ], + "operationId": "Quotas_List", + "description": "Gets the currently assigned Workspace Quotas based on VMFamily.", + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "The location for which resource usage is queried.", + "pattern": "^[-\\w\\._]+$" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ListWorkspaceQuotas" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "List workspace quotas by VMFamily": { + "$ref": "./examples/ListWorkspaceQuotasByVMFamily.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces": { + "get": { + "tags": [ + "Workspaces" + ], + "description": "Lists all the available machine learning workspaces under the specified subscription.", + "operationId": "Workspaces_ListBySubscription", + "x-ms-examples": { + "Get Workspaces by subscription": { + "$ref": "./examples/getWorkspacesBySubscription.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/PaginationParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly.", + "schema": { + "$ref": "#/definitions/WorkspaceListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes": { + "get": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "operationId": "MachineLearningCompute_ListByWorkspace", + "description": "Gets computes in specified workspace.", + "x-ms-examples": { + "Get Computes": { + "$ref": "./examples/getComputes.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/PaginationParameter" + } + ], + "responses": { + "200": { + "description": "The response includes a paginated array of Machine Learning computes and a URI to the next set of results, if any. For the more information the limits of the number of items in a resource group, see https://azure.microsoft.com/en-us/documentation/articles/azure-subscription-service-limits/.", + "schema": { + "$ref": "#/definitions/PaginatedComputeResourcesList" + } + }, + "default": { + "description": "Error response describing why the request failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}": { + "get": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Get", + "description": "Gets compute definition by its name. Any secrets (storage keys, service credentials, etc) are not returned - use 'keys' nested resource to get them.", + "x-ms-examples": { + "Get a AKS Compute": { + "$ref": "./examples/getAKSCompute.json" + }, + "Get a AML Compute": { + "$ref": "./examples/getAmlCompute.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the request failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "put": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_CreateOrUpdate", + "description": "Creates or updates compute. This call will overwrite a compute if it exists. This is a nonrecoverable operation. If your intent is to create a new compute, do a GET first to verify that it does not exist yet.", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Create a AML Compute": { + "$ref": "./examples/createBasicAmlCompute.json" + }, + "Create AKS Compute": { + "$ref": "./examples/createBasicAKSCompute.json" + }, + "Create a DataFactory Compute": { + "$ref": "./examples/createBasicDataFactoryCompute.json" + }, + "Update a AML Compute": { + "$ref": "./examples/updateAmlCompute.json" + }, + "Update a AKS Compute": { + "$ref": "./examples/updateAKSCompute.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/ComputeDefinitionParameter" + } + ], + "responses": { + "200": { + "description": "Compute creation or update initiated.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "201": { + "description": "Compute creation or update initiated.", + "headers": { + "Azure-AsyncOperation": { + "description": "URI to poll for asynchronous operation status.", + "type": "string" + } + }, + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the request failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "patch": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Update", + "description": "Updates properties of a compute. This call will overwrite a compute if it exists. This is a nonrecoverable operation.", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Update a AmlCompute Compute": { + "$ref": "./examples/patchAmlCompute.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ClusterUpdateParameters" + }, + "description": "Additional parameters for cluster update." + } + ], + "responses": { + "200": { + "description": "Compute update initiated.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the request failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + }, + "delete": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Delete", + "description": "Deletes specified Machine Learning compute.", + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete Compute": { + "$ref": "./examples/deleteCompute.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + }, + { + "$ref": "#/parameters/UnderlyingResourceActionParameter" + } + ], + "responses": { + "200": { + "description": "The request was successful; the request was well-formed and received properly." + }, + "202": { + "description": "Compute deletion initiated.", + "headers": { + "Azure-AsyncOperation": { + "description": "URI to poll for asynchronous operation status.", + "type": "string" + }, + "Location": { + "description": "URI to poll for asynchronous operation result.", + "type": "string" + } + } + }, + "default": { + "description": "Error response describing why the request failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/listNodes": { + "post": { + "tags": [ + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_ListNodes", + "description": "Get the details (e.g IP address, port etc) of all the compute nodes in the compute.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "The operation was successful. The response contains the list of IP addresses.", + "schema": { + "$ref": "#/definitions/AmlComputeNodesInformation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + }, + "x-ms-examples": { + "Get compute nodes information for a compute": { + "$ref": "./examples/amlComputeListNodes.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/listKeys": { + "post": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_ListKeys", + "description": "Gets secrets related to Machine Learning compute (storage keys, service credentials, etc).", + "x-ms-examples": { + "List AKS Compute Keys": { + "$ref": "./examples/listKeysAKSCompute.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success.", + "schema": { + "$ref": "#/definitions/ComputeSecrets" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "description": "Azure subscription identifier.", + "in": "path", + "type": "string", + "required": true + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "description": "Name of the resource group in which workspace is located.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "WorkspaceNameParameter": { + "name": "workspaceName", + "description": "Name of Azure Machine Learning workspace.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "ComputeNameParameter": { + "name": "computeName", + "description": "Name of the Azure Machine Learning compute.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "AsyncOperationIdParameter": { + "name": "asyncOperationId", + "description": "Identifier of an asynchronous Azure Machine Learning compute operation.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "LocationParameter": { + "name": "location", + "description": "The name of the Azure location/region.", + "in": "path", + "type": "string", + "required": true, + "x-ms-parameter-location": "method" + }, + "APIVersionParameter": { + "in": "query", + "name": "api-version", + "type": "string", + "description": "Version of Azure Machine Learning resource provider API.", + "required": true + }, + "ExpandChildrenParameter": { + "in": "query", + "name": "expandChildren", + "type": "string", + "description": "Specifies if detailed usages of child resources are required.", + "required": false, + "x-ms-parameter-location": "method" + }, + "PaginationParameter": { + "in": "query", + "name": "$skiptoken", + "type": "string", + "description": "Continuation token for pagination.", + "required": false, + "x-ms-parameter-location": "method" + }, + "ComputeDefinitionParameter": { + "in": "body", + "name": "parameters", + "description": "Payload with Machine Learning compute definition.", + "required": true, + "schema": { + "$ref": "#/definitions/ComputeResource" + }, + "x-ms-parameter-location": "method" + }, + "ComputeTypeParameter": { + "in": "query", + "name": "compute-type", + "type": "string", + "description": "Type of compute to filter by.", + "required": false, + "x-ms-parameter-location": "method" + }, + "UnderlyingResourceActionParameter": { + "in": "query", + "name": "underlyingResourceAction", + "type": "string", + "description": "Delete the underlying compute if 'Delete', or detach the underlying compute from workspace if 'Detach'.", + "required": true, + "enum": [ + "Delete", + "Detach" + ], + "x-ms-enum": { + "name": "UnderlyingResourceAction", + "modelAsString": true + }, + "x-ms-parameter-location": "method" + } + }, + "definitions": { + "Operation": { + "description": "Azure Machine Learning workspace REST API operation", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}", + "type": "string" + }, + "display": { + "description": "Display name of operation", + "properties": { + "provider": { + "description": "The resource provider name: Microsoft.MachineLearningExperimentation", + "type": "string" + }, + "resource": { + "description": "The resource on which the operation is performed.", + "type": "string" + }, + "operation": { + "description": "The operation that users can perform.", + "type": "string" + }, + "description": { + "description": "The description for the operation.", + "type": "string" + } + } + } + } + }, + "OperationListResult": { + "description": "An array of operations supported by the resource provider.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + }, + "description": "List of AML workspace operations supported by the AML workspace resource provider." + } + } + }, + "Workspace": { + "type": "object", + "description": "An object that represents a machine learning workspace.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/WorkspaceProperties", + "description": "The properties of the machine learning workspace.", + "x-ms-client-flatten": true + } + } + }, + "WorkspaceProperties": { + "type": "object", + "description": "The properties of a machine learning workspace.", + "properties": { + "workspaceId": { + "description": "The immutable id associated with this workspace.", + "type": "string", + "readOnly": true + }, + "description": { + "description": "The description of this workspace.", + "type": "string" + }, + "friendlyName": { + "description": "The friendly name for this workspace. This name in mutable", + "type": "string" + }, + "creationTime": { + "format": "date-time", + "description": "The creation time of the machine learning workspace in ISO8601 format.", + "type": "string", + "readOnly": true + }, + "keyVault": { + "description": "ARM id of the key vault associated with this workspace. This cannot be changed once the workspace has been created", + "type": "string" + }, + "applicationInsights": { + "description": "ARM id of the application insights associated with this workspace. This cannot be changed once the workspace has been created", + "type": "string" + }, + "containerRegistry": { + "description": "ARM id of the container registry associated with this workspace. This cannot be changed once the workspace has been created", + "type": "string" + }, + "storageAccount": { + "description": "ARM id of the storage account associated with this workspace. This cannot be changed once the workspace has been created", + "type": "string" + }, + "discoveryUrl": { + "description": "Url for the discovery service to identify regional endpoints for machine learning experimentation services", + "type": "string" + }, + "provisioningState": { + "type": "string", + "enum": [ + "Unknown", + "Updating", + "Creating", + "Deleting", + "Succeeded", + "Failed", + "Canceled" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + }, + "readOnly": true, + "description": "The current deployment state of workspace resource. The provisioningState is to indicate states for resource provisioning." + } + } + }, + "WorkspaceUpdateParameters": { + "description": "The parameters for updating a machine learning workspace.", + "properties": { + "tags": { + "description": "The resource tags for the machine learning workspace.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "properties": { + "$ref": "#/definitions/WorkspacePropertiesUpdateParameters", + "description": "The properties that the machine learning workspace will be updated with.", + "x-ms-client-flatten": true + } + } + }, + "WorkspacePropertiesUpdateParameters": { + "description": "The parameters for updating the properties of a machine learning workspace.", + "properties": { + "description": { + "description": "The description of this workspace.", + "type": "string" + }, + "friendlyName": { + "description": "The friendly name for this workspace.", + "type": "string" + } + } + }, + "UsageName": { + "properties": { + "value": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "localizedValue": { + "readOnly": true, + "type": "string", + "description": "The localized name of the resource." + } + }, + "description": "The Usage Names." + }, + "Usage": { + "type": "object", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource ID." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource type." + }, + "unit": { + "readOnly": true, + "type": "string", + "description": "An enum describing the unit of usage measurement.", + "enum": [ + "Count" + ], + "x-ms-enum": { + "name": "UsageUnit", + "modelAsString": true + } + }, + "currentValue": { + "readOnly": true, + "type": "integer", + "format": "int64", + "description": "The current usage of the resource." + }, + "limit": { + "readOnly": true, + "type": "integer", + "format": "int64", + "description": "The maximum permitted usage of the resource." + }, + "name": { + "readOnly": true, + "$ref": "#/definitions/UsageName", + "description": "The name of the type of usage." + } + }, + "description": "Describes AML Resource Usage." + }, + "ListUsagesResult": { + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/Usage" + }, + "description": "The list of AML resource usages." + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page of AML resource usage information. Call ListNext() with this to fetch the next page of AML resource usage information." + } + }, + "description": "The List Usages operation response." + }, + "VirtualMachineSize": { + "properties": { + "name": { + "type": "string", + "title": "Virtual Machine size name", + "description": "The name of the virtual machine size.", + "readOnly": true + }, + "family": { + "type": "string", + "title": "Virtual Machine family name", + "description": "The family name of the virtual machine size.", + "readOnly": true + }, + "vCPUs": { + "type": "integer", + "format": "int32", + "title": "Number of vPUs", + "description": "The number of vCPUs supported by the virtual machine size.", + "readOnly": true + }, + "gpus": { + "type": "integer", + "format": "int32", + "title": "Number of gPUs", + "description": "The number of gPUs supported by the virtual machine size.", + "readOnly": true + }, + "osVhdSizeMB": { + "type": "integer", + "format": "int32", + "title": "OS VHD Disk size", + "description": "The OS VHD disk size, in MB, allowed by the virtual machine size.", + "readOnly": true + }, + "maxResourceVolumeMB": { + "type": "integer", + "format": "int32", + "title": "Resource volume size", + "description": "The resource volume size, in MB, allowed by the virtual machine size.", + "readOnly": true + }, + "memoryGB": { + "type": "number", + "format": "double", + "title": "Memory size", + "description": "The amount of memory, in GB, supported by the virtual machine size.", + "readOnly": true + }, + "lowPriorityCapable": { + "type": "boolean", + "title": "Low priority capable", + "description": "Specifies if the virtual machine size supports low priority VMs.", + "readOnly": true + }, + "premiumIO": { + "type": "boolean", + "title": "Premium IO supported", + "description": "Specifies if the virtual machine size supports premium IO.", + "readOnly": true + } + }, + "description": "Describes the properties of a VM size." + }, + "VirtualMachineSizeListResult": { + "properties": { + "amlCompute": { + "type": "array", + "items": { + "$ref": "#/definitions/VirtualMachineSize" + }, + "description": "The list of virtual machine sizes supported by AmlCompute." + } + }, + "description": "The List Virtual Machine size operation response." + }, + "WorkspaceListResult": { + "description": "The result of a request to list machine learning workspaces.", + "properties": { + "value": { + "description": "The list of machine learning workspaces. Since this list may be incomplete, the nextLink field should be used to request the next list of machine learning workspaces.", + "type": "array", + "items": { + "$ref": "#/definitions/Workspace" + } + }, + "nextLink": { + "description": "The URI that can be used to request the next list of machine learning workspaces.", + "type": "string" + } + } + }, + "QuotaBaseProperties": { + "properties": { + "id": { + "type": "string", + "description": "Specifies the resource ID." + }, + "type": { + "type": "string", + "description": "Specifies the resource type." + }, + "limit": { + "type": "integer", + "format": "int64", + "title": "Limit.", + "description": "The maximum permitted quota of the resource." + }, + "unit": { + "type": "string", + "description": "An enum describing the unit of quota measurement.", + "enum": [ + "Count" + ], + "x-ms-enum": { + "name": "QuotaUnit", + "modelAsString": true + } + } + }, + "description": "The properties for Quota update or retrieval." + }, + "QuotaUpdateParameters": { + "properties": { + "value": { + "description": "The list for update quota.", + "type": "array", + "items": { + "$ref": "#/definitions/QuotaBaseProperties" + } + } + }, + "description": "Quota update parameters." + }, + "UpdateWorkspaceQuotasResult": { + "properties": { + "value": { + "description": "The list of workspace quota update result.", + "items": { + "$ref": "#/definitions/UpdateWorkspaceQuotas" + }, + "readOnly": true, + "type": "array" + }, + "nextLink": { + "description": "The URI to fetch the next page of workspace quota update result. Call ListNext() with this to fetch the next page of Workspace Quota update result.", + "readOnly": true, + "type": "string" + } + }, + "description": "The result of update workspace quota." + }, + "UpdateWorkspaceQuotas": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource ID." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource type." + }, + "limit": { + "type": "integer", + "format": "int64", + "title": "Limit.", + "description": "The maximum permitted quota of the resource." + }, + "unit": { + "readOnly": true, + "type": "string", + "description": "An enum describing the unit of quota measurement.", + "enum": [ + "Count" + ], + "x-ms-enum": { + "name": "QuotaUnit", + "modelAsString": true + } + }, + "status": { + "type": "string", + "readOnly": false, + "title": "Update Workspace Quota Status.", + "description": "Status of update workspace quota.", + "enum": [ + "Undefined", + "Success", + "Failure", + "InvalidQuotaBelowClusterMinimum", + "InvalidQuotaExceedsSubscriptionLimit", + "InvalidVMFamilyName" + ], + "x-ms-enum": { + "name": "status", + "modelAsString": true + } + } + }, + "description": "The properties for update Quota response." + }, + "ResourceName": { + "properties": { + "value": { + "readOnly": true, + "type": "string", + "description": "The name of the resource." + }, + "localizedValue": { + "readOnly": true, + "type": "string", + "description": "The localized name of the resource." + } + }, + "description": "The Resource Name." + }, + "ResourceQuota": { + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource ID." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Specifies the resource type." + }, + "name": { + "$ref": "#/definitions/ResourceName", + "description": "Name of the resource.", + "readOnly": true + }, + "limit": { + "readOnly": true, + "type": "integer", + "format": "int64", + "title": "Limit.", + "description": "The maximum permitted quota of the resource." + }, + "unit": { + "readOnly": true, + "type": "string", + "description": "An enum describing the unit of quota measurement.", + "enum": [ + "Count" + ], + "x-ms-enum": { + "name": "QuotaUnit", + "modelAsString": true + } + } + }, + "description": "The quota assigned to a resource." + }, + "ListWorkspaceQuotas": { + "properties": { + "value": { + "description": "The list of Workspace Quotas by VM Family", + "items": { + "$ref": "#/definitions/ResourceQuota" + }, + "readOnly": true, + "type": "array" + }, + "nextLink": { + "description": "The URI to fetch the next page of workspace quota information by VM Family. Call ListNext() with this to fetch the next page of Workspace Quota information.", + "readOnly": true, + "type": "string" + } + }, + "description": "The List WorkspaceQuotasByVMFamily operation response." + }, + "Identity": { + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal ID of resource identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant ID of resource." + }, + "type": { + "type": "string", + "description": "The identity type.", + "enum": [ + "SystemAssigned" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + } + }, + "description": "Identity for the resource." + }, + "Resource": { + "description": "Azure Resource Manager resource envelope.", + "x-ms-azure-resource": true, + "properties": { + "id": { + "description": "Specifies the resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Specifies the name of the resource.", + "type": "string", + "readOnly": true + }, + "identity": { + "$ref": "#/definitions/Identity", + "readOnly": true, + "description": "The identity of the resource." + }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" + }, + "type": { + "description": "Specifies the type of the resource.", + "type": "string", + "readOnly": true + }, + "tags": { + "description": "Contains resource tags defined as key/value pairs.", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "ResourceId": { + "properties": { + "id": { + "type": "string", + "description": "The ID of the resource" + } + }, + "required": [ + "id" + ], + "description": "Represents a resource ID. For example, for a subnet, it is the resource URL for the subnet.", + "x-ms-azure-resource": true + }, + "ListWorkspaceKeysResult": { + "type": "object", + "properties": { + "userStorageKey": { + "readOnly": true, + "type": "string" + }, + "userStorageResourceId": { + "readOnly": true, + "type": "string" + }, + "appInsightsInstrumentationKey": { + "readOnly": true, + "type": "string" + }, + "containerRegistryCredentials": { + "readOnly": true, + "$ref": "#/definitions/RegistryListCredentialsResult" + } + } + }, + "RegistryListCredentialsResult": { + "type": "object", + "properties": { + "location": { + "readOnly": true, + "type": "string" + }, + "username": { + "readOnly": true, + "type": "string" + }, + "passwords": { + "type": "array", + "items": { + "$ref": "#/definitions/Password" + } + } + } + }, + "Password": { + "type": "object", + "properties": { + "name": { + "readOnly": true, + "type": "string" + }, + "value": { + "readOnly": true, + "type": "string" + } + } + }, + "PaginatedComputeResourcesList": { + "type": "object", + "description": "Paginated list of Machine Learning compute objects wrapped in ARM resource envelope.", + "properties": { + "value": { + "type": "array", + "description": "An array of Machine Learning compute objects wrapped in ARM resource envelope.", + "items": { + "$ref": "#/definitions/ComputeResource" + } + }, + "nextLink": { + "type": "string", + "description": "A continuation link (absolute URI) to the next page of results in the list." + } + } + }, + "ComputeResource": { + "type": "object", + "description": "Machine Learning compute object wrapped into ARM resource envelope.", + "allOf": [ + { + "$ref": "#/definitions/Resource" + }, + { + "type": "object", + "properties": { + "properties": { + "description": "Compute properties", + "$ref": "#/definitions/Compute" + } + } + } + ] + }, + "Compute": { + "type": "object", + "description": "Machine Learning compute object.", + "discriminator": "computeType", + "properties": { + "computeType": { + "description": "The type of compute", + "$ref": "#/definitions/ComputeType" + }, + "computeLocation": { + "description": "Location for the underlying compute", + "type": "string" + }, + "provisioningState": { + "type": "string", + "description": "The provision state of the cluster. Valid values are Unknown, Updating, Provisioning, Succeeded, and Failed.", + "enum": [ + "Unknown", + "Updating", + "Creating", + "Deleting", + "Succeeded", + "Failed", + "Canceled" + ], + "x-ms-enum": { + "name": "ProvisioningState", + "modelAsString": true + }, + "readOnly": true + }, + "description": { + "type": "string", + "description": "The description of the Machine Learning compute." + }, + "createdOn": { + "type": "string", + "description": "The date and time when the compute was created.", + "format": "date-time", + "readOnly": true + }, + "modifiedOn": { + "type": "string", + "description": "The date and time when the compute was last modified.", + "format": "date-time", + "readOnly": true + }, + "resourceId": { + "type": "string", + "description": "ARM resource id of the underlying compute" + }, + "provisioningErrors": { + "type": "array", + "description": "Errors during provisioning", + "items": { + "$ref": "#/definitions/MachineLearningServiceError" + }, + "readOnly": true + }, + "isAttachedCompute": { + "type": "boolean", + "description": "Indicating whether the compute was provisioned by user and brought from outside if true, or machine learning service provisioned it if false.", + "readOnly": true + } + }, + "required": [ + "computeType" + ] + }, + "AKS": { + "description": "A Machine Learning compute based on AKS.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "description": "AKS properties", + "properties": { + "clusterFqdn": { + "description": "Cluster full qualified domain name", + "type": "string" + }, + "systemServices": { + "type": "array", + "description": "System services", + "items": { + "$ref": "#/definitions/SystemService" + }, + "readOnly": true + }, + "agentCount": { + "description": "Number of agents", + "type": "integer", + "minimum": 1 + }, + "agentVMSize": { + "description": "Agent virtual machine size", + "type": "string" + }, + "sslConfiguration": { + "description": "SSL configuration", + "$ref": "#/definitions/SslConfiguration" + }, + "aksNetworkingConfiguration": { + "description": "AKS networking configuration for vnet", + "$ref": "#/definitions/AksNetworkingConfiguration" + } + } + } + } + } + ], + "x-ms-discriminator-value": "AKS" + }, + "AmlCompute": { + "description": "An Azure Machine Learning compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "description": "AML Compute properties", + "type": "object", + "properties": { + "vmSize": { + "description": "Virtual Machine Size", + "type": "string" + }, + "vmPriority": { + "description": "Virtual Machine priority", + "type": "string", + "enum": [ + "Dedicated", + "LowPriority" + ], + "x-ms-enum": { + "name": "VmPriority", + "modelAsString": true + } + }, + "scaleSettings": { + "description": "Scale settings for AML Compute", + "$ref": "#/definitions/ScaleSettings" + }, + "userAccountCredentials": { + "title": "User account credentials.", + "description": "Credentials for an administrator user account that will be created on each compute node.", + "$ref": "#/definitions/UserAccountCredentials" + }, + "subnet": { + "title": "Subnet.", + "description": "Virtual network subnet resource ID the compute nodes belong to.", + "$ref": "#/definitions/ResourceId" + }, + "remoteLoginPortPublicAccess": { + "type": "string", + "default": "NotSpecified", + "title": "Close remote Login Access Port", + "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on all nodes of the cluster. Enabled - Indicates that the public ssh port is open on all nodes of the cluster. NotSpecified - Indicates that the public ssh port is closed on all nodes of the cluster if VNet is defined, else is open all public nodes. It can be default only during cluster creation time, after creation it will be either enabled or disabled.", + "enum": [ + "Enabled", + "Disabled", + "NotSpecified" + ], + "x-ms-enum": { + "name": "remoteLoginPortPublicAccess", + "modelAsString": true + } + }, + "allocationState": { + "type": "string", + "readOnly": true, + "title": "Allocation state.", + "description": "Allocation state of the compute. Possible values are: steady - Indicates that the compute is not resizing. There are no changes to the number of compute nodes in the compute in progress. A compute enters this state when it is created and when no operations are being performed on the compute to change the number of compute nodes. resizing - Indicates that the compute is resizing; that is, compute nodes are being added to or removed from the compute.", + "enum": [ + "Steady", + "Resizing" + ], + "x-ms-enum": { + "name": "AllocationState", + "modelAsString": true + } + }, + "allocationStateTransitionTime": { + "type": "string", + "readOnly": true, + "format": "date-time", + "title": "Allocation state transition time.", + "description": "The time at which the compute entered its current allocation state." + }, + "errors": { + "readOnly": true, + "title": "Errors.", + "description": "Collection of errors encountered by various compute nodes during node setup.", + "type": "array", + "items": { + "$ref": "#/definitions/MachineLearningServiceError" + } + }, + "currentNodeCount": { + "type": "integer", + "readOnly": true, + "format": "int32", + "title": "Current node count.", + "description": "The number of compute nodes currently assigned to the compute." + }, + "targetNodeCount": { + "type": "integer", + "readOnly": true, + "format": "int32", + "title": "Target node count.", + "description": "The target number of compute nodes for the compute. If the allocationState is resizing, this property denotes the target node count for the ongoing resize operation. If the allocationState is steady, this property denotes the target node count for the previous resize operation." + }, + "nodeStateCounts": { + "title": "Node state counts.", + "description": "Counts of various node states on the compute.", + "readOnly": true, + "$ref": "#/definitions/NodeStateCounts" + } + } + } + } + } + ], + "x-ms-discriminator-value": "AmlCompute" + }, + "VirtualMachine": { + "description": "A Machine Learning compute based on Azure Virtual Machines.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "virtualMachineSize": { + "description": "Virtual Machine size", + "type": "string" + }, + "sshPort": { + "description": "Port open for ssh connections.", + "type": "integer" + }, + "address": { + "description": "Public IP address of the virtual machine.", + "type": "string" + }, + "administratorAccount": { + "description": "Admin credentials for virtual machine", + "$ref": "#/definitions/VirtualMachineSshCredentials" + } + } + } + } + } + ], + "x-ms-discriminator-value": "VirtualMachine" + }, + "HDInsight": { + "description": "A HDInsight compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "sshPort": { + "description": "Port open for ssh connections on the master node of the cluster.", + "type": "integer" + }, + "address": { + "description": "Public IP address of the master node of the cluster.", + "type": "string" + }, + "administratorAccount": { + "description": "Admin credentials for master node of the cluster", + "$ref": "#/definitions/VirtualMachineSshCredentials" + } + } + } + } + } + ], + "x-ms-discriminator-value": "HDInsight" + }, + "DataFactory": { + "description": "A DataFactory compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + } + ], + "x-ms-discriminator-value": "DataFactory" + }, + "Databricks": { + "description": "A DataFactory compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "databricksAccessToken": { + "description": "Databricks access token", + "type": "string" + } + } + } + } + } + ], + "x-ms-discriminator-value": "Databricks" + }, + "DataLakeAnalytics": { + "description": "A DataLakeAnalytics compute.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "dataLakeStoreAccountName": { + "description": "DataLake Store Account Name", + "type": "string" + } + } + } + } + } + ], + "x-ms-discriminator-value": "DataLakeAnalytics" + }, + "ServicePrincipalCredentials": { + "type": "object", + "description": "Service principal credentials.", + "properties": { + "clientId": { + "description": "Client Id", + "type": "string" + }, + "clientSecret": { + "description": "Client secret", + "type": "string" + } + }, + "required": [ + "clientId", + "clientSecret" + ] + }, + "SystemService": { + "type": "object", + "description": "A system service running on a compute.", + "properties": { + "systemServiceType": { + "description": "The type of this system service.", + "readOnly": true, + "type": "string" + }, + "publicIpAddress": { + "type": "string", + "description": "Public IP address", + "readOnly": true + }, + "version": { + "description": "The version for this type.", + "readOnly": true, + "type": "string" + } + } + }, + "SslConfiguration": { + "type": "object", + "description": "The ssl configuration for scoring", + "properties": { + "status": { + "description": "Enable or disable ssl for scoring", + "type": "string", + "enum": [ + "Disabled", + "Enabled" + ] + }, + "cert": { + "description": "Cert data", + "type": "string" + }, + "key": { + "description": "Key data", + "type": "string" + }, + "cname": { + "description": "CNAME of the cert", + "type": "string" + } + } + }, + "AksNetworkingConfiguration": { + "type": "object", + "description": "Advance configuration for AKS networking", + "properties": { + "subnetId": { + "description": "Virtual network subnet resource ID the compute nodes belong to", + "type": "string" + }, + "serviceCidr": { + "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$", + "description": "A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges.", + "type": "string" + }, + "dnsServiceIP": { + "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", + "description": "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr.", + "type": "string" + }, + "dockerBridgeCidr": { + "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$", + "description": "A CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range.", + "type": "string" + } + } + }, + "UserAccountCredentials": { + "properties": { + "adminUserName": { + "type": "string", + "title": "User name.", + "description": "Name of the administrator user account which can be used to SSH to nodes." + }, + "adminUserSshPublicKey": { + "type": "string", + "title": "SSH public key.", + "description": "SSH public key of the administrator user account." + }, + "adminUserPassword": { + "type": "string", + "title": "Password.", + "description": "Password of the administrator user account." + } + }, + "required": [ + "adminUserName" + ], + "description": "Settings for user account that gets created on each on the nodes of a compute." + }, + "ScaleSettings": { + "type": "object", + "description": "scale settings for AML Compute", + "properties": { + "maxNodeCount": { + "description": "Max number of nodes to use", + "type": "integer" + }, + "minNodeCount": { + "description": "Min number of nodes to use", + "type": "integer", + "default": 0 + }, + "nodeIdleTimeBeforeScaleDown": { + "type": "string", + "format": "duration", + "description": "Node Idle Time before scaling down amlCompute" + } + }, + "required": [ + "maxNodeCount" + ] + }, + "NodeStateCounts": { + "properties": { + "idleNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Idle node count.", + "description": "Number of compute nodes in idle state." + }, + "runningNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Running node count.", + "description": "Number of compute nodes which are running jobs." + }, + "preparingNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Preparing node count.", + "description": "Number of compute nodes which are being prepared." + }, + "unusableNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Unusable node count.", + "description": "Number of compute nodes which are in unusable state." + }, + "leavingNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Leaving node count.", + "description": "Number of compute nodes which are leaving the amlCompute." + }, + "preemptedNodeCount": { + "readOnly": true, + "type": "integer", + "format": "int32", + "title": "Preempted node count.", + "description": "Number of compute nodes which are in preempted state." + } + }, + "description": "Counts of various compute node states on the amlCompute." + }, + "ClusterUpdateProperties": { + "properties": { + "scaleSettings": { + "$ref": "#/definitions/ScaleSettings", + "title": "Scale settings.", + "description": "Desired scale settings for the amlCompute." + } + }, + "description": "The properties of a amlCompute that need to be updated." + }, + "ClusterUpdateParameters": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ClusterUpdateProperties", + "description": "The properties of the amlCompute." + } + }, + "description": "AmlCompute update parameters." + }, + "ComputeNodesInformation": { + "type": "object", + "description": "Compute nodes information related to a Machine Learning compute. Might differ for every type of compute.", + "discriminator": "computeType", + "properties": { + "computeType": { + "description": "The type of compute", + "$ref": "#/definitions/ComputeType" + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The continuation token." + } + }, + "required": [ + "computeType" + ] + }, + "AmlComputeNodesInformation": { + "description": "Compute node information related to a AmlCompute.", + "allOf": [ + { + "$ref": "#/definitions/ComputeNodesInformation" + }, + { + "type": "object", + "properties": { + "nodes": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/AmlComputeNodeInformation" + }, + "description": "The collection of returned AmlCompute nodes details." + } + } + } + ], + "x-ms-discriminator-value": "AmlCompute" + }, + "AmlComputeNodeInformation": { + "description": "Compute node information related to a AmlCompute.", + "properties": { + "nodeId": { + "readOnly": true, + "type": "string", + "title": "Node ID.", + "description": "ID of the compute node." + }, + "privateIpAddress": { + "readOnly": true, + "type": "string", + "title": "Private IP address.", + "description": "Private IP address of the compute node." + }, + "publicIpAddress": { + "readOnly": true, + "type": "string", + "title": "Public IP address.", + "description": "Public IP address of the compute node." + }, + "port": { + "readOnly": true, + "type": "number", + "format": "int32", + "title": "Port.", + "description": "SSH port number of the node." + }, + "nodeState": { + "readOnly": true, + "type": "string", + "enum": [ + "idle", + "running", + "preparing", + "unusable", + "leaving", + "preempted" + ], + "description": "State of the compute node. Values are idle, running, preparing, unusable, leaving and preempted.", + "x-ms-enum": { + "name": "nodeState", + "modelAsString": true + } + }, + "runId": { + "readOnly": true, + "type": "string", + "title": "Run ID.", + "description": "ID of the Experiment running on the node, if any else null." + } + }, + "x-ms-discriminator-value": "AmlCompute" + }, + "VirtualMachineSshCredentials": { + "type": "object", + "description": "Admin credentials for virtual machine", + "properties": { + "username": { + "description": "Username of admin account", + "type": "string" + }, + "password": { + "description": "Password of admin account", + "type": "string" + }, + "publicKeyData": { + "description": "Public key data", + "type": "string" + }, + "privateKeyData": { + "description": "Private key data", + "type": "string" + } + } + }, + "ComputeSecrets": { + "type": "object", + "description": "Secrets related to a Machine Learning compute. Might differ for every type of compute.", + "discriminator": "computeType", + "properties": { + "computeType": { + "description": "The type of compute", + "$ref": "#/definitions/ComputeType" + } + }, + "required": [ + "computeType" + ] + }, + "AksComputeSecrets": { + "description": "Secrets related to a Machine Learning compute based on AKS.", + "allOf": [ + { + "$ref": "#/definitions/ComputeSecrets" + }, + { + "type": "object", + "properties": { + "userKubeConfig": { + "type": "string", + "description": "Content of kubeconfig file that can be used to connect to the Kubernetes cluster." + }, + "adminKubeConfig": { + "type": "string", + "description": "Content of kubeconfig file that can be used to connect to the Kubernetes cluster." + }, + "imagePullSecretName": { + "type": "string", + "description": "Image registry pull secret." + } + } + } + ], + "x-ms-discriminator-value": "AKS" + }, + "VirtualMachineSecrets": { + "description": "Secrets related to a Machine Learning compute based on AKS.", + "allOf": [ + { + "$ref": "#/definitions/ComputeSecrets" + }, + { + "type": "object", + "properties": { + "administratorAccount": { + "description": "Admin credentials for virtual machine.", + "$ref": "#/definitions/VirtualMachineSshCredentials" + } + } + } + ], + "x-ms-discriminator-value": "VirtualMachine" + }, + "DatabricksComputeSecrets": { + "description": "Secrets related to a Machine Learning compute based on Databricks.", + "allOf": [ + { + "$ref": "#/definitions/ComputeSecrets" + }, + { + "type": "object", + "properties": { + "databricksAccessToken": { + "description": "access token for databricks account.", + "type": "string" + } + } + } + ], + "x-ms-discriminator-value": "Databricks" + }, + "ComputeType": { + "type": "string", + "description": "The type of compute", + "enum": [ + "AKS", + "AmlCompute", + "DataFactory", + "VirtualMachine", + "HDInsight", + "Databricks", + "DataLakeAnalytics" + ], + "x-ms-enum": { + "name": "ComputeType", + "modelAsString": true + } + }, + "MachineLearningServiceError": { + "type": "object", + "description": "Wrapper for error response to follow ARM guidelines.", + "properties": { + "error": { + "description": "The error response.", + "$ref": "#/definitions/ErrorResponse", + "readOnly": true + } + } + }, + "ErrorResponse": { + "type": "object", + "description": "Error response information.", + "properties": { + "code": { + "type": "string", + "description": "Error code.", + "readOnly": true + }, + "message": { + "type": "string", + "description": "Error message.", + "readOnly": true + }, + "details": { + "type": "array", + "description": "An array of error detail objects.", + "items": { + "$ref": "#/definitions/ErrorDetail" + }, + "readOnly": true + } + } + }, + "ErrorDetail": { + "type": "object", + "description": "Error detail information.", + "properties": { + "code": { + "type": "string", + "description": "Error code." + }, + "message": { + "type": "string", + "description": "Error message." + } + }, + "required": [ + "code", + "message" + ] + } + } +} From cff591b1a5c9ca1349d897aca1a4fff14b9d739b Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 14:53:26 -0700 Subject: [PATCH 02/36] Adding definition for AmlInstance compute type --- .../2019-11-01/machineLearningServices.json | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 51cdfcd77548..2726f429ff03 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -1978,6 +1978,146 @@ ], "x-ms-discriminator-value": "AmlCompute" }, + "AmlInstance": { + "description": "An Azure Machine Learning instance.", + "allOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "type": "object", + "properties": { + "properties": { + "description": "AML Instance properties", + "type": "object", + "properties": { + "vmSize": { + "description": "Virtual Machine Size", + "type": "string" + }, + "subnet": { + "title": "Subnet.", + "description": "Virtual network subnet resource ID the compute nodes belong to.", + "$ref": "#/definitions/ResourceId" + }, + "dataStoresMountSettings": { + "type": "object", + "description": "Describes what data stores will be mounted on this compute instance." + "dataStoreSelection": { + "type": "string", + "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", + "default": "All", + "enum": [ + "All", + "UserSpecified" + ], + "x-ms-enum": { + "name": "dataStoreSelection", + "modelAsString": true + } + }, + "dataStores": { + "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", + "type": "array", + "items": { + "$ref": "#/definitions/AmlInstanceDatastore" + } + } + }, + "customScriptSettings": { + "type": "object", + "startupScript": { + "type": "object", + "scriptLocation": { + "type": "string", + "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." + }, + "scriptParameters": { + "type": "string", + "description": "Parameters required for this script if any." + } + } + }, + "softwareUpdateSettings": { + "type": "object", + "osUpdateSettings": { + "type": "object", + "osUpdateType": { + "type": "string", + "default": "Recommended", + "title": "Type of automatic operating system updates to install", + "enum": [ + "Critical", + "Recommended" + ], + "x-ms-enum": { + "name": "osUpdateType", + "modelAsString": true + } + }, + "updateFrequencyInDays": { + "type": "integer", + "format": "int64", + "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." + }, + "updateHourInUtc": { + "type": "integer", + "format": "int64" + "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." + } + }, + "sdkUpdateSettings": { + "type": "object", + "readonly": true, + "availableUpdates": { + "type": "array", + "readonly": true, + "description": "Describes available SDK updates for this compute instance.", + "items": { + "$ref": "#/definitions/AmlInstanceSdkUpdate" + } + } + } + }, + "sshSettings": { + "type": "object", + "sshPublicAccess": { + "type": "string", + "default": "Disabled", + "title": "Access policy for SSH", + "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "sshPublicAccess", + "modelAsString": true + } + }, + "adminCredentials": { + "type": "object", + "adminPublicKey": { + "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." + } + } + }, + "errors": { + "readOnly": true, + "title": "Errors.", + "description": "Collection of errors encountered by various compute nodes during node setup.", + "type": "array", + "items": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + } + } + ], + "x-ms-discriminator-value": "AmlInstance" + }, "VirtualMachine": { "description": "A Machine Learning compute based on Azure Virtual Machines.", "allOf": [ @@ -2501,6 +2641,7 @@ "enum": [ "AKS", "AmlCompute", + "AmlInstance", "DataFactory", "VirtualMachine", "HDInsight", @@ -2564,6 +2705,44 @@ "code", "message" ] + }, + "AmlInstanceDatastore": { + "type": "object", + "description": "Represents specification for datastore requested to be mounted on an AzureML instance as well as its mounting status.", + "name": { + "type": "string", + "description": "Name of the datastore to be mounted on an AzureML instance." + }, + "state": { + "type": "string", + "description": "Current state of the datastore on the parent AzureML instance.", + "enum": [ + "Mounted", + "MountFailed" + ], + "x-ms-enum": { + "name": "datastoreState", + "modelAsString": true + }, + "readonly": true + }, + "error": { + "type": "string", + "description": "Describes the error if datastore could not be successfully mounted on the parent AzureML instance.", + "readonly": true + } + }, + "AmlInstanceSdkUpdate": { + "type": "object", + "readonly": true, + "updateName": { + "type": "string", + "description": "Short name of the update." + }, + "updateDescription": { + "type": "string", + "description": "Detailed description of the available SDK update." + } } } } From 9c977379ecc7c42ac138f206693be946046974f8 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 15:35:38 -0700 Subject: [PATCH 03/36] Modifying examples to use the new API version 2019-11-01 --- .../stable/2019-11-01/examples/ListUsages.json | 2 +- .../stable/2019-11-01/examples/ListVMSizesResult.json | 2 +- .../2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json | 2 +- .../stable/2019-11-01/examples/amlComputeListNodes.json | 2 +- .../stable/2019-11-01/examples/createBasicAKSCompute.json | 2 +- .../stable/2019-11-01/examples/createBasicAmlCompute.json | 2 +- .../2019-11-01/examples/createBasicDataFactoryCompute.json | 2 +- .../stable/2019-11-01/examples/createWorkspace.json | 2 +- .../stable/2019-11-01/examples/deleteCompute.json | 2 +- .../stable/2019-11-01/examples/deleteWorkspace.json | 2 +- .../stable/2019-11-01/examples/getAKSCompute.json | 2 +- .../stable/2019-11-01/examples/getAmlCompute.json | 2 +- .../stable/2019-11-01/examples/getComputes.json | 2 +- .../stable/2019-11-01/examples/getWorkspace.json | 2 +- .../2019-11-01/examples/getWorkspacesByResourceGroup.json | 2 +- .../stable/2019-11-01/examples/getWorkspacesBySubscription.json | 2 +- .../stable/2019-11-01/examples/listKeysAKSCompute.json | 2 +- .../stable/2019-11-01/examples/listWorkspaceKeys.json | 2 +- .../stable/2019-11-01/examples/patchAmlCompute.json | 2 +- .../stable/2019-11-01/examples/resyncWorkspaceKeys.json | 2 +- .../stable/2019-11-01/examples/updateAKSCompute.json | 2 +- .../stable/2019-11-01/examples/updateAmlCompute.json | 2 +- .../stable/2019-11-01/examples/updateQuota.json | 2 +- .../stable/2019-11-01/examples/updateWorkspace.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json index d8d3fbe121f8..3a2950da1ab0 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListUsages.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "location": "eastus", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json index cef0341ad8cb..e4e8678ee841 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListVMSizesResult.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "location": "eastus" }, "responses": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json index 2f32eddbc799..2c834dd11a5b 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/ListWorkspaceQuotasByVMFamily.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "location": "eastus", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json index 8827193d719b..a0efa7a674cc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/amlComputeListNodes.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json index 06801ab73b97..8e543629867c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAKSCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "location": "eastus", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json index 399e7bfe1451..5b29a18b028e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "location": "eastus", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json index 7d3feaff19f6..27c9f9c03ca2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicDataFactoryCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "location": "eastus", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json index 79aec9534278..5ff6d22fd287 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createWorkspace.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "workspace-1234", "workspaceName": "testworkspace", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "location": "eastus2euap", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json index 446dcaf34d24..13ced208ebc2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "underlyingResourceAction": "Delete" }, "responses": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json index 7c045e6ba190..b9e0d6fd045c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/deleteWorkspace.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "workspace-1234", "workspaceName": "testworkspace", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": {}, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json index d653a52f7bd1..e48c649d2d3c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAKSCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json index 2e4d00ec6740..74e8b3851cea 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json index 1e994c869ebe..e79b34f9f803 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputes.json @@ -3,7 +3,7 @@ "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", "resourceGroupName": "testrg123", "workspaceName": "workspaces123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json index f7c0ccdd6f1b..5ec4bcfca6cf 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspace.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "workspace-1234", "workspaceName": "testworkspace", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json index 7d9b3c65734b..1a5dc4361843 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesByResourceGroup.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "workspace-1234", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json index 3180aedbc830..37df2cb43457 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getWorkspacesBySubscription.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json index 3675bf0dcd45..6294b947ae45 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listKeysAKSCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json index 2e08fa2d657f..988e5e22a5d3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/listWorkspaceKeys.json @@ -3,7 +3,7 @@ "subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", "resourceGroupName": "testrg123", "workspaceName": "workspaces123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json index d374e4f27709..d5d44c8a2669 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/patchAmlCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "properties": { "scaleSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json index 9f324f33c347..9765550738d4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/resyncWorkspaceKeys.json @@ -3,7 +3,7 @@ "subscriptionId": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", "resourceGroupName": "testrg123", "workspaceName": "workspaces123", - "api-version": "2019-06-01" + "api-version": "2019-11-01" }, "responses": { "200": {} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json index 06d4d48cc9d0..98cc1580c1a5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAKSCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "id": "compute123", "location": "eastus", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json index e382eaaf4291..a724186e04cb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateAmlCompute.json @@ -4,7 +4,7 @@ "resourceGroupName": "testrg123", "workspaceName": "workspaces123", "computeName": "compute123", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "location": "eastus", "properties": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json index a1cf4459b7bf..d38508fd70c9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateQuota.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-0000-0000-0000-000000000000", "location": "eastus", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "value": [ { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json index 75473d19db4f..078c70c9b659 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/updateWorkspace.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "workspace-1234", "workspaceName": "testworkspace", - "api-version": "2019-06-01", + "api-version": "2019-11-01", "parameters": { "properties": { "friendlyName": "New friendly name", From 0dd645275a8a4516054fabc8f06fa04f8a2b33cd Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 16:22:21 -0700 Subject: [PATCH 04/36] Changing readme files to reflect the new API version --- .../resource-manager/readme.go.md | 12 +++++++++ .../resource-manager/readme.md | 26 ++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/readme.go.md b/specification/machinelearningservices/resource-manager/readme.go.md index 928b47efefaa..9e40b1e03879 100644 --- a/specification/machinelearningservices/resource-manager/readme.go.md +++ b/specification/machinelearningservices/resource-manager/readme.go.md @@ -13,11 +13,23 @@ go: ```yaml $(go) && $(multiapi) batch: + - tag: package-2019-11-01 - tag: package-2019-06-01 - tag: package-2019-05-01 - tag: package-2018-11-19 - tag: package-2018-03-preview + ``` + +## Tag: package-2019-11-01 and go + +These settings apply only when `--tag=package-2019-11-01 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +```yaml $(tag)=='package-2019-11-01' && $(go) +output-folder: $(go-sdk-folder)/services/$(namespace)/mgmt/2019-11-01/$(namespace) +``` + ## Tag: package-2019-06-01 and go These settings apply only when `--tag=package-2019-06-01 --go` is specified on the command line. diff --git a/specification/machinelearningservices/resource-manager/readme.md b/specification/machinelearningservices/resource-manager/readme.md index 60c8d2a6d9c6..d727010827f6 100644 --- a/specification/machinelearningservices/resource-manager/readme.md +++ b/specification/machinelearningservices/resource-manager/readme.md @@ -24,7 +24,16 @@ These are the global settings for the Machine Learning Services API. ``` yaml openapi-type: arm -tag: package-2019-06-01 +tag: package-2019-11-01 +``` + +### Tag: package-2019-11-01 + +These settings apply only when `--tag=package-2019-11-01` is specified on the command line. + +``` yaml $(tag) == 'package-2019-11-01' +input-file: +- Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json ``` ### Tag: package-2019-06-01 @@ -119,12 +128,26 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-machinelearning/ser ``` yaml $(java) && $(multiapi) batch: + - tag: package-2019-11-01 - tag: package-2019-06-01 - tag: package-2019-05-01 - tag: package-2018-11-19 - tag: package-2018-03-preview ``` +### Tag: package-2019-11-01 and java + +These settings apply only when `--tag=package-2019-11-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2019-11-01' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.machinelearningservices.v2019_11_01 + output-folder: $(azure-libraries-for-java-folder)/machinelearningservices/resource-manager/v2019_11_01 +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2019-06-01 and java These settings apply only when `--tag=package-2019-05-01 --java` is specified on the command line. @@ -189,6 +212,7 @@ require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions input-file: + - $(this-folder)/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json - $(this-folder)/Microsoft.MachineLearningServices/stable/2019-06-01/machineLearningServices.json - $(this-folder)/Microsoft.MachineLearningServices/stable/2019-05-01/machineLearningServices.json - $(this-folder)/Microsoft.MachineLearningServices/stable/2018-11-19/machineLearningServices.json From 7c540de822c64f21ad301b30a206073e42cab7f2 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 16:48:21 -0700 Subject: [PATCH 05/36] Bug fixes --- .../stable/2019-11-01/machineLearningServices.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 2726f429ff03..df259074d108 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2002,7 +2002,7 @@ }, "dataStoresMountSettings": { "type": "object", - "description": "Describes what data stores will be mounted on this compute instance." + "description": "Describes what data stores will be mounted on this compute instance.", "dataStoreSelection": { "type": "string", "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", @@ -2062,7 +2062,7 @@ }, "updateHourInUtc": { "type": "integer", - "format": "int64" + "format": "int64", "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." } }, @@ -2098,6 +2098,7 @@ "adminCredentials": { "type": "object", "adminPublicKey": { + "type": "string", "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." } } From bb0c6f6876bb6dffb2ca1a3cbc010a39f69f85f0 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 17:07:14 -0700 Subject: [PATCH 06/36] Bug fix: Adding properties to AmlInstance definitions --- .../2019-11-01/machineLearningServices.json | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index df259074d108..e13e72089638 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2710,39 +2710,43 @@ "AmlInstanceDatastore": { "type": "object", "description": "Represents specification for datastore requested to be mounted on an AzureML instance as well as its mounting status.", - "name": { + "properties": { + "name": { "type": "string", "description": "Name of the datastore to be mounted on an AzureML instance." - }, - "state": { - "type": "string", - "description": "Current state of the datastore on the parent AzureML instance.", - "enum": [ - "Mounted", - "MountFailed" - ], - "x-ms-enum": { - "name": "datastoreState", - "modelAsString": true }, - "readonly": true - }, - "error": { - "type": "string", - "description": "Describes the error if datastore could not be successfully mounted on the parent AzureML instance.", - "readonly": true + "state": { + "type": "string", + "description": "Current state of the datastore on the parent AzureML instance.", + "enum": [ + "Mounted", + "MountFailed" + ], + "x-ms-enum": { + "name": "datastoreState", + "modelAsString": true + }, + "readonly": true + }, + "error": { + "type": "string", + "description": "Describes the error if datastore could not be successfully mounted on the parent AzureML instance.", + "readonly": true + } } }, "AmlInstanceSdkUpdate": { "type": "object", "readonly": true, - "updateName": { - "type": "string", - "description": "Short name of the update." - }, - "updateDescription": { - "type": "string", - "description": "Detailed description of the available SDK update." + "properties": { + "updateName": { + "type": "string", + "description": "Short name of the update." + }, + "updateDescription": { + "type": "string", + "description": "Detailed description of the available SDK update." + } } } } From 7e539e73e47b1b1b8407f00f6bcdaac4894bf359 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 17:46:25 -0700 Subject: [PATCH 07/36] Bug fix: Adding missing properties in all object types --- .../2019-11-01/machineLearningServices.json | 184 ++++++++++-------- 1 file changed, 105 insertions(+), 79 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index e13e72089638..13c129929eef 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2003,100 +2003,126 @@ "dataStoresMountSettings": { "type": "object", "description": "Describes what data stores will be mounted on this compute instance.", - "dataStoreSelection": { - "type": "string", - "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", - "default": "All", - "enum": [ - "All", - "UserSpecified" - ], - "x-ms-enum": { - "name": "dataStoreSelection", - "modelAsString": true - } - }, - "dataStores": { - "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", - "type": "array", - "items": { - "$ref": "#/definitions/AmlInstanceDatastore" + "properties": { + "dataStoreSelection": { + "type": "string", + "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", + "default": "All", + "enum": [ + "All", + "UserSpecified" + ], + "x-ms-enum": { + "name": "dataStoreSelection", + "modelAsString": true + } + }, + "dataStores": { + "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", + "type": "array", + "items": { + "$ref": "#/definitions/AmlInstanceDatastore" + } } } }, "customScriptSettings": { "type": "object", - "startupScript": { - "type": "object", - "scriptLocation": { - "type": "string", - "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." - }, - "scriptParameters": { - "type": "string", - "description": "Parameters required for this script if any." + "description": "Specification for initialization scripts to customize this AmlInstance.", + "properties": { + "startupScript": { + "type": "object", + "scriptLocation": { + "type": "string", + "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." + }, + "scriptParameters": { + "type": "string", + "description": "Parameters required for this script if any." + } } } }, "softwareUpdateSettings": { "type": "object", - "osUpdateSettings": { - "type": "object", - "osUpdateType": { - "type": "string", - "default": "Recommended", - "title": "Type of automatic operating system updates to install", - "enum": [ - "Critical", - "Recommended" - ], - "x-ms-enum": { - "name": "osUpdateType", - "modelAsString": true + "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", + "properties": { + "osUpdateSettings": { + "type": "object", + "description": "Specifies policy for installing operation system updates.", + "properties": { + "osUpdateType": { + "type": "string", + "default": "Recommended", + "title": "Type of automatic operating system updates to install", + "enum": [ + "Critical", + "Recommended" + ], + "x-ms-enum": { + "name": "osUpdateType", + "modelAsString": true + } + }, + "updateFrequencyInDays": { + "type": "integer", + "format": "int64", + "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." + }, + "updateHourInUtc": { + "type": "integer", + "format": "int64", + "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." + } } }, - "updateFrequencyInDays": { - "type": "integer", - "format": "int64", - "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." - }, - "updateHourInUtc": { - "type": "integer", - "format": "int64", - "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." - } - }, - "sdkUpdateSettings": { - "type": "object", - "readonly": true, - "availableUpdates": { - "type": "array", - "readonly": true, - "description": "Describes available SDK updates for this compute instance.", - "items": { - "$ref": "#/definitions/AmlInstanceSdkUpdate" + "sdkUpdateSettings": { + "type": "object", + "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", + "properties": { + "updateOnNextStart": { + "type": "string", + "description": "Specifies if any available Azure ML environment updates should be installed on next instance start.", + "default": "Disabled", + "enum": [ + "Disabled", + "Enabled" + ], + "x-ms-enum": { + "name": "updateOnNextStart", + "modelAsString": true + } + }, + "availableUpdates": { + "type": "array", + "readOnly": true, + "description": "Describes available SDK updates for this compute instance.", + "items": { + "$ref": "#/definitions/AmlInstanceSdkUpdate" + } + } } } } }, "sshSettings": { "type": "object", - "sshPublicAccess": { - "type": "string", - "default": "Disabled", - "title": "Access policy for SSH", - "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "sshPublicAccess", - "modelAsString": true - } - }, - "adminCredentials": { - "type": "object", + "description": "Specifies policy and settings for SSH access.", + "properties": { + "sshPublicAccess": { + "type": "string", + "default": "Disabled", + "title": "Access policy for SSH", + "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "sshPublicAccess", + "modelAsString": true + } + }, "adminPublicKey": { "type": "string", "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." @@ -2726,18 +2752,18 @@ "name": "datastoreState", "modelAsString": true }, - "readonly": true + "readOnly": true }, "error": { "type": "string", "description": "Describes the error if datastore could not be successfully mounted on the parent AzureML instance.", - "readonly": true + "readOnly": true } } }, "AmlInstanceSdkUpdate": { "type": "object", - "readonly": true, + "readOnly": true, "properties": { "updateName": { "type": "string", From 1dc7da5648b1bd11611de3640100ba3e8f598d9e Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 25 Sep 2019 17:55:34 -0700 Subject: [PATCH 08/36] Bug fix: Adding missing properties in startupScript object --- .../2019-11-01/machineLearningServices.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 13c129929eef..b1005b1d4195 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2032,13 +2032,16 @@ "properties": { "startupScript": { "type": "object", - "scriptLocation": { - "type": "string", - "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." - }, - "scriptParameters": { - "type": "string", - "description": "Parameters required for this script if any." + "description": "Specifies properties of initialization script to be run during every start of this instance.", + "properties": { + "scriptLocation": { + "type": "string", + "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." + }, + "scriptParameters": { + "type": "string", + "description": "Parameters required for this script if any." + } } } } From a49c4ae194331941508b177b5a23f0928497f351 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 09:55:39 -0700 Subject: [PATCH 09/36] Adding POST APIs for start, stop, and restart operations --- .../2019-11-01/machineLearningServices.json | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index b1005b1d4195..1d6697632267 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -967,6 +967,129 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/start": { + "post": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Start", + "description": "Posts a start action to a compute instance", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/stop": { + "post": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Stop", + "description": "Posts a stop action to a compute instance", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/restart": { + "post": { + "tags": [ + "OperationalizationClusters", + "MachineLearningComputes" + ], + "operationId": "MachineLearningCompute_Restart", + "description": "Posts a restart action to a compute instance", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/WorkspaceNameParameter" + }, + { + "$ref": "#/parameters/ComputeNameParameter" + }, + { + "$ref": "#/parameters/APIVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success.", + "schema": { + "$ref": "#/definitions/ComputeResource" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/MachineLearningServiceError" + } + } + } + } } }, "parameters": { From 7e83290428506a7d05ec9ac70697c588a9cd373f Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 13:02:04 -0700 Subject: [PATCH 10/36] Adding state, lastOperation, lastOperationStatus to AmlInstance compute definition --- .../2019-11-01/machineLearningServices.json | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 1d6697632267..1ac1eeed0d70 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2263,6 +2263,18 @@ "items": { "$ref": "#/definitions/MachineLearningServiceError" } + }, + "state": { + "description": "The current state of this AmlInstance.", + "$ref": "#/definitions/AmlInstanceState" + }, + "lastOperation": { + "description": "Last operation performed on this AmlInstance", + "$ref": "#/definitions/AmlInstanceLastOperation" + }, + "lastOperationStatus": { + "description": "Status of last operation performed on this AmlInstance", + "$ref": "#/definitions/AmlInstanceLastOperationStatus" } } } @@ -2900,6 +2912,58 @@ "description": "Detailed description of the available SDK update." } } + }, + "AmlInstanceState": { + "type": "string", + "description": "Current state of an AmlInstance compute.", + "enum": [ + "Creating", + "Deleting", + "Ready", + "Restarting", + "Running", + "SettingUp", + "SetupFailed", + "Starting", + "Stopped", + "Stopping", + "UserSettingUp", + "UserSetupFailed", + "Unknown", + "Unusable" + ], + "x-ms-enum": { + "name": "AmlInstanceState", + "modelAsString": true + } + }, + "AmlInstanceLastOperation": { + "type": "string", + "description": "Last operation performed on this AmlInstance compute.", + "enum": [ + "Create", + "Delete", + "Restart", + "Start", + "Stop" + ], + "x-ms-enum": { + "name": "AmlInstanceLastOperation", + "modelAsString": true + } + }, + "AmlInstanceLastOperationStatus": { + "type": "string", + "description": "Describes status of last operation performed on this AmlInstance compute.", + "enum": [ + "Failed", + "InProgress", + "Succeeded" + ], + "x-ms-enum": { + "name": "AmlInstanceLastOperationStatus", + "modelAsString": true + } } } } From 385cd5fc826a047a5d13cd794e580c9bc065027c Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 14:55:28 -0700 Subject: [PATCH 11/36] Adding examples for start, stop, restart post actions --- .../examples/restartAmlInstanceCompute.json | 23 +++++++++++++++++++ .../examples/startAmlInstanceCompute.json | 23 +++++++++++++++++++ .../examples/stopAmlInstanceCompute.json | 23 +++++++++++++++++++ .../2019-11-01/machineLearningServices.json | 16 +++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json new file mode 100644 index 000000000000..ed5753e91150 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json @@ -0,0 +1,23 @@ +{ + "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": { + "computeType": "AmlInstance", + "provisioningState": "Updating" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json new file mode 100644 index 000000000000..ed5753e91150 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json @@ -0,0 +1,23 @@ +{ + "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": { + "computeType": "AmlInstance", + "provisioningState": "Updating" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json new file mode 100644 index 000000000000..ed5753e91150 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json @@ -0,0 +1,23 @@ +{ + "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": { + "computeType": "AmlInstance", + "provisioningState": "Updating" + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 1ac1eeed0d70..f492ec915d45 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -976,6 +976,11 @@ ], "operationId": "MachineLearningCompute_Start", "description": "Posts a start action to a compute instance", + "x-ms-examples": { + "Start AmlInstance Compute": { + "$ref": "./examples/startAmlInstanceCompute.json" + } + }, "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -1017,6 +1022,11 @@ ], "operationId": "MachineLearningCompute_Stop", "description": "Posts a stop action to a compute instance", + "x-ms-examples": { + "Stop AmlInstance Compute": { + "$ref": "./examples/stopAmlInstanceCompute.json" + } + }, "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -1058,6 +1068,11 @@ ], "operationId": "MachineLearningCompute_Restart", "description": "Posts a restart action to a compute instance", + "x-ms-examples": { + "Restart AmlInstance Compute": { + "$ref": "./examples/restartAmlInstanceCompute.json" + } + }, "parameters": [ { "$ref": "#/parameters/SubscriptionIdParameter" @@ -2901,6 +2916,7 @@ }, "AmlInstanceSdkUpdate": { "type": "object", + "description": "Describes a specific update for AmlInstance SDK.", "readOnly": true, "properties": { "updateName": { From 4fa488e5aa4a9b4f217aeac2ba0525aa3e439246 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 15:18:59 -0700 Subject: [PATCH 12/36] Adding support for Windows OS in AmlCompute compute type --- .../examples/createBasicAmlCompute.json | 1 + .../2019-11-01/examples/getAmlCompute.json | 1 + .../2019-11-01/machineLearningServices.json | 19 ++++++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json index 5b29a18b028e..576d1acc1525 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createBasicAmlCompute.json @@ -11,6 +11,7 @@ "computeType": "AmlCompute", "properties": { "vmSize": "STANDARD_NC6", + "osType": "Linux", "vmPriority": "Dedicated", "scaleSettings": { "maxNodeCount": 1, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json index 74e8b3851cea..836a3e7cc6b7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlCompute.json @@ -20,6 +20,7 @@ "provisioningState": "Succeeded", "properties": { "vmSize": "STANDARD_NC6", + "osType": "Linux", "vmPriority": "Dedicated", "subnet": "test-subnet-resource-id", "scaleSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index f492ec915d45..06d8b8ad21ac 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2030,6 +2030,23 @@ "modelAsString": true } }, + "osType": { + "type": "string", + "description": "OS Type.", + "enum": [ + "Linux", + "Windows" + ], + "x-ms-enum": { + "name": "osType", + "modelAsString": true + } + }, + "virtualMachineImageId": { + "title": "Custom VM image.", + "description": "The ARM resource identifier of the virtual machine image for the compute nodes. This is of the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{gallery name}/images/{image definition name}/versions/{version id}. The virtual machine image must be in the same region and subscription as the cluster.", + "$ref": "#/definitions/ResourceId" + }, "scaleSettings": { "description": "Scale settings for AML Compute", "$ref": "#/definitions/ScaleSettings" @@ -2519,7 +2536,7 @@ "adminUserSshPublicKey": { "type": "string", "title": "SSH public key.", - "description": "SSH public key of the administrator user account." + "description": "SSH public key of the administrator user account. This property is only supported on Linux based clusters." }, "adminUserPassword": { "type": "string", From c795cc5b6a8ec88374352f327d669e395b283962 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 16:07:25 -0700 Subject: [PATCH 13/36] Refactoring AmlInstance compute specific properties into separate definitions --- .../2019-11-01/machineLearningServices.json | 264 ++++++++++-------- 1 file changed, 144 insertions(+), 120 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 06d8b8ad21ac..67c2ac2e0922 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2156,136 +2156,20 @@ "$ref": "#/definitions/ResourceId" }, "dataStoresMountSettings": { - "type": "object", "description": "Describes what data stores will be mounted on this compute instance.", - "properties": { - "dataStoreSelection": { - "type": "string", - "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", - "default": "All", - "enum": [ - "All", - "UserSpecified" - ], - "x-ms-enum": { - "name": "dataStoreSelection", - "modelAsString": true - } - }, - "dataStores": { - "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", - "type": "array", - "items": { - "$ref": "#/definitions/AmlInstanceDatastore" - } - } - } + "$ref": "#/definitions/AmlInstanceDataStoresMountSettings" }, "customScriptSettings": { - "type": "object", "description": "Specification for initialization scripts to customize this AmlInstance.", - "properties": { - "startupScript": { - "type": "object", - "description": "Specifies properties of initialization script to be run during every start of this instance.", - "properties": { - "scriptLocation": { - "type": "string", - "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." - }, - "scriptParameters": { - "type": "string", - "description": "Parameters required for this script if any." - } - } - } - } + "$ref": "#/definitions/AmlInstanceCustomScriptSettings" }, "softwareUpdateSettings": { - "type": "object", "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "properties": { - "osUpdateSettings": { - "type": "object", - "description": "Specifies policy for installing operation system updates.", - "properties": { - "osUpdateType": { - "type": "string", - "default": "Recommended", - "title": "Type of automatic operating system updates to install", - "enum": [ - "Critical", - "Recommended" - ], - "x-ms-enum": { - "name": "osUpdateType", - "modelAsString": true - } - }, - "updateFrequencyInDays": { - "type": "integer", - "format": "int64", - "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." - }, - "updateHourInUtc": { - "type": "integer", - "format": "int64", - "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." - } - } - }, - "sdkUpdateSettings": { - "type": "object", - "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", - "properties": { - "updateOnNextStart": { - "type": "string", - "description": "Specifies if any available Azure ML environment updates should be installed on next instance start.", - "default": "Disabled", - "enum": [ - "Disabled", - "Enabled" - ], - "x-ms-enum": { - "name": "updateOnNextStart", - "modelAsString": true - } - }, - "availableUpdates": { - "type": "array", - "readOnly": true, - "description": "Describes available SDK updates for this compute instance.", - "items": { - "$ref": "#/definitions/AmlInstanceSdkUpdate" - } - } - } - } - } + "$ref": "#/definitions/AmlInstanceSoftwareUpdateSettings" }, "sshSettings": { - "type": "object", "description": "Specifies policy and settings for SSH access.", - "properties": { - "sshPublicAccess": { - "type": "string", - "default": "Disabled", - "title": "Access policy for SSH", - "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable.", - "enum": [ - "Enabled", - "Disabled" - ], - "x-ms-enum": { - "name": "sshPublicAccess", - "modelAsString": true - } - }, - "adminPublicKey": { - "type": "string", - "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." - } - } + "$ref": "#/definitions/AmlInstanceSshSettings" }, "errors": { "readOnly": true, @@ -2931,6 +2815,81 @@ } } }, + "AmlInstanceDataStoresMountSettings": { + "type": "object", + "description": "Describes what data stores will be mounted on this compute instance.", + "properties": { + "dataStoreSelection": { + "type": "string", + "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", + "default": "All", + "enum": [ + "All", + "UserSpecified" + ], + "x-ms-enum": { + "name": "dataStoreSelection", + "modelAsString": true + } + }, + "dataStores": { + "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", + "type": "array", + "items": { + "$ref": "#/definitions/AmlInstanceDatastore" + } + } + } + }, + "AmlInstanceCustomScriptSettings": { + "type": "object", + "description": "Specification for initialization scripts to customize this AmlInstance.", + "properties": { + "startupScript": { + "type": "object", + "description": "Specifies properties of initialization script to be run during every start of this instance.", + "properties": { + "scriptLocation": { + "type": "string", + "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." + }, + "scriptParameters": { + "type": "string", + "description": "Parameters required for this script if any." + } + } + } + } + }, + "AmlInstanceOSUpdateSettings": { + "type": "object", + "description": "Specifies policy for installing operation system updates.", + "properties": { + "osUpdateType": { + "type": "string", + "default": "Recommended", + "title": "Type of automatic operating system updates to install", + "enum": [ + "Critical", + "Recommended" + ], + "x-ms-enum": { + "name": "osUpdateType", + "modelAsString": true + } + }, + "updateFrequencyInDays": { + "type": "integer", + "format": "int64", + "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." + }, + "updateHourInUtc": { + "type": "integer", + "format": "int64", + "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." + } + } + }, "AmlInstanceSdkUpdate": { "type": "object", "description": "Describes a specific update for AmlInstance SDK.", @@ -2946,6 +2905,71 @@ } } }, + "AmlInstanceSdkUpdateSettings": { + "type": "object", + "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", + "properties": { + "updateOnNextStart": { + "type": "string", + "description": "Specifies if any available Azure ML environment updates should be installed on next instance start.", + "default": "Disabled", + "enum": [ + "Disabled", + "Enabled" + ], + "x-ms-enum": { + "name": "updateOnNextStart", + "modelAsString": true + } + }, + "availableUpdates": { + "type": "array", + "readOnly": true, + "description": "Describes available SDK updates for this compute instance.", + "items": { + "$ref": "#/definitions/AmlInstanceSdkUpdate" + } + } + } + }, + "AmlInstanceSoftwareUpdateSettings": { + "type": "object", + "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", + "properties": { + "osUpdateSettings": { + "description": "Specifies policy for installing operation system updates.", + "$ref": "#/definitions/AmlInstanceOSUpdateSettings" + }, + "sdkUpdateSettings": { + "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", + "$ref": "#/definitions/AmlInstanceSdkUpdateSettings" + } + } + }, + "AmlInstanceSshSettings": { + "type": "object", + "description": "Specifies policy and settings for SSH access.", + "properties": { + "sshPublicAccess": { + "type": "string", + "default": "Disabled", + "title": "Access policy for SSH", + "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on this instance. Enabled - Indicates that the public ssh port is open and accessible according to the VNet/subnet policy if applicable.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "sshPublicAccess", + "modelAsString": true + } + }, + "adminPublicKey": { + "type": "string", + "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." + } + } + }, "AmlInstanceState": { "type": "string", "description": "Current state of an AmlInstance compute.", From de6aebce6b71fc721cd1835dcf44b775b785dd8d Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 16:24:01 -0700 Subject: [PATCH 14/36] Adding AmlInstance compute updatable properties to ClusterUpdateProperties definition --- .../2019-11-01/machineLearningServices.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 67c2ac2e0922..67c0c0d8b1ad 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2509,6 +2509,22 @@ "$ref": "#/definitions/ScaleSettings", "title": "Scale settings.", "description": "Desired scale settings for the amlCompute." + }, + "dataStoresMountSettings": { + "description": "Describes what data stores will be mounted on this compute instance.", + "$ref": "#/definitions/AmlInstanceDataStoresMountSettings" + }, + "customScriptSettings": { + "description": "Specification for initialization scripts to customize this AmlInstance.", + "$ref": "#/definitions/AmlInstanceCustomScriptSettings" + }, + "softwareUpdateSettings": { + "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", + "$ref": "#/definitions/AmlInstanceSoftwareUpdateSettings" + }, + "sshSettings": { + "description": "Specifies policy and settings for SSH access.", + "$ref": "#/definitions/AmlInstanceSshSettings" } }, "description": "The properties of a amlCompute that need to be updated." From 9df4d8264b2fcffcf187b2fa8df5f3e313262f94 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 16:43:58 -0700 Subject: [PATCH 15/36] Adding examples for creating AmlInstance compute --- .../examples/createAmlInstanceCompute.json | 73 +++++++++++++++++++ .../createAmlInstanceComputeMinimal.json | 47 ++++++++++++ .../2019-11-01/machineLearningServices.json | 15 +++- 3 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json new file mode 100644 index 000000000000..c5b7575246f2 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json @@ -0,0 +1,73 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "testrg123", + "workspaceName": "workspaces123", + "computeName": "compute123", + "api-version": "2019-11-01", + "parameters": { + "location": "eastus", + "properties": { + "computeType": "AmlInstance", + "properties": { + "vmSize": "STANDARD_NC6", + "dataStoresMountSettings": { + "dataStoreSelection": "UserSpecified", + "dataStores": [ + { + "name": "dataStore1" + } + ] + }, + "customScriptSettings": { + "startupScript": { + "scriptLocation": "\\scripts\\script1.sh" + } + }, + "softwareUpdateSettings": { + "osUpdateSettings": { + "osUpdateType": "Recommended", + "updateFrequencyInDays": 14, + "updateHourInUtc": 8 + }, + "sdkUpdateSettings": { + "updateOnNextStart": "Enabled" + } + }, + "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": "AmlInstance", + "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": "AmlInstance", + "provisioningState": "Creating" + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json new file mode 100644 index 000000000000..52cfb10b923c --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json @@ -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": "AmlInstance", + "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": "AmlInstance", + "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": "AmlInstance", + "provisioningState": "Creating" + } + }, + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/...pathToOperationStatus..." + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 67c0c0d8b1ad..62f1aa95c6a2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -704,6 +704,12 @@ "Create a AML Compute": { "$ref": "./examples/createBasicAmlCompute.json" }, + "Create an AmlInstance Compute with minimal inputs": { + "$ref": "./examples/createAmlInstanceComputeMinimal.json" + }, + "Create an AmlInstance Compute": { + "$ref": "./examples/createAmlInstanceCompute.json" + }, "Create AKS Compute": { "$ref": "./examples/createBasicAKSCompute.json" }, @@ -2182,15 +2188,18 @@ }, "state": { "description": "The current state of this AmlInstance.", - "$ref": "#/definitions/AmlInstanceState" + "$ref": "#/definitions/AmlInstanceState", + "readOnly": true }, "lastOperation": { "description": "Last operation performed on this AmlInstance", - "$ref": "#/definitions/AmlInstanceLastOperation" + "$ref": "#/definitions/AmlInstanceLastOperation", + "readOnly": true }, "lastOperationStatus": { "description": "Status of last operation performed on this AmlInstance", - "$ref": "#/definitions/AmlInstanceLastOperationStatus" + "$ref": "#/definitions/AmlInstanceLastOperationStatus", + "readOnly": true } } } From e16d41e4ab84e408c7cda54af0016e335c3b9b43 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 17:10:13 -0700 Subject: [PATCH 16/36] Adding example for get AmlInstance --- .../examples/createAmlInstanceCompute.json | 1 + .../examples/getAmlInstanceCompute.json | 65 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json index c5b7575246f2..7192512d56ee 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json @@ -11,6 +11,7 @@ "computeType": "AmlInstance", "properties": { "vmSize": "STANDARD_NC6", + "subnet": "test-subnet-resource-id", "dataStoresMountSettings": { "dataStoreSelection": "UserSpecified", "dataStores": [ diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json new file mode 100644 index 000000000000..bea4f8405e78 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -0,0 +1,65 @@ +{ + "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": "eastus2", + "properties": { + "description": "some compute", + "computeType": "AmlInstance", + "createdOn": "2017-09-26T22:28:08.327Z", + "provisioningState": "Succeeded", + "properties": { + "vmSize": "STANDARD_NC6", + "subnet": "test-subnet-resource-id", + "dataStoresMountSettings": { + "dataStoreSelection": "UserSpecified", + "dataStores": [ + { + "name": "dataStore1" + } + ] + }, + "customScriptSettings": { + "startupScript": { + "scriptLocation": "\\scripts\\script1.sh" + } + }, + "softwareUpdateSettings": { + "osUpdateSettings": { + "osUpdateType": "Recommended", + "updateFrequencyInDays": 14, + "updateHourInUtc": 8 + }, + "sdkUpdateSettings": { + "updateOnNextStart": "Enabled", + "availableUpdates": [ + { + "updateName": "some update", + "updateDescription": "SDK version 1.0" + } + ] + } + }, + "sshSettings": { + "sshPublicAccess": "Disabled" + }, + "errors": null, + "state": "Running", + "lastOperation": "Create", + "lastOperationStatus": "Succeeded" + } + } + } + } + } +} From ce2f9b2d621685b5b91da4e100bb00347e32006c Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 26 Sep 2019 17:11:59 -0700 Subject: [PATCH 17/36] Referring to get AmlInstance example in swagger --- .../stable/2019-11-01/machineLearningServices.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 62f1aa95c6a2..9ee69a64e09f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -658,6 +658,9 @@ }, "Get a AML Compute": { "$ref": "./examples/getAmlCompute.json" + }, + "Get an AmlInstance compute": { + "$ref": "./examples/getAmlInstanceCompute.json" } }, "parameters": [ From 11f66c4794fa156e1170a18b56d12b8f22a551ee Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 27 Sep 2019 11:06:30 -0700 Subject: [PATCH 18/36] Adding scriptLogLocation as readOnly to custom scripts and updating examples --- .../stable/2019-11-01/examples/getAmlInstanceCompute.json | 7 +++++-- .../stable/2019-11-01/machineLearningServices.json | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index bea4f8405e78..25bc73d1dd34 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -25,13 +25,16 @@ "dataStoreSelection": "UserSpecified", "dataStores": [ { - "name": "dataStore1" + "name": "dataStore1", + "state": "Mounted", + "error": "" } ] }, "customScriptSettings": { "startupScript": { - "scriptLocation": "\\scripts\\script1.sh" + "scriptLocation": "\\scripts\\script1.sh", + "scriptLogLocation": "\\logs\\compute123\\scripts\\script1.log" } }, "softwareUpdateSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 9ee69a64e09f..9af416106efe 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2828,7 +2828,8 @@ "description": "Current state of the datastore on the parent AzureML instance.", "enum": [ "Mounted", - "MountFailed" + "MountFailed", + "Unmounted" ], "x-ms-enum": { "name": "datastoreState", @@ -2884,6 +2885,11 @@ "scriptParameters": { "type": "string", "description": "Parameters required for this script if any." + }, + "scriptLogLocation": { + "type": "string", + "description": "Location of the script's output logs in the default fileshare." + "readOnly": true } } } From 5b9bb9ab05c059eb9ac80bdbc5de601b45a80d36 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 27 Sep 2019 11:12:03 -0700 Subject: [PATCH 19/36] Fixing a bug in latest update --- .../stable/2019-11-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 9af416106efe..8448ebddb2cc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2888,7 +2888,7 @@ }, "scriptLogLocation": { "type": "string", - "description": "Location of the script's output logs in the default fileshare." + "description": "Location of the script's output logs in the default fileshare.", "readOnly": true } } From 18f28ec87c3bd48a5a4ffd60ef94ffc9f02d9d50 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 12:47:01 -0700 Subject: [PATCH 20/36] Adding connectivityEndpoints and createdBy as readOnly properties to AmlInstance spec --- .../examples/getAmlInstanceCompute.json | 11 ++++ .../2019-11-01/machineLearningServices.json | 66 +++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index 25bc73d1dd34..dfae2b7a4e99 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -56,6 +56,17 @@ "sshSettings": { "sshPublicAccess": "Disabled" }, + "createdBy": { + "userName": "foobar@microsoft.com", + "userOrgId": "00000000-0000-0000-0000-000000000000", + "userId": "00000000-0000-0000-0000-000000000000" + }, + "connectivityEndpoints": { + "publicIpAddress": "10.0.0.1", + "applicationUris": [ + { "applicationName": "Jupyter", "applicationUri": "https://compute123.eastus2.azureml.net/jupyter"} + ] + }, "errors": null, "state": "Running", "lastOperation": "Create", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 8448ebddb2cc..2a5f6f8b0006 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2180,6 +2180,16 @@ "description": "Specifies policy and settings for SSH access.", "$ref": "#/definitions/AmlInstanceSshSettings" }, + "connectivityEndpoints": { + "readOnly": true, + "description": "Describes all connectivity endpoints available for this AmlInstance compute.", + "$ref": "#/definitions/AmlInstanceConnectivityEndpoints" + }, + "createdBy": { + "readOnly": true, + "description": "Describes information on user who created this AmlInstance compute.", + "$ref": "#/definitions/AmlInstanceCreatedBy" + }, "errors": { "readOnly": true, "title": "Errors.", @@ -3055,6 +3065,62 @@ "name": "AmlInstanceLastOperationStatus", "modelAsString": true } + }, + "AmlInstanceApplicationUri": { + "type": "object", + "description": "Defines an Aml Instance application and its connectivity endpoint URI.", + "properties": { + "applicationName": { + "type": "string", + "description": "Name of the AmlInstance application." + }, + "applicationUri": { + "type": "string", + "description": "Application' endpoint URI." + } + } + }, + "AmlInstanceConnectivityEndpoints": { + "type": "object", + "readOnly": true, + "description": "Defines all connectivity endpoints and properties for an AmlInstance compute.", + "properties": { + "publicIpAddress": { + "type": "string", + "readOnly": true, + "description": "Public IP Address of this AmlInstance." + }, + "applicationUris": { + "type": "array", + "readOnly": true, + "description": "Describes available applications and their connectivity endpoint URIs.", + "items": { + "$ref": "#/definitions/AmlInstanceApplicationUri" + } + } + } + }, + "AmlInstanceCreatedBy": { + "type": "object", + "readOnly": true, + "description": "Describes information on user who created this AmlInstance compute.", + "properties": { + "userName": { + "type": "string", + "readOnly": true, + "description": "Name of the user." + }, + "userOrgId": { + "type": "string", + "readOnly": true, + "description": "Uniquely identifies user' Azure Active Directory organization." + }, + "userId": { + "type": "string", + "readOnly": true, + "description": "Uniquely identifies the user within his/her organization." + } + } } } } From 0ed4a6fa09ded6f51f3ab5af28844f7b799bb9c5 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 12:58:44 -0700 Subject: [PATCH 21/36] Removing lastOperation and lastOperationStatus properties from AmlInstance --- .../examples/getAmlInstanceCompute.json | 4 +- .../2019-11-01/machineLearningServices.json | 50 +++---------------- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index dfae2b7a4e99..2ccb6584a98d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -68,9 +68,7 @@ ] }, "errors": null, - "state": "Running", - "lastOperation": "Create", - "lastOperationStatus": "Succeeded" + "state": "Running" } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 2a5f6f8b0006..3f1c31531e44 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2185,11 +2185,11 @@ "description": "Describes all connectivity endpoints available for this AmlInstance compute.", "$ref": "#/definitions/AmlInstanceConnectivityEndpoints" }, - "createdBy": { - "readOnly": true, + "createdBy": { + "readOnly": true, "description": "Describes information on user who created this AmlInstance compute.", "$ref": "#/definitions/AmlInstanceCreatedBy" - }, + }, "errors": { "readOnly": true, "title": "Errors.", @@ -2203,16 +2203,6 @@ "description": "The current state of this AmlInstance.", "$ref": "#/definitions/AmlInstanceState", "readOnly": true - }, - "lastOperation": { - "description": "Last operation performed on this AmlInstance", - "$ref": "#/definitions/AmlInstanceLastOperation", - "readOnly": true - }, - "lastOperationStatus": { - "description": "Status of last operation performed on this AmlInstance", - "$ref": "#/definitions/AmlInstanceLastOperationStatus", - "readOnly": true } } } @@ -3019,17 +3009,19 @@ "description": "Current state of an AmlInstance compute.", "enum": [ "Creating", + "CreateFailed", "Deleting", "Ready", "Restarting", + "RestartFailed", "Running", "SettingUp", - "SetupFailed", "Starting", + "StartFailed", + "StopFailed", "Stopped", "Stopping", "UserSettingUp", - "UserSetupFailed", "Unknown", "Unusable" ], @@ -3038,34 +3030,6 @@ "modelAsString": true } }, - "AmlInstanceLastOperation": { - "type": "string", - "description": "Last operation performed on this AmlInstance compute.", - "enum": [ - "Create", - "Delete", - "Restart", - "Start", - "Stop" - ], - "x-ms-enum": { - "name": "AmlInstanceLastOperation", - "modelAsString": true - } - }, - "AmlInstanceLastOperationStatus": { - "type": "string", - "description": "Describes status of last operation performed on this AmlInstance compute.", - "enum": [ - "Failed", - "InProgress", - "Succeeded" - ], - "x-ms-enum": { - "name": "AmlInstanceLastOperationStatus", - "modelAsString": true - } - }, "AmlInstanceApplicationUri": { "type": "object", "description": "Defines an Aml Instance application and its connectivity endpoint URI.", From 492e87e23367d2e5dd12644ccceab86b586aed08 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 13:02:02 -0700 Subject: [PATCH 22/36] Adding updateVersion property as string to available SDK updates in AmlInstance --- .../2019-11-01/examples/getAmlInstanceCompute.json | 3 ++- .../stable/2019-11-01/machineLearningServices.json | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index 2ccb6584a98d..c0c852e78606 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -48,7 +48,8 @@ "availableUpdates": [ { "updateName": "some update", - "updateDescription": "SDK version 1.0" + "updateDescription": "SDK version 1.0", + "updateVersion": "1.0" } ] } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 3f1c31531e44..a82d9f4c6aee 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2936,7 +2936,11 @@ "updateDescription": { "type": "string", "description": "Detailed description of the available SDK update." - } + }, + "updateVersion": { + "type": "string", + "description": "Version of this available update." + } } }, "AmlInstanceSdkUpdateSettings": { @@ -3009,16 +3013,16 @@ "description": "Current state of an AmlInstance compute.", "enum": [ "Creating", - "CreateFailed", + "CreateFailed", "Deleting", "Ready", "Restarting", - "RestartFailed", + "RestartFailed", "Running", "SettingUp", "Starting", - "StartFailed", - "StopFailed", + "StartFailed", + "StopFailed", "Stopped", "Stopping", "UserSettingUp", From 9d38cc13d34384c166a8f886e424d9cac2965baa Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 13:04:39 -0700 Subject: [PATCH 23/36] Removing scriptLogLocation from AmlInstance custom script properties --- .../2019-11-01/examples/getAmlInstanceCompute.json | 3 +-- .../stable/2019-11-01/machineLearningServices.json | 13 ++++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index c0c852e78606..c8941b975723 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -33,8 +33,7 @@ }, "customScriptSettings": { "startupScript": { - "scriptLocation": "\\scripts\\script1.sh", - "scriptLogLocation": "\\logs\\compute123\\scripts\\script1.log" + "scriptLocation": "\\scripts\\script1.sh" } }, "softwareUpdateSettings": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index a82d9f4c6aee..979abe74b3e7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2885,11 +2885,6 @@ "scriptParameters": { "type": "string", "description": "Parameters required for this script if any." - }, - "scriptLogLocation": { - "type": "string", - "description": "Location of the script's output logs in the default fileshare.", - "readOnly": true } } } @@ -2937,10 +2932,10 @@ "type": "string", "description": "Detailed description of the available SDK update." }, - "updateVersion": { - "type": "string", - "description": "Version of this available update." - } + "updateVersion": { + "type": "string", + "description": "Version of this available update." + } } }, "AmlInstanceSdkUpdateSettings": { From 3c4687b3bfbda1785d56469947d8c35d4bc518f8 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 13:16:23 -0700 Subject: [PATCH 24/36] Addressing code review comments --- .../examples/createAmlInstanceCompute.json | 8 +++--- .../examples/getAmlInstanceCompute.json | 6 ++--- .../2019-11-01/machineLearningServices.json | 26 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json index 7192512d56ee..df76af8a2ec7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json @@ -12,11 +12,11 @@ "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", - "dataStoresMountSettings": { - "dataStoreSelection": "UserSpecified", - "dataStores": [ + "datastoresMountSettings": { + "datastoreSelection": "UserSpecified", + "datastores": [ { - "name": "dataStore1" + "name": "datastore1" } ] }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index c8941b975723..536143be2d6f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -21,9 +21,9 @@ "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", - "dataStoresMountSettings": { - "dataStoreSelection": "UserSpecified", - "dataStores": [ + "datastoresMountSettings": { + "datastoreSelection": "UserSpecified", + "datastores": [ { "name": "dataStore1", "state": "Mounted", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 979abe74b3e7..ced6b9a23474 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2164,9 +2164,9 @@ "description": "Virtual network subnet resource ID the compute nodes belong to.", "$ref": "#/definitions/ResourceId" }, - "dataStoresMountSettings": { + "datastoresMountSettings": { "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/AmlInstanceDataStoresMountSettings" + "$ref": "#/definitions/AmlInstanceDatastoresMountSettings" }, "customScriptSettings": { "description": "Specification for initialization scripts to customize this AmlInstance.", @@ -2522,9 +2522,9 @@ "title": "Scale settings.", "description": "Desired scale settings for the amlCompute." }, - "dataStoresMountSettings": { + "datastoresMountSettings": { "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/AmlInstanceDataStoresMountSettings" + "$ref": "#/definitions/AmlInstanceDatastoresMountSettings" }, "customScriptSettings": { "description": "Specification for initialization scripts to customize this AmlInstance.", @@ -2844,11 +2844,11 @@ } } }, - "AmlInstanceDataStoresMountSettings": { + "AmlInstanceDatastoresMountSettings": { "type": "object", "description": "Describes what data stores will be mounted on this compute instance.", "properties": { - "dataStoreSelection": { + "datastoreSelection": { "type": "string", "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", "default": "All", @@ -2857,11 +2857,11 @@ "UserSpecified" ], "x-ms-enum": { - "name": "dataStoreSelection", + "name": "datastoreSelection", "modelAsString": true } }, - "dataStores": { + "datastores": { "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", "type": "array", "items": { @@ -2880,7 +2880,7 @@ "properties": { "scriptLocation": { "type": "string", - "description": "The location of customization script. Could be a URI or a relative file path in the default fileshare in the parent workspace." + "description": "The location of customization script. This is a relative file path in the default fileshare in the parent workspace." }, "scriptParameters": { "type": "string", @@ -2909,13 +2909,13 @@ }, "updateFrequencyInDays": { "type": "integer", - "format": "int64", - "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days." + "format": "int32", + "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days. Default frequency will be 14 days." }, "updateHourInUtc": { "type": "integer", - "format": "int64", - "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot." + "format": "int32", + "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot. Default update hour will be 2 AM UTC." } } }, From f0bdbdec810beb58734e85ee1209e821d42b9165 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Tue, 1 Oct 2019 14:52:04 -0700 Subject: [PATCH 25/36] Adding adminUserName as readOnly property to AmlInstanceSshSettings --- .../stable/2019-11-01/examples/getAmlInstanceCompute.json | 3 ++- .../stable/2019-11-01/machineLearningServices.json | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json index 536143be2d6f..1ee63f3533c8 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json @@ -54,7 +54,8 @@ } }, "sshSettings": { - "sshPublicAccess": "Disabled" + "sshPublicAccess": "Enabled", + "adminUserName": "azureuser" }, "createdBy": { "userName": "foobar@microsoft.com", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index ced6b9a23474..4d6dc8bdbd03 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2996,6 +2996,11 @@ "name": "sshPublicAccess", "modelAsString": true } + }, + "adminUserName": { + "type": "string", + "readOnly": true, + "description": "Describes the admin user name." }, "adminPublicKey": { "type": "string", From fe1846c46ebd775503f9b15b159c494537ff1201 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 4 Oct 2019 12:11:39 -0700 Subject: [PATCH 26/36] Renaming AmlInstance to ComputeInstance --- ...ompute.json => createComputeInstance.json} | 6 +- ...json => createComputeInstanceMinimal.json} | 6 +- ...ceCompute.json => getComputeInstance.json} | 4 +- ...mpute.json => restartComputeInstance.json} | 2 +- ...Compute.json => startComputeInstance.json} | 2 +- ...eCompute.json => stopComputeInstance.json} | 2 +- .../2019-11-01/machineLearningServices.json | 114 +++++++++--------- 7 files changed, 68 insertions(+), 68 deletions(-) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{createAmlInstanceCompute.json => createComputeInstance.json} (94%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{createAmlInstanceComputeMinimal.json => createComputeInstanceMinimal.json} (91%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{getAmlInstanceCompute.json => getComputeInstance.json} (96%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{stopAmlInstanceCompute.json => restartComputeInstance.json} (93%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{startAmlInstanceCompute.json => startComputeInstance.json} (94%) rename specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/{restartAmlInstanceCompute.json => stopComputeInstance.json} (93%) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json similarity index 94% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json index df76af8a2ec7..fd91d3a423e6 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json @@ -8,7 +8,7 @@ "parameters": { "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", @@ -50,7 +50,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Creating" } } @@ -62,7 +62,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Creating" } }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstanceMinimal.json similarity index 91% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstanceMinimal.json index 52cfb10b923c..8dbc6d3872ae 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createAmlInstanceComputeMinimal.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstanceMinimal.json @@ -8,7 +8,7 @@ "parameters": { "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "properties": { "vmSize": "STANDARD_NC6" } @@ -23,7 +23,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Creating" } } @@ -35,7 +35,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Creating" } }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json similarity index 96% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json index 1ee63f3533c8..cb8707ecb686 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json @@ -15,7 +15,7 @@ "location": "eastus2", "properties": { "description": "some compute", - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "createdOn": "2017-09-26T22:28:08.327Z", "provisioningState": "Succeeded", "properties": { @@ -55,7 +55,7 @@ }, "sshSettings": { "sshPublicAccess": "Enabled", - "adminUserName": "azureuser" + "adminUserName": "azureuser" }, "createdBy": { "userName": "foobar@microsoft.com", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json similarity index 93% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json index ed5753e91150..1b6dcf92f471 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json @@ -14,7 +14,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Updating" } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json similarity index 94% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json index ed5753e91150..1fe1ceace8fa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json @@ -14,7 +14,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "Computenstance", "provisioningState": "Updating" } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json similarity index 93% rename from specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json rename to specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json index ed5753e91150..1b6dcf92f471 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartAmlInstanceCompute.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json @@ -14,7 +14,7 @@ "name": "compute123", "location": "eastus", "properties": { - "computeType": "AmlInstance", + "computeType": "ComputeInstance", "provisioningState": "Updating" } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 4d6dc8bdbd03..845ae52f9267 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -659,8 +659,8 @@ "Get a AML Compute": { "$ref": "./examples/getAmlCompute.json" }, - "Get an AmlInstance compute": { - "$ref": "./examples/getAmlInstanceCompute.json" + "Get an ComputeInstance": { + "$ref": "./examples/getComputeInstance.json" } }, "parameters": [ @@ -707,11 +707,11 @@ "Create a AML Compute": { "$ref": "./examples/createBasicAmlCompute.json" }, - "Create an AmlInstance Compute with minimal inputs": { - "$ref": "./examples/createAmlInstanceComputeMinimal.json" + "Create an ComputeInstance Compute with minimal inputs": { + "$ref": "./examples/createComputeInstanceMinimal.json" }, - "Create an AmlInstance Compute": { - "$ref": "./examples/createAmlInstanceCompute.json" + "Create an ComputeInstance Compute": { + "$ref": "./examples/createComputeInstance.json" }, "Create AKS Compute": { "$ref": "./examples/createBasicAKSCompute.json" @@ -986,8 +986,8 @@ "operationId": "MachineLearningCompute_Start", "description": "Posts a start action to a compute instance", "x-ms-examples": { - "Start AmlInstance Compute": { - "$ref": "./examples/startAmlInstanceCompute.json" + "Start ComputeInstance Compute": { + "$ref": "./examples/startComputeInstance.json" } }, "parameters": [ @@ -1032,8 +1032,8 @@ "operationId": "MachineLearningCompute_Stop", "description": "Posts a stop action to a compute instance", "x-ms-examples": { - "Stop AmlInstance Compute": { - "$ref": "./examples/stopAmlInstanceCompute.json" + "Stop ComputeInstance Compute": { + "$ref": "./examples/stopComputeInstance.json" } }, "parameters": [ @@ -1078,8 +1078,8 @@ "operationId": "MachineLearningCompute_Restart", "description": "Posts a restart action to a compute instance", "x-ms-examples": { - "Restart AmlInstance Compute": { - "$ref": "./examples/restartAmlInstanceCompute.json" + "Restart ComputeInstance Compute": { + "$ref": "./examples/restartComputeInstance.json" } }, "parameters": [ @@ -2142,7 +2142,7 @@ ], "x-ms-discriminator-value": "AmlCompute" }, - "AmlInstance": { + "ComputeInstance": { "description": "An Azure Machine Learning instance.", "allOf": [ { @@ -2166,29 +2166,29 @@ }, "datastoresMountSettings": { "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/AmlInstanceDatastoresMountSettings" + "$ref": "#/definitions/ComputeInstanceDatastoresMountSettings" }, "customScriptSettings": { - "description": "Specification for initialization scripts to customize this AmlInstance.", - "$ref": "#/definitions/AmlInstanceCustomScriptSettings" + "description": "Specification for initialization scripts to customize this ComputeInstance.", + "$ref": "#/definitions/ComputeInstanceCustomScriptSettings" }, "softwareUpdateSettings": { "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/AmlInstanceSoftwareUpdateSettings" + "$ref": "#/definitions/ComputeInstanceSoftwareUpdateSettings" }, "sshSettings": { "description": "Specifies policy and settings for SSH access.", - "$ref": "#/definitions/AmlInstanceSshSettings" + "$ref": "#/definitions/ComputeInstanceSshSettings" }, "connectivityEndpoints": { "readOnly": true, - "description": "Describes all connectivity endpoints available for this AmlInstance compute.", - "$ref": "#/definitions/AmlInstanceConnectivityEndpoints" + "description": "Describes all connectivity endpoints available for this ComputeInstance.", + "$ref": "#/definitions/ComputeInstanceConnectivityEndpoints" }, "createdBy": { "readOnly": true, - "description": "Describes information on user who created this AmlInstance compute.", - "$ref": "#/definitions/AmlInstanceCreatedBy" + "description": "Describes information on user who created this ComputeInstance.", + "$ref": "#/definitions/ComputeInstanceCreatedBy" }, "errors": { "readOnly": true, @@ -2200,8 +2200,8 @@ } }, "state": { - "description": "The current state of this AmlInstance.", - "$ref": "#/definitions/AmlInstanceState", + "description": "The current state of this ComputeInstance.", + "$ref": "#/definitions/ComputeInstanceState", "readOnly": true } } @@ -2209,7 +2209,7 @@ } } ], - "x-ms-discriminator-value": "AmlInstance" + "x-ms-discriminator-value": "ComputeInstance" }, "VirtualMachine": { "description": "A Machine Learning compute based on Azure Virtual Machines.", @@ -2524,19 +2524,19 @@ }, "datastoresMountSettings": { "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/AmlInstanceDatastoresMountSettings" + "$ref": "#/definitions/ComputeInstanceDatastoresMountSettings" }, "customScriptSettings": { - "description": "Specification for initialization scripts to customize this AmlInstance.", - "$ref": "#/definitions/AmlInstanceCustomScriptSettings" + "description": "Specification for initialization scripts to customize this ComputeInstance.", + "$ref": "#/definitions/ComputeInstanceCustomScriptSettings" }, "softwareUpdateSettings": { "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/AmlInstanceSoftwareUpdateSettings" + "$ref": "#/definitions/ComputeInstanceSoftwareUpdateSettings" }, "sshSettings": { "description": "Specifies policy and settings for SSH access.", - "$ref": "#/definitions/AmlInstanceSshSettings" + "$ref": "#/definitions/ComputeInstanceSshSettings" } }, "description": "The properties of a amlCompute that need to be updated." @@ -2750,7 +2750,7 @@ "enum": [ "AKS", "AmlCompute", - "AmlInstance", + "ComputeInstance", "DataFactory", "VirtualMachine", "HDInsight", @@ -2815,7 +2815,7 @@ "message" ] }, - "AmlInstanceDatastore": { + "ComputeInstanceDatastore": { "type": "object", "description": "Represents specification for datastore requested to be mounted on an AzureML instance as well as its mounting status.", "properties": { @@ -2844,7 +2844,7 @@ } } }, - "AmlInstanceDatastoresMountSettings": { + "ComputeInstanceDatastoresMountSettings": { "type": "object", "description": "Describes what data stores will be mounted on this compute instance.", "properties": { @@ -2865,14 +2865,14 @@ "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", "type": "array", "items": { - "$ref": "#/definitions/AmlInstanceDatastore" + "$ref": "#/definitions/ComputeInstanceDatastore" } } } }, - "AmlInstanceCustomScriptSettings": { + "ComputeInstanceCustomScriptSettings": { "type": "object", - "description": "Specification for initialization scripts to customize this AmlInstance.", + "description": "Specification for initialization scripts to customize this ComputeInstance.", "properties": { "startupScript": { "type": "object", @@ -2890,7 +2890,7 @@ } } }, - "AmlInstanceOSUpdateSettings": { + "ComputeInstanceOSUpdateSettings": { "type": "object", "description": "Specifies policy for installing operation system updates.", "properties": { @@ -2899,7 +2899,7 @@ "default": "Recommended", "title": "Type of automatic operating system updates to install", "enum": [ - "Critical", + "Security", "Recommended" ], "x-ms-enum": { @@ -2919,9 +2919,9 @@ } } }, - "AmlInstanceSdkUpdate": { + "ComputeInstanceSdkUpdate": { "type": "object", - "description": "Describes a specific update for AmlInstance SDK.", + "description": "Describes a specific update for ComputeInstance SDK.", "readOnly": true, "properties": { "updateName": { @@ -2938,7 +2938,7 @@ } } }, - "AmlInstanceSdkUpdateSettings": { + "ComputeInstanceSdkUpdateSettings": { "type": "object", "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", "properties": { @@ -2960,26 +2960,26 @@ "readOnly": true, "description": "Describes available SDK updates for this compute instance.", "items": { - "$ref": "#/definitions/AmlInstanceSdkUpdate" + "$ref": "#/definitions/ComputeInstanceSdkUpdate" } } } }, - "AmlInstanceSoftwareUpdateSettings": { + "ComputeInstanceSoftwareUpdateSettings": { "type": "object", "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", "properties": { "osUpdateSettings": { "description": "Specifies policy for installing operation system updates.", - "$ref": "#/definitions/AmlInstanceOSUpdateSettings" + "$ref": "#/definitions/ComputeInstanceOSUpdateSettings" }, "sdkUpdateSettings": { "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/AmlInstanceSdkUpdateSettings" + "$ref": "#/definitions/ComputeInstanceSdkUpdateSettings" } } }, - "AmlInstanceSshSettings": { + "ComputeInstanceSshSettings": { "type": "object", "description": "Specifies policy and settings for SSH access.", "properties": { @@ -3008,9 +3008,9 @@ } } }, - "AmlInstanceState": { + "ComputeInstanceState": { "type": "string", - "description": "Current state of an AmlInstance compute.", + "description": "Current state of an ComputeInstance.", "enum": [ "Creating", "CreateFailed", @@ -3030,17 +3030,17 @@ "Unusable" ], "x-ms-enum": { - "name": "AmlInstanceState", + "name": "ComputeInstanceState", "modelAsString": true } }, - "AmlInstanceApplicationUri": { + "ComputeInstanceApplicationUri": { "type": "object", "description": "Defines an Aml Instance application and its connectivity endpoint URI.", "properties": { "applicationName": { "type": "string", - "description": "Name of the AmlInstance application." + "description": "Name of the ComputeInstance application." }, "applicationUri": { "type": "string", @@ -3048,30 +3048,30 @@ } } }, - "AmlInstanceConnectivityEndpoints": { + "ComputeInstanceConnectivityEndpoints": { "type": "object", "readOnly": true, - "description": "Defines all connectivity endpoints and properties for an AmlInstance compute.", + "description": "Defines all connectivity endpoints and properties for an ComputeInstance.", "properties": { "publicIpAddress": { "type": "string", "readOnly": true, - "description": "Public IP Address of this AmlInstance." + "description": "Public IP Address of this ComputeInstance." }, "applicationUris": { "type": "array", "readOnly": true, "description": "Describes available applications and their connectivity endpoint URIs.", "items": { - "$ref": "#/definitions/AmlInstanceApplicationUri" + "$ref": "#/definitions/ComputeInstanceApplicationUri" } } } }, - "AmlInstanceCreatedBy": { + "ComputeInstanceCreatedBy": { "type": "object", "readOnly": true, - "description": "Describes information on user who created this AmlInstance compute.", + "description": "Describes information on user who created this ComputeInstance.", "properties": { "userName": { "type": "string", From a39326d4f39b6facbdef0329cbb1a880f3ca5784 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 4 Oct 2019 15:56:22 -0700 Subject: [PATCH 27/36] Adding instanceSharing property to ComputeInstance --- .../examples/getComputeInstance.json | 1 + .../2019-11-01/machineLearningServices.json | 22 +++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json index cb8707ecb686..ae38b838f5d9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json @@ -21,6 +21,7 @@ "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", + "instanceSharing": "Disabled", "datastoresMountSettings": { "datastoreSelection": "UserSpecified", "datastores": [ diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 845ae52f9267..31ff2e1c0fdc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2143,7 +2143,7 @@ "x-ms-discriminator-value": "AmlCompute" }, "ComputeInstance": { - "description": "An Azure Machine Learning instance.", + "description": "An Azure Machine Learning compute instance.", "allOf": [ { "$ref": "#/definitions/Compute" @@ -2152,7 +2152,7 @@ "type": "object", "properties": { "properties": { - "description": "AML Instance properties", + "description": "Compute Instance properties", "type": "object", "properties": { "vmSize": { @@ -2164,6 +2164,20 @@ "description": "Virtual network subnet resource ID the compute nodes belong to.", "$ref": "#/definitions/ResourceId" }, + "instanceSharing": { + "type": "string", + "default": "Disabled", + "title": "Sharing policy for this compute instance", + "description": "Policy for sharing this compute instance among users of parent workspace. If Disabled, only the creator can access applications on this compute instance. When enabled any workspace user can access applications on this instance depending on his/her assigned role.", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "instanceSharing", + "modelAsString": true + } + }, "datastoresMountSettings": { "description": "Describes what data stores will be mounted on this compute instance.", "$ref": "#/definitions/ComputeInstanceDatastoresMountSettings" @@ -2997,9 +3011,9 @@ "modelAsString": true } }, - "adminUserName": { + "adminUserName": { "type": "string", - "readOnly": true, + "readOnly": true, "description": "Describes the admin user name." }, "adminPublicKey": { From bc06bc81ab9051f2f594cadf643a13b33d182d38 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 9 Oct 2019 12:22:20 -0700 Subject: [PATCH 28/36] Internal review feedback: Adding sshPort to sshSettings and separating applicationURIs from connectivityEndpoints --- .../examples/createComputeInstance.json | 1 + .../examples/getComputeInstance.json | 12 +++--- .../2019-11-01/machineLearningServices.json | 37 ++++++++++++------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json index fd91d3a423e6..bc44bf9c5b97 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json @@ -12,6 +12,7 @@ "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", + "applicationSharingPolicy": "Personal", "datastoresMountSettings": { "datastoreSelection": "UserSpecified", "datastores": [ diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json index ae38b838f5d9..56774d6b686f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json @@ -21,7 +21,7 @@ "properties": { "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", - "instanceSharing": "Disabled", + "applicationSharingPolicy": "Shared", "datastoresMountSettings": { "datastoreSelection": "UserSpecified", "datastores": [ @@ -56,7 +56,8 @@ }, "sshSettings": { "sshPublicAccess": "Enabled", - "adminUserName": "azureuser" + "adminUserName": "azureuser", + "sshPort": 22 }, "createdBy": { "userName": "foobar@microsoft.com", @@ -65,10 +66,11 @@ }, "connectivityEndpoints": { "publicIpAddress": "10.0.0.1", - "applicationUris": [ - { "applicationName": "Jupyter", "applicationUri": "https://compute123.eastus2.azureml.net/jupyter"} - ] + "privateIpAddress": "10.0.0.1" }, + "applicationUris": [ + { "applicationName": "Jupyter", "applicationUri": "https://compute123.eastus2.azureml.net/jupyter"} + ], "errors": null, "state": "Running" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 31ff2e1c0fdc..b57af50be78d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2164,17 +2164,17 @@ "description": "Virtual network subnet resource ID the compute nodes belong to.", "$ref": "#/definitions/ResourceId" }, - "instanceSharing": { + "applicationSharingPolicy": { "type": "string", - "default": "Disabled", - "title": "Sharing policy for this compute instance", - "description": "Policy for sharing this compute instance among users of parent workspace. If Disabled, only the creator can access applications on this compute instance. When enabled any workspace user can access applications on this instance depending on his/her assigned role.", + "default": "Shared", + "title": "Sharing policy for applictions on this compute instance", + "description": "Policy for sharing applications on this compute instance among users of parent workspace. If Personal, only the creator can access applications on this compute instance. When Shared, any workspace user can access applications on this instance depending on his/her assigned role.", "enum": [ - "Enabled", - "Disabled" + "Personal", + "Shared" ], "x-ms-enum": { - "name": "instanceSharing", + "name": "applicationSharingPolicy", "modelAsString": true } }, @@ -2199,6 +2199,14 @@ "description": "Describes all connectivity endpoints available for this ComputeInstance.", "$ref": "#/definitions/ComputeInstanceConnectivityEndpoints" }, + "applicationUris": { + "type": "array", + "readOnly": true, + "description": "Describes available applications and their endpoints on this ComputeInstance.", + "items": { + "$ref": "#/definitions/ComputeInstanceApplicationUri" + } + }, "createdBy": { "readOnly": true, "description": "Describes information on user who created this ComputeInstance.", @@ -3016,6 +3024,12 @@ "readOnly": true, "description": "Describes the admin user name." }, + "sshPort": { + "type": "integer", + "format": "int32", + "readOnly": true, + "description": "Describes the port for connecting through SSH." + }, "adminPublicKey": { "type": "string", "description": "Specifies the SSH rsa public key file as a string. Use \"ssh-keygen -t rsa -b 2048\" to generate your SSH key pairs." @@ -3072,13 +3086,10 @@ "readOnly": true, "description": "Public IP Address of this ComputeInstance." }, - "applicationUris": { - "type": "array", + "privateIpAddress": { + "type": "string", "readOnly": true, - "description": "Describes available applications and their connectivity endpoint URIs.", - "items": { - "$ref": "#/definitions/ComputeInstanceApplicationUri" - } + "description": "Private IP Address of this ComputeInstance (local to the VNET in which the compute instance is deployed)." } } }, From da577a8762dbad29dfc31b388f0efab66970a2aa Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 9 Oct 2019 12:43:33 -0700 Subject: [PATCH 29/36] Fixing SpellCheck error --- .../stable/2019-11-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index b57af50be78d..0f5dd62ca61c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2167,7 +2167,7 @@ "applicationSharingPolicy": { "type": "string", "default": "Shared", - "title": "Sharing policy for applictions on this compute instance", + "title": "Sharing policy for applications on this compute instance", "description": "Policy for sharing applications on this compute instance among users of parent workspace. If Personal, only the creator can access applications on this compute instance. When Shared, any workspace user can access applications on this instance depending on his/her assigned role.", "enum": [ "Personal", From eb66cb98f86c7eb15e4e718639bfd97e9d4cd83e Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Wed, 9 Oct 2019 12:51:58 -0700 Subject: [PATCH 30/36] Keeping minimal set of properties (for Ignite) in ComputeInstance spec --- .../examples/createComputeInstance.json | 23 --- .../examples/getComputeInstance.json | 32 --- .../2019-11-01/machineLearningServices.json | 192 ------------------ 3 files changed, 247 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json index bc44bf9c5b97..917501ec26b5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/createComputeInstance.json @@ -13,29 +13,6 @@ "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", "applicationSharingPolicy": "Personal", - "datastoresMountSettings": { - "datastoreSelection": "UserSpecified", - "datastores": [ - { - "name": "datastore1" - } - ] - }, - "customScriptSettings": { - "startupScript": { - "scriptLocation": "\\scripts\\script1.sh" - } - }, - "softwareUpdateSettings": { - "osUpdateSettings": { - "osUpdateType": "Recommended", - "updateFrequencyInDays": 14, - "updateHourInUtc": 8 - }, - "sdkUpdateSettings": { - "updateOnNextStart": "Enabled" - } - }, "sshSettings": { "sshPublicAccess": "Disabled" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json index 56774d6b686f..4fece035dbf0 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json @@ -22,38 +22,6 @@ "vmSize": "STANDARD_NC6", "subnet": "test-subnet-resource-id", "applicationSharingPolicy": "Shared", - "datastoresMountSettings": { - "datastoreSelection": "UserSpecified", - "datastores": [ - { - "name": "dataStore1", - "state": "Mounted", - "error": "" - } - ] - }, - "customScriptSettings": { - "startupScript": { - "scriptLocation": "\\scripts\\script1.sh" - } - }, - "softwareUpdateSettings": { - "osUpdateSettings": { - "osUpdateType": "Recommended", - "updateFrequencyInDays": 14, - "updateHourInUtc": 8 - }, - "sdkUpdateSettings": { - "updateOnNextStart": "Enabled", - "availableUpdates": [ - { - "updateName": "some update", - "updateDescription": "SDK version 1.0", - "updateVersion": "1.0" - } - ] - } - }, "sshSettings": { "sshPublicAccess": "Enabled", "adminUserName": "azureuser", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 0f5dd62ca61c..1fa2cd9c2b96 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2178,18 +2178,6 @@ "modelAsString": true } }, - "datastoresMountSettings": { - "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/ComputeInstanceDatastoresMountSettings" - }, - "customScriptSettings": { - "description": "Specification for initialization scripts to customize this ComputeInstance.", - "$ref": "#/definitions/ComputeInstanceCustomScriptSettings" - }, - "softwareUpdateSettings": { - "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/ComputeInstanceSoftwareUpdateSettings" - }, "sshSettings": { "description": "Specifies policy and settings for SSH access.", "$ref": "#/definitions/ComputeInstanceSshSettings" @@ -2543,22 +2531,6 @@ "$ref": "#/definitions/ScaleSettings", "title": "Scale settings.", "description": "Desired scale settings for the amlCompute." - }, - "datastoresMountSettings": { - "description": "Describes what data stores will be mounted on this compute instance.", - "$ref": "#/definitions/ComputeInstanceDatastoresMountSettings" - }, - "customScriptSettings": { - "description": "Specification for initialization scripts to customize this ComputeInstance.", - "$ref": "#/definitions/ComputeInstanceCustomScriptSettings" - }, - "softwareUpdateSettings": { - "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/ComputeInstanceSoftwareUpdateSettings" - }, - "sshSettings": { - "description": "Specifies policy and settings for SSH access.", - "$ref": "#/definitions/ComputeInstanceSshSettings" } }, "description": "The properties of a amlCompute that need to be updated." @@ -2837,170 +2809,6 @@ "message" ] }, - "ComputeInstanceDatastore": { - "type": "object", - "description": "Represents specification for datastore requested to be mounted on an AzureML instance as well as its mounting status.", - "properties": { - "name": { - "type": "string", - "description": "Name of the datastore to be mounted on an AzureML instance." - }, - "state": { - "type": "string", - "description": "Current state of the datastore on the parent AzureML instance.", - "enum": [ - "Mounted", - "MountFailed", - "Unmounted" - ], - "x-ms-enum": { - "name": "datastoreState", - "modelAsString": true - }, - "readOnly": true - }, - "error": { - "type": "string", - "description": "Describes the error if datastore could not be successfully mounted on the parent AzureML instance.", - "readOnly": true - } - } - }, - "ComputeInstanceDatastoresMountSettings": { - "type": "object", - "description": "Describes what data stores will be mounted on this compute instance.", - "properties": { - "datastoreSelection": { - "type": "string", - "description": "Allows users to select between mounting All vs Selected datastores from the parent workspace. The 'All' setting also implies that any datastores that later become part of the workspace will be automatically mounted to the compute instance on next start.", - "default": "All", - "enum": [ - "All", - "UserSpecified" - ], - "x-ms-enum": { - "name": "datastoreSelection", - "modelAsString": true - } - }, - "datastores": { - "description": "Specifies the set of data stores that will be mounted on this compute instance. This should only be specified if dataStoreSelection is set to 'UserSpecified'.", - "type": "array", - "items": { - "$ref": "#/definitions/ComputeInstanceDatastore" - } - } - } - }, - "ComputeInstanceCustomScriptSettings": { - "type": "object", - "description": "Specification for initialization scripts to customize this ComputeInstance.", - "properties": { - "startupScript": { - "type": "object", - "description": "Specifies properties of initialization script to be run during every start of this instance.", - "properties": { - "scriptLocation": { - "type": "string", - "description": "The location of customization script. This is a relative file path in the default fileshare in the parent workspace." - }, - "scriptParameters": { - "type": "string", - "description": "Parameters required for this script if any." - } - } - } - } - }, - "ComputeInstanceOSUpdateSettings": { - "type": "object", - "description": "Specifies policy for installing operation system updates.", - "properties": { - "osUpdateType": { - "type": "string", - "default": "Recommended", - "title": "Type of automatic operating system updates to install", - "enum": [ - "Security", - "Recommended" - ], - "x-ms-enum": { - "name": "osUpdateType", - "modelAsString": true - } - }, - "updateFrequencyInDays": { - "type": "integer", - "format": "int32", - "description": "Frequency of update checks and installation. Maximum allowable frequency is 30 days. Default frequency will be 14 days." - }, - "updateHourInUtc": { - "type": "integer", - "format": "int32", - "description": "Hour of the day (0-23) in Universal Time at which software updates can be installed, potentially requiring VM reboot. Default update hour will be 2 AM UTC." - } - } - }, - "ComputeInstanceSdkUpdate": { - "type": "object", - "description": "Describes a specific update for ComputeInstance SDK.", - "readOnly": true, - "properties": { - "updateName": { - "type": "string", - "description": "Short name of the update." - }, - "updateDescription": { - "type": "string", - "description": "Detailed description of the available SDK update." - }, - "updateVersion": { - "type": "string", - "description": "Version of this available update." - } - } - }, - "ComputeInstanceSdkUpdateSettings": { - "type": "object", - "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", - "properties": { - "updateOnNextStart": { - "type": "string", - "description": "Specifies if any available Azure ML environment updates should be installed on next instance start.", - "default": "Disabled", - "enum": [ - "Disabled", - "Enabled" - ], - "x-ms-enum": { - "name": "updateOnNextStart", - "modelAsString": true - } - }, - "availableUpdates": { - "type": "array", - "readOnly": true, - "description": "Describes available SDK updates for this compute instance.", - "items": { - "$ref": "#/definitions/ComputeInstanceSdkUpdate" - } - } - } - }, - "ComputeInstanceSoftwareUpdateSettings": { - "type": "object", - "description": "Specifies policies for operating system and Azure ML environment (example packages and SDK) updates.", - "properties": { - "osUpdateSettings": { - "description": "Specifies policy for installing operation system updates.", - "$ref": "#/definitions/ComputeInstanceOSUpdateSettings" - }, - "sdkUpdateSettings": { - "description": "Specifies policy for installing Azure ML environment (example packages and SDK) updates.", - "$ref": "#/definitions/ComputeInstanceSdkUpdateSettings" - } - } - }, "ComputeInstanceSshSettings": { "type": "object", "description": "Specifies policy and settings for SSH access.", From 4e3a7bf2e4c213e5cffc790a43410034812b1515 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Thu, 10 Oct 2019 12:29:48 -0700 Subject: [PATCH 31/36] Renaming virtualMachineImageId to virtualMachineImage --- .../stable/2019-11-01/machineLearningServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 1fa2cd9c2b96..ea74f93cd2d3 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2051,7 +2051,7 @@ "modelAsString": true } }, - "virtualMachineImageId": { + "virtualMachineImage": { "title": "Custom VM image.", "description": "The ARM resource identifier of the virtual machine image for the compute nodes. This is of the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{gallery name}/images/{image definition name}/versions/{version id}. The virtual machine image must be in the same region and subscription as the cluster.", "$ref": "#/definitions/ResourceId" From 220de6746ff1564a4487c523a2b077ddeb004898 Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 11 Oct 2019 14:30:53 -0700 Subject: [PATCH 32/36] Addressing ARM review feedback --- .../stable/2019-11-01/examples/getComputeInstance.json | 4 ++-- .../stable/2019-11-01/machineLearningServices.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json index 4fece035dbf0..e3810c6abea4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/getComputeInstance.json @@ -36,8 +36,8 @@ "publicIpAddress": "10.0.0.1", "privateIpAddress": "10.0.0.1" }, - "applicationUris": [ - { "applicationName": "Jupyter", "applicationUri": "https://compute123.eastus2.azureml.net/jupyter"} + "applications": [ + { "displayName": "Jupyter", "endpointUri": "https://compute123.eastus2.azureml.net/jupyter"} ], "errors": null, "state": "Running" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index ea74f93cd2d3..c9e31558cb83 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2187,12 +2187,12 @@ "description": "Describes all connectivity endpoints available for this ComputeInstance.", "$ref": "#/definitions/ComputeInstanceConnectivityEndpoints" }, - "applicationUris": { + "applications": { "type": "array", "readOnly": true, "description": "Describes available applications and their endpoints on this ComputeInstance.", "items": { - "$ref": "#/definitions/ComputeInstanceApplicationUri" + "$ref": "#/definitions/ComputeInstanceApplication" } }, "createdBy": { @@ -2870,15 +2870,15 @@ "modelAsString": true } }, - "ComputeInstanceApplicationUri": { + "ComputeInstanceApplication": { "type": "object", "description": "Defines an Aml Instance application and its connectivity endpoint URI.", "properties": { - "applicationName": { + "displayName": { "type": "string", "description": "Name of the ComputeInstance application." }, - "applicationUri": { + "endpointUri": { "type": "string", "description": "Application' endpoint URI." } From 5ad61b9b6d2c13191f93e8d2ca8f12b6c116cadd Mon Sep 17 00:00:00 2001 From: Vikas Hamine Date: Fri, 11 Oct 2019 14:35:17 -0700 Subject: [PATCH 33/36] Making Linux the default OS type in AmlCompute --- .../stable/2019-11-01/machineLearningServices.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index c9e31558cb83..1680179e5cbb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -2042,6 +2042,7 @@ "osType": { "type": "string", "description": "OS Type.", + "default": "Linux", "enum": [ "Linux", "Windows" @@ -2203,7 +2204,7 @@ "errors": { "readOnly": true, "title": "Errors.", - "description": "Collection of errors encountered by various compute nodes during node setup.", + "description": "Collection of errors encountered on this ComputeInstance.", "type": "array", "items": { "$ref": "#/definitions/MachineLearningServiceError" From 26788048dfbde78a0d504317fb0ee84fa438e3b4 Mon Sep 17 00:00:00 2001 From: ramagott <43017192+ramagott@users.noreply.github.com> Date: Mon, 28 Oct 2019 15:55:37 -0700 Subject: [PATCH 34/36] Updating the ComputeInstance state list 1. Updating the ComputeInstance state list 2. Changing the return type for CI start, stop, and restart operations --- .../2019-11-01/machineLearningServices.json | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index 1680179e5cbb..cb8951ae192a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -1009,9 +1009,7 @@ ], "responses": { "200": { - "description": "Success.", - "schema": { - "$ref": "#/definitions/ComputeResource" + "description": "Success." } }, "default": { @@ -1055,9 +1053,7 @@ ], "responses": { "200": { - "description": "Success.", - "schema": { - "$ref": "#/definitions/ComputeResource" + "description": "Success." } }, "default": { @@ -1101,9 +1097,7 @@ ], "responses": { "200": { - "description": "Success.", - "schema": { - "$ref": "#/definitions/ComputeResource" + "description": "Success." } }, "default": { @@ -2852,10 +2846,10 @@ "Creating", "CreateFailed", "Deleting", - "Ready", + "Running", "Restarting", "RestartFailed", - "Running", + "JobRunning", "SettingUp", "Starting", "StartFailed", From 0abfa64498b49903c62c886fd5105b036d9a8616 Mon Sep 17 00:00:00 2001 From: Ramakrishna Gottimukkula Date: Mon, 28 Oct 2019 16:30:40 -0700 Subject: [PATCH 35/36] Updating return type in examples for CI start, stop and restart operations --- .../2019-11-01/examples/restartComputeInstance.json | 13 +------------ .../2019-11-01/examples/startComputeInstance.json | 13 +------------ .../2019-11-01/examples/stopComputeInstance.json | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json index 1b6dcf92f471..0474cf27a6f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/restartComputeInstance.json @@ -7,17 +7,6 @@ "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": { - "computeType": "ComputeInstance", - "provisioningState": "Updating" - } - } - } + "200": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json index 1fe1ceace8fa..0474cf27a6f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/startComputeInstance.json @@ -7,17 +7,6 @@ "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": { - "computeType": "Computenstance", - "provisioningState": "Updating" - } - } - } + "200": {} } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json index 1b6dcf92f471..0474cf27a6f4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/examples/stopComputeInstance.json @@ -7,17 +7,6 @@ "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": { - "computeType": "ComputeInstance", - "provisioningState": "Updating" - } - } - } + "200": {} } } From 9a2ab259d780c57043da0bf618fc2e96bfd02b2b Mon Sep 17 00:00:00 2001 From: Ramakrishna Gottimukkula Date: Mon, 28 Oct 2019 17:01:59 -0700 Subject: [PATCH 36/36] Fixing braces --- .../stable/2019-11-01/machineLearningServices.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json index cb8951ae192a..2d47801d79d9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2019-11-01/machineLearningServices.json @@ -1010,7 +1010,6 @@ "responses": { "200": { "description": "Success." - } }, "default": { "description": "Error response describing why the operation failed.", @@ -1054,7 +1053,6 @@ "responses": { "200": { "description": "Success." - } }, "default": { "description": "Error response describing why the operation failed.", @@ -1098,7 +1096,6 @@ "responses": { "200": { "description": "Success." - } }, "default": { "description": "Error response describing why the operation failed.",