From 666e7aa830faa88f773d34bf84f8664dd437ff92 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Wed, 30 Aug 2023 05:29:05 -0700 Subject: [PATCH 01/20] first draft redesign of ServerlessEndpoints --- .../preview/2023-08-01-preview/mfe.json | 197 ++++++++++++++++-- 1 file changed, 175 insertions(+), 22 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index efa49a487a80..2f1a012acbcf 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -11866,6 +11866,59 @@ "final-state-via": "location" } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/serverlessEndpoints/{name}/status": { + "post": { + "tags": [ + "ServerlessEndpoint" + ], + "summary": "Temporary status API until integration completes.", + "operationId": "ServerlessEndpoints_GetStatus", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/WorkspaceNameParameter" + }, + { + "in": "path", + "name": "name", + "description": "Serverless Endpoint name.", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/ServerlessEndpointStatus" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "GetStatus Workspace Serverless Endpoint.": { + "$ref": "./examples/Workspace/ServerlessEndpoint/getStatus.json" + } + } + } } }, "definitions": { @@ -13277,6 +13330,27 @@ }, "additionalProperties": false }, + "CapacityReservation": { + "required": [ + "capacityReservationGroupId" + ], + "type": "object", + "properties": { + "capacityReservationGroupId": { + "description": "[Required] Specifies a capacity reservation group ID to allocate capacity from.", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", + "type": "string" + }, + "endpointReservedCapacity": { + "format": "int32", + "description": "Specifies a capacity amount to reserve for this endpoint within the parent capacity reservation group.", + "type": "integer", + "x-nullable": true + } + }, + "additionalProperties": false + }, "CategoricalDataDriftMetric": { "enum": [ "JensenShannonDistance", @@ -20615,21 +20689,6 @@ "x-ms-discriminator-value": "ModelPerformance", "additionalProperties": false }, - "ModelProfile": { - "required": [ - "modelUri" - ], - "type": "object", - "properties": { - "modelUri": { - "description": "[Required] The model to create a serverless endpoint of", - "minLength": 1, - "pattern": "[a-zA-Z0-9_]", - "type": "string" - } - }, - "additionalProperties": false - }, "ModelSize": { "description": "Image model size.", "enum": [ @@ -24544,23 +24603,31 @@ }, "ServerlessEndpoint": { "required": [ - "modelProfile" + "offer" ], "type": "object", "properties": { - "inferenceUri": { - "format": "uri", + "authMode": { + "description": "Specifies the authentication mode for the Serverless endpoint.", + "$ref": "#/definitions/ServerlessInferenceEndpointAuthMode" + }, + "capacityReservation": { + "description": "Optional capacity reservation information for the endpoint. When specified, the Serverless Endpoint\r\nwill be allocated capacity from the specified capacity reservation group.", + "$ref": "#/definitions/CapacityReservation", + "x-nullable": true + }, + "inferenceEndpoint": { "description": "The inference uri to target when making requests against the serverless endpoint", - "type": "string", + "$ref": "#/definitions/ServerlessInferenceEndpoint", "readOnly": true, "x-ms-mutability": [ "read" ], "x-nullable": true }, - "modelProfile": { - "description": "[Required] The model profile to configure the serverless endpoint with", - "$ref": "#/definitions/ModelProfile" + "offer": { + "description": "[Required] The publisher-defined Serverless Offer to provision the endpoint with.", + "$ref": "#/definitions/ServerlessOffer" }, "provisioningState": { "description": "Provisioning state for the endpoint.", @@ -24574,6 +24641,20 @@ "x-ms-client-name": "ServerlessEndpointProperties", "additionalProperties": false }, + "ServerlessEndpointStatus": { + "type": "object", + "properties": { + "metrics": { + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, + "x-nullable": true + } + }, + "additionalProperties": false + }, "ServerlessEndpointTrackedResource": { "required": [ "location", @@ -24624,6 +24705,78 @@ }, "additionalProperties": false }, + "ServerlessInferenceEndpoint": { + "required": [ + "inferenceUri" + ], + "type": "object", + "properties": { + "headers": { + "description": "Specifies any required headers to target this serverless endpoint.", + "type": "object", + "additionalProperties": { + "type": "string", + "x-nullable": true + }, + "readOnly": true, + "x-ms-mutability": [ + "read" + ], + "x-nullable": true + }, + "inferenceUri": { + "format": "uri", + "description": "[Required] The inference uri to target when making requests against the Serverless Endpoint.", + "type": "string", + "x-ms-mutability": [ + "read" + ] + } + }, + "additionalProperties": false + }, + "ServerlessInferenceEndpointAuthMode": { + "enum": [ + "Key", + "AAD" + ], + "type": "string", + "x-ms-enum": { + "name": "ServerlessInferenceEndpointAuthMode", + "modelAsString": true, + "values": [ + { + "value": "Key" + }, + { + "value": "AAD" + } + ] + }, + "additionalProperties": false + }, + "ServerlessOffer": { + "required": [ + "offerName", + "publisher" + ], + "type": "object", + "properties": { + "offerName": { + "description": "[Required] The name of the Serverless Offer", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", + "type": "string" + }, + "publisher": { + "description": "[Required] Publisher name of the Serverless Offer", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", + "type": "string" + } + }, + "additionalProperties": false + }, "ServiceDataAccessAuthIdentity": { "enum": [ "None", From d07667dab9286deaaa9dd9cacf4f34ba8b2f2f4f Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Wed, 30 Aug 2023 05:41:23 -0700 Subject: [PATCH 02/20] add getStatus.json --- .../ServerlessEndpoint/getStatus.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/getStatus.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/getStatus.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/getStatus.json new file mode 100644 index 000000000000..768648574784 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/getStatus.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", + "workspaceName": "my-aml-workspace", + "name": "string", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "metrics": { + "string": "string" + } + } + } + } +} From d908cdae383fdeabb0544b82cd37b15b3096dadf Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Wed, 30 Aug 2023 05:51:13 -0700 Subject: [PATCH 03/20] update examples --- .../ServerlessEndpoint/createOrUpdate.json | 72 +++++++++++++------ .../Workspace/ServerlessEndpoint/get.json | 27 ++++--- .../Workspace/ServerlessEndpoint/list.json | 31 +++++--- .../Workspace/ServerlessEndpoint/update.json | 50 +++++++++---- 4 files changed, 125 insertions(+), 55 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json index 5928ac000fb4..20e9eb5f2f27 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json @@ -7,15 +7,21 @@ "api-version": "2023-08-01-preview", "body": { "properties": { - "modelProfile": { - "modelUri": "string" - } + "offer": { + "publisher": "string", + "offerName": "string" + }, + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 + }, + "authMode": "AAD" }, "tags": {}, "location": "string", "kind": "string", "identity": { - "type": "SystemAssigned", + "type": "UserAssigned", "userAssignedIdentities": { "string": {} } @@ -37,19 +43,30 @@ "name": "string", "type": "string", "properties": { - "modelProfile": { - "modelUri": "string" + "offer": { + "publisher": "string", + "offerName": "string" }, - "inferenceUri": "https://www.contoso.com/example", - "provisioningState": "Deleting" + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 + }, + "authMode": "Key", + "inferenceEndpoint": { + "inferenceUri": "https://www.contoso.com/example", + "headers": { + "string": "string" + } + }, + "provisioningState": "Canceled" }, "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:11", + "createdAt": "2020-01-01T12:34:56.999+00:46", "createdBy": "string", - "createdByType": "Application", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:11", + "createdByType": "User", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:46", "lastModifiedBy": "string", - "lastModifiedByType": "User" + "lastModifiedByType": "Application" }, "tags": {}, "location": "string", @@ -81,25 +98,36 @@ "name": "string", "type": "string", "properties": { - "modelProfile": { - "modelUri": "string" + "offer": { + "publisher": "string", + "offerName": "string" }, - "inferenceUri": "https://www.contoso.com/example", - "provisioningState": "Updating" + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 + }, + "authMode": "AAD", + "inferenceEndpoint": { + "inferenceUri": "https://www.contoso.com/example", + "headers": { + "string": "string" + } + }, + "provisioningState": "Deleting" }, "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:11", + "createdAt": "2020-01-01T12:34:56.999+00:46", "createdBy": "string", - "createdByType": "Key", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:11", + "createdByType": "User", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:46", "lastModifiedBy": "string", - "lastModifiedByType": "ManagedIdentity" + "lastModifiedByType": "User" }, "tags": {}, "location": "string", "kind": "string", "identity": { - "type": "UserAssigned", + "type": "None", "principalId": "00000000-1111-2222-3333-444444444444", "tenantId": "00000000-1111-2222-3333-444444444444", "userAssignedIdentities": { @@ -111,7 +139,7 @@ }, "sku": { "name": "string", - "tier": "Standard", + "tier": "Basic", "size": "string", "family": "string", "capacity": 1 diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json index c05c110dc9da..2abb46002d12 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json @@ -14,17 +14,28 @@ "name": "string", "type": "string", "properties": { - "modelProfile": { - "modelUri": "string" + "offer": { + "publisher": "string", + "offerName": "string" }, - "inferenceUri": "https://www.contoso.com/example", - "provisioningState": "Updating" + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 + }, + "authMode": "Key", + "inferenceEndpoint": { + "inferenceUri": "https://www.contoso.com/example", + "headers": { + "string": "string" + } + }, + "provisioningState": "Failed" }, "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:12", + "createdAt": "2020-01-01T12:34:56.999+00:46", "createdBy": "string", - "createdByType": "Key", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:12", + "createdByType": "Application", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:46", "lastModifiedBy": "string", "lastModifiedByType": "Application" }, @@ -32,7 +43,7 @@ "location": "string", "kind": "string", "identity": { - "type": "SystemAssigned,UserAssigned", + "type": "UserAssigned", "principalId": "00000000-1111-2222-3333-444444444444", "tenantId": "00000000-1111-2222-3333-444444444444", "userAssignedIdentities": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json index 5cfe0cceb83d..b1aff30d777e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json @@ -16,25 +16,36 @@ "name": "string", "type": "string", "properties": { - "modelProfile": { - "modelUri": "string" + "offer": { + "publisher": "string", + "offerName": "string" }, - "inferenceUri": "https://www.contoso.com/example", - "provisioningState": "Creating" + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 + }, + "authMode": "Key", + "inferenceEndpoint": { + "inferenceUri": "https://www.contoso.com/example", + "headers": { + "string": "string" + } + }, + "provisioningState": "Failed" }, "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:12", + "createdAt": "2020-01-01T12:34:56.999+00:46", "createdBy": "string", - "createdByType": "ManagedIdentity", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:12", + "createdByType": "Application", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:46", "lastModifiedBy": "string", - "lastModifiedByType": "ManagedIdentity" + "lastModifiedByType": "Application" }, "tags": {}, "location": "string", "kind": "string", "identity": { - "type": "SystemAssigned,UserAssigned", + "type": "SystemAssigned", "principalId": "00000000-1111-2222-3333-444444444444", "tenantId": "00000000-1111-2222-3333-444444444444", "userAssignedIdentities": { @@ -46,7 +57,7 @@ }, "sku": { "name": "string", - "tier": "Premium", + "tier": "Free", "size": "string", "family": "string", "capacity": 1 diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json index 0863566b96f3..78a6dffeecba 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json @@ -6,7 +6,20 @@ "name": "string", "api-version": "2023-08-01-preview", "body": { - "tags": {} + "tags": {}, + "sku": { + "name": "string", + "tier": "Basic", + "size": "string", + "family": "string", + "capacity": 1 + }, + "identity": { + "type": "None", + "userAssignedIdentities": { + "string": {} + } + } } }, "responses": { @@ -17,17 +30,28 @@ "name": "string", "type": "string", "properties": { - "modelProfile": { - "modelUri": "string" + "offer": { + "publisher": "string", + "offerName": "string" + }, + "capacityReservation": { + "capacityReservationGroupId": "string", + "endpointReservedCapacity": 1 }, - "inferenceUri": "https://www.contoso.com/example", - "provisioningState": "Canceled" + "authMode": "AAD", + "inferenceEndpoint": { + "inferenceUri": "https://www.contoso.com/example", + "headers": { + "string": "string" + } + }, + "provisioningState": "Deleting" }, "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:12", + "createdAt": "2020-01-01T12:34:56.999+00:47", "createdBy": "string", - "createdByType": "User", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:12", + "createdByType": "Application", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:47", "lastModifiedBy": "string", "lastModifiedByType": "Application" }, @@ -35,7 +59,7 @@ "location": "string", "kind": "string", "identity": { - "type": "SystemAssigned", + "type": "SystemAssigned,UserAssigned", "principalId": "00000000-1111-2222-3333-444444444444", "tenantId": "00000000-1111-2222-3333-444444444444", "userAssignedIdentities": { @@ -47,17 +71,13 @@ }, "sku": { "name": "string", - "tier": "Free", + "tier": "Premium", "size": "string", "family": "string", "capacity": 1 } } }, - "202": { - "headers": { - "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/locations/centraluseuap/mfeOperationResults/prefix:F0C6B8EC-0D53-432C-913B-1CD9E8CDE3A0" - } - } + "202": {} } } From 79103cc39ef093951375c782a7927e5487410aeb Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Wed, 30 Aug 2023 05:54:47 -0700 Subject: [PATCH 04/20] add LRO location header to example --- .../examples/Workspace/ServerlessEndpoint/update.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json index 78a6dffeecba..b88c2f4af35e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json @@ -78,6 +78,10 @@ } } }, - "202": {} + "202": { + "headers": { + "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/testrg123/providers/Microsoft.MachineLearningServices/locations/centraluseuap/mfeOperationResults/prefix:F0C6B8EC-0D53-432C-913B-1CD9E8CDE3A0" + } + } } } From 7899fe1b2a321cd06d88b44aab1c6a352afb8820 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 1 Sep 2023 09:18:58 -0700 Subject: [PATCH 05/20] add CapacityReservationGroups API --- .../createOrUpdate.json | 143 +++++++ .../CapacityReservationGroup/delete.json | 12 + .../CapacityReservationGroup/get.json | 65 +++ .../CapacityReservationGroup/list.json | 66 +++ .../CapacityReservationGroup/update.json | 26 ++ .../preview/2023-08-01-preview/mfe.json | 375 +++++++++++++++++- 6 files changed, 686 insertions(+), 1 deletion(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json new file mode 100644 index 000000000000..471fd2b20741 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json @@ -0,0 +1,143 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "groupId": "string", + "api-version": "2023-08-01-preview", + "body": { + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "parentGroupId": "string", + "reserverdCapacity": 1, + "excessCapacityReservation": { + "policyType": "Weighted", + "weights": { + "string": 1 + } + } + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned", + "userAssignedIdentities": { + "string": {} + } + }, + "sku": { + "name": "string", + "tier": "Premium", + "size": "string", + "family": "string", + "capacity": 1 + } + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "parentGroupId": "string", + "reserverdCapacity": 1, + "excessCapacityReservation": { + "policyType": "Weighted", + "weights": { + "string": 1 + } + } + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:15", + "createdBy": "string", + "createdByType": "User", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:15", + "lastModifiedBy": "string", + "lastModifiedByType": "ManagedIdentity" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Premium", + "size": "string", + "family": "string", + "capacity": 1 + } + } + }, + "201": { + "headers": {}, + "body": { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "parentGroupId": "string", + "reserverdCapacity": 1, + "excessCapacityReservation": { + "policyType": "Weighted", + "weights": { + "string": 1 + } + } + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:15", + "createdBy": "string", + "createdByType": "Application", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:15", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned,UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Free", + "size": "string", + "family": "string", + "capacity": 1 + } + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json new file mode 100644 index 000000000000..ed2b5b3fad5b --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "groupId": "string", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json new file mode 100644 index 000000000000..f2b922aa5af7 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -0,0 +1,65 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "groupId": "string", + "api-version": "2023-08-01-preview" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "parentGroupId": "string", + "reserverdCapacity": 1, + "excessCapacityReservation": { + "policyType": "Weighted", + "weights": { + "string": 1 + } + } + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:14", + "createdBy": "string", + "createdByType": "Key", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:14", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Standard", + "size": "string", + "family": "string", + "capacity": 1 + } + } + ], + "nextLink": "string" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json new file mode 100644 index 000000000000..893698ad2206 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json @@ -0,0 +1,66 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "api-version": "2023-08-01-preview", + "$skipToken": "string", + "groupId": "string" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "parentGroupId": "string", + "reserverdCapacity": 1, + "excessCapacityReservation": { + "policyType": "Weighted", + "weights": { + "string": 1 + } + } + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:08", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:08", + "lastModifiedBy": "string", + "lastModifiedByType": "ManagedIdentity" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Premium", + "size": "string", + "family": "string", + "capacity": 1 + } + } + ], + "nextLink": "string" + } + } + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json new file mode 100644 index 000000000000..8aeaf6467e29 --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "groupId": "string", + "api-version": "2023-08-01-preview", + "body": { + "tags": {}, + "sku": { + "name": "string", + "tier": "Standard", + "size": "string", + "family": "string", + "capacity": 1 + }, + "identity": { + "type": "SystemAssigned", + "userAssignedIdentities": { + "string": {} + } + } + } + }, + "responses": { + "200": {} + } +} diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 2f1a012acbcf..1e078ef024c2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -9,6 +9,261 @@ "https" ], "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups": { + "get": { + "tags": [ + "CapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_List", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "in": "query", + "name": "groupId", + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/PaginationParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResourceArmPaginatedResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "List Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/list.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups/{groupId}": { + "delete": { + "tags": [ + "CapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_Delete", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "in": "path", + "name": "groupId", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success" + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "No Content" + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Delete Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/delete.json" + } + } + }, + "get": { + "tags": [ + "CapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_Get", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "in": "path", + "name": "groupId", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResourceArmPaginatedResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Get Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/get.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + }, + "patch": { + "tags": [ + "CapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_Update", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "in": "path", + "name": "groupId", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "body", + "required": true, + "schema": { + "$ref": "#/definitions/PartialMinimalTrackedResourceWithSkuAndIdentity" + } + } + ], + "responses": { + "200": { + "description": "Success" + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "Update Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/update.json" + } + } + }, + "put": { + "tags": [ + "CapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_CreateOrUpdate", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "in": "path", + "name": "groupId", + "required": true, + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "in": "body", + "name": "body", + "required": true, + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResource" + } + } + ], + "responses": { + "200": { + "description": "Create or update request is successful.", + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResource" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResource" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "CreateOrUpdate Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/createOrUpdate.json" + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/registries/{registryName}/codes": { "get": { "tags": [ @@ -8438,7 +8693,7 @@ { "in": "query", "name": "properties", - "description": "Comma-separated list of user property names (and optionally values). Example: prop1,prop2=value2", + "description": "Comma-separated list of property names (and optionally values). Example: prop1,prop2=value2", "type": "string" } ], @@ -13351,6 +13606,86 @@ }, "additionalProperties": false }, + "CapacityReservationGroup": { + "required": [ + "reserverdCapacity" + ], + "type": "object", + "properties": { + "excessCapacityReservation": { + "description": "Specifies the policy for distributing excess capacity\r\nbetween children within this group.", + "$ref": "#/definitions/ExcessCapacityReservation", + "x-nullable": true + }, + "offer": { + "description": "Offer used by this capacity reservation group.", + "$ref": "#/definitions/ServerlessOffer", + "x-nullable": true + }, + "parentGroupId": { + "description": "Specifies the parent capacity reservation group Id.", + "type": "string", + "x-nullable": true + }, + "reserverdCapacity": { + "format": "int32", + "description": "[Required] Specifies the amount of capacity to reserve.", + "type": "integer" + } + }, + "x-ms-client-name": "CapacityReservationGroupProperties", + "additionalProperties": false + }, + "CapacityReservationGroupTrackedResource": { + "required": [ + "location", + "properties" + ], + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource" + } + ], + "properties": { + "identity": { + "description": "Managed service identity (system assigned and/or user assigned identities)", + "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity" + }, + "kind": { + "description": "Metadata used by portal/tooling/etc to render different UX experiences for resources of the same type.", + "type": "string" + }, + "properties": { + "description": "[Required] Additional attributes of the entity.", + "$ref": "#/definitions/CapacityReservationGroup" + }, + "sku": { + "description": "Sku details required for ARM contract for Autoscaling.", + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/Sku" + } + }, + "x-ms-client-name": "CapacityReservationGroup", + "additionalProperties": false + }, + "CapacityReservationGroupTrackedResourceArmPaginatedResult": { + "description": "A paginated list of CapacityReservationGroup entities.", + "type": "object", + "properties": { + "nextLink": { + "description": "The link to the next page of CapacityReservationGroup objects. If null, there are no additional pages.", + "type": "string" + }, + "value": { + "description": "An array of objects of type CapacityReservationGroup.", + "type": "array", + "items": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResource" + } + } + }, + "additionalProperties": false + }, "CategoricalDataDriftMetric": { "enum": [ "JensenShannonDistance", @@ -16268,6 +16603,44 @@ }, "additionalProperties": false }, + "ExccessCapacityReservationPolicyType": { + "enum": [ + "Weighted" + ], + "type": "string", + "x-ms-enum": { + "name": "ExccessCapacityReservationPolicyType", + "modelAsString": true, + "values": [ + { + "value": "Weighted" + } + ] + }, + "additionalProperties": false + }, + "ExcessCapacityReservation": { + "required": [ + "policyType", + "weights" + ], + "type": "object", + "properties": { + "policyType": { + "description": "[Required] The Policy Type for a Capacity Reservation Group", + "$ref": "#/definitions/ExccessCapacityReservationPolicyType" + }, + "weights": { + "description": "[Required] Distribution weights of excess capacity.", + "type": "object", + "additionalProperties": { + "format": "int32", + "type": "integer" + } + } + }, + "additionalProperties": false + }, "ExportFormatType": { "description": "The format of exported labels.", "enum": [ From be6f5d3bdee181d18049ab829229180e4ea9ce79 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 1 Sep 2023 09:40:20 -0700 Subject: [PATCH 06/20] spellcheck fix --- .../preview/2023-08-01-preview/mfe.json | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 1e078ef024c2..6254b5c72a16 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -13608,7 +13608,7 @@ }, "CapacityReservationGroup": { "required": [ - "reserverdCapacity" + "reservedCapacity" ], "type": "object", "properties": { @@ -13627,7 +13627,7 @@ "type": "string", "x-nullable": true }, - "reserverdCapacity": { + "reservedCapacity": { "format": "int32", "description": "[Required] Specifies the amount of capacity to reserve.", "type": "integer" @@ -16603,22 +16603,6 @@ }, "additionalProperties": false }, - "ExccessCapacityReservationPolicyType": { - "enum": [ - "Weighted" - ], - "type": "string", - "x-ms-enum": { - "name": "ExccessCapacityReservationPolicyType", - "modelAsString": true, - "values": [ - { - "value": "Weighted" - } - ] - }, - "additionalProperties": false - }, "ExcessCapacityReservation": { "required": [ "policyType", @@ -16628,7 +16612,7 @@ "properties": { "policyType": { "description": "[Required] The Policy Type for a Capacity Reservation Group", - "$ref": "#/definitions/ExccessCapacityReservationPolicyType" + "$ref": "#/definitions/ExcessCapacityReservationPolicyType" }, "weights": { "description": "[Required] Distribution weights of excess capacity.", @@ -16641,6 +16625,22 @@ }, "additionalProperties": false }, + "ExcessCapacityReservationPolicyType": { + "enum": [ + "Weighted" + ], + "type": "string", + "x-ms-enum": { + "name": "ExcessCapacityReservationPolicyType", + "modelAsString": true, + "values": [ + { + "value": "Weighted" + } + ] + }, + "additionalProperties": false + }, "ExportFormatType": { "description": "The format of exported labels.", "enum": [ From 15e9f1967b5102a7418ca0e5ca27c42126ff3dad Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 1 Sep 2023 09:52:18 -0700 Subject: [PATCH 07/20] example fix --- .../examples/CapacityReservationGroup/createOrUpdate.json | 6 +++--- .../examples/CapacityReservationGroup/get.json | 2 +- .../examples/CapacityReservationGroup/list.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json index 471fd2b20741..c72bd5b94541 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json @@ -10,7 +10,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reserverdCapacity": 1, + "reservedCapacity": 1, "excessCapacityReservation": { "policyType": "Weighted", "weights": { @@ -49,7 +49,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reserverdCapacity": 1, + "reservedCapacity": 1, "excessCapacityReservation": { "policyType": "Weighted", "weights": { @@ -100,7 +100,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reserverdCapacity": 1, + "reservedCapacity": 1, "excessCapacityReservation": { "policyType": "Weighted", "weights": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json index f2b922aa5af7..e6075743d613 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -19,7 +19,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reserverdCapacity": 1, + "reservedCapacity": 1, "excessCapacityReservation": { "policyType": "Weighted", "weights": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json index 893698ad2206..737abdc7d0e7 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json @@ -20,7 +20,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reserverdCapacity": 1, + "reservedCapacity": 1, "excessCapacityReservation": { "policyType": "Weighted", "weights": { From 29752b641a5e46551b2ad431a97a3b7f88deecf0 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 7 Sep 2023 09:14:28 -0400 Subject: [PATCH 08/20] capacity reservation groups should be under resource groups --- .../preview/2023-08-01-preview/mfe.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 6254b5c72a16..e65bbd702e8a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -9,7 +9,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups": { "get": { "tags": [ "CapacityReservationGroup" @@ -22,6 +22,9 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, { "in": "query", "name": "groupId", @@ -59,7 +62,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups/{groupId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups/{groupId}": { "delete": { "tags": [ "CapacityReservationGroup" @@ -72,6 +75,9 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, { "in": "path", "name": "groupId", @@ -118,6 +124,9 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, { "in": "path", "name": "groupId", @@ -167,6 +176,9 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, { "in": "path", "name": "groupId", @@ -218,6 +230,9 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" + }, { "in": "path", "name": "groupId", From 8109593d79d6ecfd54be25a75890ffb4fe0c0c83 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 7 Sep 2023 09:14:43 -0400 Subject: [PATCH 09/20] fix examples --- .../examples/CapacityReservationGroup/createOrUpdate.json | 1 + .../examples/CapacityReservationGroup/delete.json | 1 + .../examples/CapacityReservationGroup/get.json | 1 + .../examples/CapacityReservationGroup/list.json | 1 + .../examples/CapacityReservationGroup/update.json | 1 + 5 files changed, 5 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json index c72bd5b94541..a149dc667f10 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", "groupId": "string", "api-version": "2023-08-01-preview", "body": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json index ed2b5b3fad5b..99e9ffd9388e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/delete.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", "groupId": "string", "api-version": "2023-08-01-preview" }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json index e6075743d613..d347391f614a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", "groupId": "string", "api-version": "2023-08-01-preview" }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json index 737abdc7d0e7..17c716e90b3a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", "api-version": "2023-08-01-preview", "$skipToken": "string", "groupId": "string" diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json index 8aeaf6467e29..8f0defa1a87d 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/update.json @@ -1,6 +1,7 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "test-rg", "groupId": "string", "api-version": "2023-08-01-preview", "body": { From 5addebf6a40a44f3a2f840780ef8ba9f57348ce8 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 7 Sep 2023 09:51:51 -0400 Subject: [PATCH 10/20] inferenceUri -> uri --- .../examples/Workspace/ServerlessEndpoint/createOrUpdate.json | 4 ++-- .../examples/Workspace/ServerlessEndpoint/get.json | 2 +- .../examples/Workspace/ServerlessEndpoint/list.json | 2 +- .../examples/Workspace/ServerlessEndpoint/update.json | 2 +- .../preview/2023-08-01-preview/mfe.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json index 20e9eb5f2f27..e15341c75b71 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/createOrUpdate.json @@ -53,7 +53,7 @@ }, "authMode": "Key", "inferenceEndpoint": { - "inferenceUri": "https://www.contoso.com/example", + "uri": "https://www.contoso.com/example", "headers": { "string": "string" } @@ -108,7 +108,7 @@ }, "authMode": "AAD", "inferenceEndpoint": { - "inferenceUri": "https://www.contoso.com/example", + "uri": "https://www.contoso.com/example", "headers": { "string": "string" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json index 2abb46002d12..54427dc8db65 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/get.json @@ -24,7 +24,7 @@ }, "authMode": "Key", "inferenceEndpoint": { - "inferenceUri": "https://www.contoso.com/example", + "uri": "https://www.contoso.com/example", "headers": { "string": "string" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json index b1aff30d777e..2d49f761c246 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/list.json @@ -26,7 +26,7 @@ }, "authMode": "Key", "inferenceEndpoint": { - "inferenceUri": "https://www.contoso.com/example", + "uri": "https://www.contoso.com/example", "headers": { "string": "string" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json index b88c2f4af35e..bce8ad8ed68e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/Workspace/ServerlessEndpoint/update.json @@ -40,7 +40,7 @@ }, "authMode": "AAD", "inferenceEndpoint": { - "inferenceUri": "https://www.contoso.com/example", + "uri": "https://www.contoso.com/example", "headers": { "string": "string" } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index e65bbd702e8a..5ec32fbe8dfc 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -25095,7 +25095,7 @@ }, "ServerlessInferenceEndpoint": { "required": [ - "inferenceUri" + "uri" ], "type": "object", "properties": { @@ -25112,7 +25112,7 @@ ], "x-nullable": true }, - "inferenceUri": { + "uri": { "format": "uri", "description": "[Required] The inference uri to target when making requests against the Serverless Endpoint.", "type": "string", From 62a75a651b3758f17d33bf8458c8ff7257cca728 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 7 Sep 2023 09:52:04 -0400 Subject: [PATCH 11/20] CapacityReservation -> ServerlessEndpointCapacityReservation --- .../preview/2023-08-01-preview/mfe.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 5ec32fbe8dfc..e4d2a33d5c10 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -13600,27 +13600,6 @@ }, "additionalProperties": false }, - "CapacityReservation": { - "required": [ - "capacityReservationGroupId" - ], - "type": "object", - "properties": { - "capacityReservationGroupId": { - "description": "[Required] Specifies a capacity reservation group ID to allocate capacity from.", - "minLength": 1, - "pattern": "[a-zA-Z0-9_]", - "type": "string" - }, - "endpointReservedCapacity": { - "format": "int32", - "description": "Specifies a capacity amount to reserve for this endpoint within the parent capacity reservation group.", - "type": "integer", - "x-nullable": true - } - }, - "additionalProperties": false - }, "CapacityReservationGroup": { "required": [ "reservedCapacity" @@ -25001,7 +24980,7 @@ }, "capacityReservation": { "description": "Optional capacity reservation information for the endpoint. When specified, the Serverless Endpoint\r\nwill be allocated capacity from the specified capacity reservation group.", - "$ref": "#/definitions/CapacityReservation", + "$ref": "#/definitions/ServerlessEndpointCapacityReservation", "x-nullable": true }, "inferenceEndpoint": { @@ -25029,6 +25008,27 @@ "x-ms-client-name": "ServerlessEndpointProperties", "additionalProperties": false }, + "ServerlessEndpointCapacityReservation": { + "required": [ + "capacityReservationGroupId" + ], + "type": "object", + "properties": { + "capacityReservationGroupId": { + "description": "[Required] Specifies a capacity reservation group ID to allocate capacity from.", + "minLength": 1, + "pattern": "[a-zA-Z0-9_]", + "type": "string" + }, + "endpointReservedCapacity": { + "format": "int32", + "description": "Specifies a capacity amount to reserve for this endpoint within the parent capacity reservation group.", + "type": "integer", + "x-nullable": true + } + }, + "additionalProperties": false + }, "ServerlessEndpointStatus": { "type": "object", "properties": { From 9f18b196f911e36fc384146003deef6a3f273313 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 15 Sep 2023 18:15:10 -0400 Subject: [PATCH 12/20] update description --- .../preview/2023-08-01-preview/mfe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index e4d2a33d5c10..d480c0394906 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -12142,7 +12142,7 @@ "tags": [ "ServerlessEndpoint" ], - "summary": "Temporary status API until integration completes.", + "summary": "Status of the model backing the Serverless Endpoint.", "operationId": "ServerlessEndpoints_GetStatus", "produces": [ "application/json" From 9e7d67c0c6fd8f597b8e6a021e13f1a95611d5cf Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 21 Sep 2023 15:01:16 -0400 Subject: [PATCH 13/20] remove ExcessCapacityReservation concept --- .../createOrUpdate.json | 24 ++--------- .../CapacityReservationGroup/get.json | 8 +--- .../CapacityReservationGroup/list.json | 8 +--- .../preview/2023-08-01-preview/mfe.json | 43 ------------------- 4 files changed, 5 insertions(+), 78 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json index a149dc667f10..ae1988921765 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json @@ -11,13 +11,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reservedCapacity": 1, - "excessCapacityReservation": { - "policyType": "Weighted", - "weights": { - "string": 1 - } - } + "reservedCapacity": 1 }, "tags": {}, "location": "string", @@ -50,13 +44,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reservedCapacity": 1, - "excessCapacityReservation": { - "policyType": "Weighted", - "weights": { - "string": 1 - } - } + "reservedCapacity": 1 }, "systemData": { "createdAt": "2020-01-01T12:34:56.999+00:15", @@ -101,13 +89,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reservedCapacity": 1, - "excessCapacityReservation": { - "policyType": "Weighted", - "weights": { - "string": 1 - } - } + "reservedCapacity": 1 }, "systemData": { "createdAt": "2020-01-01T12:34:56.999+00:15", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json index d347391f614a..a9b2c99c35d5 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -20,13 +20,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reservedCapacity": 1, - "excessCapacityReservation": { - "policyType": "Weighted", - "weights": { - "string": 1 - } - } + "reservedCapacity": 1 }, "systemData": { "createdAt": "2020-01-01T12:34:56.999+00:14", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json index 17c716e90b3a..fa67aa19c31c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json @@ -21,13 +21,7 @@ "offerName": "string" }, "parentGroupId": "string", - "reservedCapacity": 1, - "excessCapacityReservation": { - "policyType": "Weighted", - "weights": { - "string": 1 - } - } + "reservedCapacity": 1 }, "systemData": { "createdAt": "2020-01-01T12:34:56.999+00:08", diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index d480c0394906..0d879d731ebe 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -13606,11 +13606,6 @@ ], "type": "object", "properties": { - "excessCapacityReservation": { - "description": "Specifies the policy for distributing excess capacity\r\nbetween children within this group.", - "$ref": "#/definitions/ExcessCapacityReservation", - "x-nullable": true - }, "offer": { "description": "Offer used by this capacity reservation group.", "$ref": "#/definitions/ServerlessOffer", @@ -16597,44 +16592,6 @@ }, "additionalProperties": false }, - "ExcessCapacityReservation": { - "required": [ - "policyType", - "weights" - ], - "type": "object", - "properties": { - "policyType": { - "description": "[Required] The Policy Type for a Capacity Reservation Group", - "$ref": "#/definitions/ExcessCapacityReservationPolicyType" - }, - "weights": { - "description": "[Required] Distribution weights of excess capacity.", - "type": "object", - "additionalProperties": { - "format": "int32", - "type": "integer" - } - } - }, - "additionalProperties": false - }, - "ExcessCapacityReservationPolicyType": { - "enum": [ - "Weighted" - ], - "type": "string", - "x-ms-enum": { - "name": "ExcessCapacityReservationPolicyType", - "modelAsString": true, - "values": [ - { - "value": "Weighted" - } - ] - }, - "additionalProperties": false - }, "ExportFormatType": { "description": "The format of exported labels.", "enum": [ From 7a1bfebb76da305a36f49c94383cc9d01acf231e Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 21 Sep 2023 15:02:11 -0400 Subject: [PATCH 14/20] remove parentGroupId concept --- .../examples/CapacityReservationGroup/createOrUpdate.json | 3 --- .../examples/CapacityReservationGroup/get.json | 1 - .../examples/CapacityReservationGroup/list.json | 1 - .../preview/2023-08-01-preview/mfe.json | 5 ----- 4 files changed, 10 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json index ae1988921765..a4ebb3b1c122 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/createOrUpdate.json @@ -10,7 +10,6 @@ "publisher": "string", "offerName": "string" }, - "parentGroupId": "string", "reservedCapacity": 1 }, "tags": {}, @@ -43,7 +42,6 @@ "publisher": "string", "offerName": "string" }, - "parentGroupId": "string", "reservedCapacity": 1 }, "systemData": { @@ -88,7 +86,6 @@ "publisher": "string", "offerName": "string" }, - "parentGroupId": "string", "reservedCapacity": 1 }, "systemData": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json index a9b2c99c35d5..24f172fec57c 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -19,7 +19,6 @@ "publisher": "string", "offerName": "string" }, - "parentGroupId": "string", "reservedCapacity": 1 }, "systemData": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json index fa67aa19c31c..8a316b1971de 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/list.json @@ -20,7 +20,6 @@ "publisher": "string", "offerName": "string" }, - "parentGroupId": "string", "reservedCapacity": 1 }, "systemData": { diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 0d879d731ebe..386664d10fd4 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -13611,11 +13611,6 @@ "$ref": "#/definitions/ServerlessOffer", "x-nullable": true }, - "parentGroupId": { - "description": "Specifies the parent capacity reservation group Id.", - "type": "string", - "x-nullable": true - }, "reservedCapacity": { "format": "int32", "description": "[Required] Specifies the amount of capacity to reserve.", From 767baac5e01303b2a9f0323d00a3c2c7c39b985d Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Thu, 21 Sep 2023 15:03:31 -0400 Subject: [PATCH 15/20] rename /status api to /getStatus --- .../preview/2023-08-01-preview/mfe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 386664d10fd4..20b3b62b12b0 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -12137,7 +12137,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/serverlessEndpoints/{name}/status": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/serverlessEndpoints/{name}/getStatus": { "post": { "tags": [ "ServerlessEndpoint" From d447cb88fe14be841790427b93cb8f6b28be4cf3 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 22 Sep 2023 14:20:52 -0400 Subject: [PATCH 16/20] label metrics as readOnly --- .../preview/2023-08-01-preview/mfe.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 20b3b62b12b0..0bef392e13f2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -24990,6 +24990,7 @@ "type": "string", "x-nullable": true }, + "readOnly": true, "x-nullable": true } }, From 1754025cfc40e7d225906f1514d7a49dcc0f2dcb Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 22 Sep 2023 15:02:04 -0400 Subject: [PATCH 17/20] lintdiff GET fix --- .../preview/2023-08-01-preview/mfe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 0bef392e13f2..4aa23b8b9666 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -142,7 +142,7 @@ "200": { "description": "Success", "schema": { - "$ref": "#/definitions/CapacityReservationGroupTrackedResourceArmPaginatedResult" + "$ref": "#/definitions/CapacityReservationGroupTrackedResource" } }, "default": { From bb6c086eb664c69ccd2c898ed99605a3a1b9aa40 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 22 Sep 2023 15:41:35 -0400 Subject: [PATCH 18/20] more fixes --- .../preview/2023-08-01-preview/mfe.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 4aa23b8b9666..9bfaba42e137 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -25,12 +25,6 @@ { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, - { - "in": "query", - "name": "groupId", - "type": "string", - "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,254}$" - }, { "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" }, @@ -156,9 +150,6 @@ "Get Capacity Reservation Group.": { "$ref": "./examples/CapacityReservationGroup/get.json" } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } }, "patch": { @@ -24991,6 +24982,9 @@ "x-nullable": true }, "readOnly": true, + "x-ms-mutability": [ + "read" + ], "x-nullable": true } }, From 93462c185be33aebabe1e99e0b5ec47356f31f33 Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 22 Sep 2023 15:52:13 -0400 Subject: [PATCH 19/20] add listBySubscription --- .../preview/2023-08-01-preview/mfe.json | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json index 9bfaba42e137..d5f7d8c564fa 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/mfe.json @@ -9,6 +9,50 @@ "https" ], "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups": { + "get": { + "tags": [ + "SubscriptionCapacityReservationGroup" + ], + "operationId": "CapacityReservationGroups_CapacityReservationGroups_ListBySubscription", + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "machineLearningServices.json#/parameters/PaginationParameter" + } + ], + "responses": { + "200": { + "description": "Success", + "schema": { + "$ref": "#/definitions/CapacityReservationGroupTrackedResourceArmPaginatedResult" + } + }, + "default": { + "description": "Error", + "schema": { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" + } + } + }, + "x-ms-examples": { + "ListBySubscription Capacity Reservation Group.": { + "$ref": "./examples/CapacityReservationGroup/listBySubscription.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/capacityReserverationGroups": { "get": { "tags": [ From 88ab27cf10f901d47e9d256a19542986b56e616b Mon Sep 17 00:00:00 2001 From: Teddy Todorov Date: Fri, 22 Sep 2023 15:54:21 -0400 Subject: [PATCH 20/20] add/fix examples --- .../CapacityReservationGroup/get.json | 77 +++++++++---------- .../listBySubscription.json | 58 ++++++++++++++ 2 files changed, 94 insertions(+), 41 deletions(-) create mode 100644 specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/listBySubscription.json diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json index 24f172fec57c..a32f96a16c5a 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/get.json @@ -9,50 +9,45 @@ "200": { "headers": {}, "body": { - "value": [ - { - "id": "string", - "name": "string", - "type": "string", - "properties": { - "offer": { - "publisher": "string", - "offerName": "string" - }, - "reservedCapacity": 1 - }, - "systemData": { - "createdAt": "2020-01-01T12:34:56.999+00:14", - "createdBy": "string", - "createdByType": "Key", - "lastModifiedAt": "2020-01-01T12:34:56.999+00:14", - "lastModifiedBy": "string", - "lastModifiedByType": "Application" - }, - "tags": {}, - "location": "string", - "kind": "string", - "identity": { - "type": "SystemAssigned", + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "reservedCapacity": 1 + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:53", + "createdBy": "string", + "createdByType": "Key", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:53", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { "principalId": "00000000-1111-2222-3333-444444444444", - "tenantId": "00000000-1111-2222-3333-444444444444", - "userAssignedIdentities": { - "string": { - "principalId": "00000000-1111-2222-3333-444444444444", - "clientId": "00000000-1111-2222-3333-444444444444" - } - } - }, - "sku": { - "name": "string", - "tier": "Standard", - "size": "string", - "family": "string", - "capacity": 1 + "clientId": "00000000-1111-2222-3333-444444444444" } } - ], - "nextLink": "string" + }, + "sku": { + "name": "string", + "tier": "Free", + "size": "string", + "family": "string", + "capacity": 1 + } } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/listBySubscription.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/listBySubscription.json new file mode 100644 index 000000000000..8de595094acd --- /dev/null +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2023-08-01-preview/examples/CapacityReservationGroup/listBySubscription.json @@ -0,0 +1,58 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "api-version": "2023-08-01-preview", + "$skipToken": "string" + }, + "responses": { + "200": { + "headers": {}, + "body": { + "value": [ + { + "id": "string", + "name": "string", + "type": "string", + "properties": { + "offer": { + "publisher": "string", + "offerName": "string" + }, + "reservedCapacity": 1 + }, + "systemData": { + "createdAt": "2020-01-01T12:34:56.999+00:52", + "createdBy": "string", + "createdByType": "ManagedIdentity", + "lastModifiedAt": "2020-01-01T12:34:56.999+00:52", + "lastModifiedBy": "string", + "lastModifiedByType": "Application" + }, + "tags": {}, + "location": "string", + "kind": "string", + "identity": { + "type": "SystemAssigned,UserAssigned", + "principalId": "00000000-1111-2222-3333-444444444444", + "tenantId": "00000000-1111-2222-3333-444444444444", + "userAssignedIdentities": { + "string": { + "principalId": "00000000-1111-2222-3333-444444444444", + "clientId": "00000000-1111-2222-3333-444444444444" + } + } + }, + "sku": { + "name": "string", + "tier": "Standard", + "size": "string", + "family": "string", + "capacity": 1 + } + } + ], + "nextLink": "string" + } + } + } +}