From f36d8061bd62e8ec79b9bc89834fd598131a0869 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Mon, 21 Jun 2021 18:06:16 -0400 Subject: [PATCH 1/9] added swagger and examples --- .../examples/ListAvailableResourceSkus.json | 191 ++++++++ .../ListAvailableResourceSkusForARegion.json | 192 ++++++++ ...ableResourceSkusWithExtendedLocations.json | 221 +++++++++ .../stable/2021-07-01/skus.json | 455 ++++++++++++++++++ 4 files changed, 1059 insertions(+) create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json create mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json new file mode 100644 index 000000000000..10ab155e5767 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json @@ -0,0 +1,191 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2020-10-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "2", + "1" + ], + "zoneDetails": [ + { + "name": [ + "2" + ], + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "True" + } + ] + } + ] + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "1", + "2", + "3" + ] + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json new file mode 100644 index 000000000000..b5492ef22a9f --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json @@ -0,0 +1,192 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2020-10-01", + "$filter": "location eq 'westus'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "2", + "1" + ], + "zoneDetails": [ + { + "name": [ + "2" + ], + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "True" + } + ] + } + ] + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "1", + "2", + "3" + ] + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json new file mode 100644 index 000000000000..b1a53559420c --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json @@ -0,0 +1,221 @@ +{ + "parameters": { + "subscriptionId": "{subscription-id}", + "api-version": "2020-10-01", + "includeExtendedLocations": "true" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "20480" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "0.75" + }, + { + "name": "MaxDataDiskCount", + "value": "1" + }, + { + "name": "LowPriorityCapable", + "value": "False" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "50" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "2", + "1" + ], + "zoneDetails": [ + { + "name": [ + "2" + ], + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "True" + } + ] + } + ] + } + ], + "name": "Standard_A0", + "tier": "Standard", + "size": "A0", + "family": "standardA0_A7Family" + }, + { + "resourceType": "virtualMachines", + "locations": [ + "westus" + ], + "capabilities": [ + { + "name": "MaxResourceVolumeMB", + "value": "71680" + }, + { + "name": "OSVhdSizeMB", + "value": "1047552" + }, + { + "name": "vCPUs", + "value": "1" + }, + { + "name": "HyperVGenerations", + "value": "V1" + }, + { + "name": "MemoryGB", + "value": "1.75" + }, + { + "name": "MaxDataDiskCount", + "value": "2" + }, + { + "name": "LowPriorityCapable", + "value": "True" + }, + { + "name": "PremiumIO", + "value": "False" + }, + { + "name": "vCPUsAvailable", + "value": "1" + }, + { + "name": "ACUs", + "value": "100" + }, + { + "name": "vCPUsPerCore", + "value": "1" + }, + { + "name": "EphemeralOSDiskSupported", + "value": "False" + }, + { + "name": "AcceleratedNetworkingEnabled", + "value": "False" + }, + { + "name": "RdmaEnabled", + "value": "False" + }, + { + "name": "MaxNetworkInterfaces", + "value": "2" + } + ], + "locationInfo": [ + { + "location": "westus", + "zones": [ + "1", + "2", + "3" + ] + }, + { + "location": "westus", + "extendedLocations": [ + "Las Vegas", + "Seattle", + "Portland" + ], + "type": "EdgeZone", + "locationDetails": [ + { + "name": ["Seattle", "Portland"], + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "False" + } + ] + }, + { + "name": ["Las Vegas"], + "capabilities": [ + { + "name": "SomeOtherThing", + "value": "10" + } + ] + } + ] + } + ], + "name": "Standard_A1", + "tier": "Standard", + "size": "A1", + "family": "standardA0_A7Family" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json new file mode 100644 index 000000000000..abb75f11c0d2 --- /dev/null +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -0,0 +1,455 @@ +{ + "swagger": "2.0", + "info": { + "title": "ComputeManagementClient", + "description": "The Compute Management Client.", + "version": "2020-10-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": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/skus": { + "get": { + "tags": [ + "Skus", + "AvailabilitySets" + ], + "operationId": "ResourceSkus_List", + "description": "Gets the list of Microsoft.Compute SKUs available for your Subscription.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/IncludeExtendedLocationsParameter" + }, + { + "name": "$filter", + "in": "query", + "required": false, + "type": "string", + "description": "The filter to apply on the operation. Only **location** filter is supported currently." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ResourceSkusResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Lists all available Resource SKUs": { + "$ref": "./examples/ListAvailableResourceSkus.json" + }, + "Lists all available Resource SKUs for the specified region": { + "$ref": "./examples/ListAvailableResourceSkusForARegion.json" + }, + "Lists all available Resource SKUs with Extended Location information": { + "$ref": "./examples/ListAvailableResourceSkusWithExtendedLocations.json" + } + } + } + } + }, + "definitions": { + "ResourceSkuCapacity": { + "properties": { + "minimum": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The minimum capacity." + }, + "maximum": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The maximum capacity that can be set." + }, + "default": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The default capacity." + }, + "scaleType": { + "type": "string", + "readOnly": true, + "description": "The scale type applicable to the sku.", + "enum": [ + "Automatic", + "Manual", + "None" + ], + "x-ms-enum": { + "name": "ResourceSkuCapacityScaleType", + "modelAsString": false + } + } + }, + "description": "Describes scaling information of a SKU." + }, + "ResourceSkuCosts": { + "properties": { + "meterID": { + "type": "string", + "readOnly": true, + "description": "Used for querying price from commerce." + }, + "quantity": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The multiplier is needed to extend the base metered cost." + }, + "extendedUnit": { + "type": "string", + "readOnly": true, + "description": "An invariant to show the extended unit." + } + }, + "description": "Describes metadata for retrieving price info." + }, + "ResourceSkuCapabilities": { + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "An invariant to describe the feature." + }, + "value": { + "type": "string", + "readOnly": true, + "description": "An invariant if the feature is measured by quantity." + } + }, + "description": "Describes The SKU capabilities object." + }, + "ResourceSkuZoneDetails": { + "properties": { + "name": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" + }, + "description": "The set of zones that the SKU is available in with the specified capabilities." + }, + "capabilities": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" + }, + "description": "A list of capabilities that are available for the SKU in the specified list of zones." + } + }, + "description": "Describes The zonal capabilities of a SKU." + }, + "ResourceSkuRestrictions": { + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "The type of restrictions.", + "enum": [ + "Location", + "Zone" + ], + "x-ms-enum": { + "name": "ResourceSkuRestrictionsType", + "modelAsString": false + } + }, + "values": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" + }, + "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." + }, + "restrictionInfo": { + "$ref": "#/definitions/ResourceSkuRestrictionInfo", + "readOnly": true, + "description": "The information about the restriction where the SKU cannot be used." + }, + "reasonCode": { + "type": "string", + "readOnly": true, + "description": "The reason for restriction.", + "enum": [ + "QuotaId", + "NotAvailableForSubscription" + ], + "x-ms-enum": { + "name": "ResourceSkuRestrictionsReasonCode", + "modelAsString": false + } + } + }, + "description": "Describes scaling information of a SKU." + }, + "ResourceSku": { + "properties": { + "resourceType": { + "readOnly": true, + "type": "string", + "description": "The type of resource the SKU applies to." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of SKU." + }, + "tier": { + "readOnly": true, + "type": "string", + "description": "Specifies the tier of virtual machines in a scale set.

Possible Values:

**Standard**

**Basic**" + }, + "size": { + "readOnly": true, + "type": "string", + "description": "The Size of the SKU." + }, + "family": { + "readOnly": true, + "type": "string", + "description": "The Family of this particular SKU." + }, + "kind": { + "readOnly": true, + "type": "string", + "description": "The Kind of resources that are supported in this SKU." + }, + "capacity": { + "$ref": "#/definitions/ResourceSkuCapacity", + "readOnly": true, + "description": "Specifies the number of virtual machines in the scale set." + }, + "locations": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" + }, + "description": "The set of locations that the SKU is available." + }, + "locationInfo": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuLocationInfo" + }, + "description": "A list of locations and availability zones in those locations where the SKU is available." + }, + "apiVersions": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" + }, + "description": "The api versions that support this SKU." + }, + "costs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCosts" + }, + "description": "Metadata for retrieving price info." + }, + "capabilities": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" + }, + "description": "A name value pair to describe the capability." + }, + "restrictions": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuRestrictions" + }, + "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." + } + }, + "description": "Describes an available Compute SKU." + }, + "ResourceSkuLocationInfo": { + "properties": { + "location": { + "readOnly": true, + "type": "string", + "description": "Location of the SKU" + }, + "zones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "List of availability zones where the SKU is supported." + }, + "zoneDetails": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ResourceSkuZoneDetails" + }, + "description": "Details of capabilities available to a SKU in specific zones." + }, + "extendedLocations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "The names of extended locations." + }, + "type": { + "type": "string", + "readOnly": true, + "description": "The type of the extended location.", + "enum": [ + "EdgeZone" + ], + "x-ms-enum": { + "name": "ExtendedLocationType", + "modelAsString": true + } + }, + "locationDetails": { + "readOnly": true, + "type": "array", + "items": { + "properties": { + "name": { + "type": "array", + "items": { + "type": "string" + } + }, + "capabilities": { + "type": "array", + "items": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "value": { + "type": "string" + } + } + } + } + } + } + } + } + }, + "description": "Describes an available Compute SKU Location Information." + }, + "ResourceSkuRestrictionInfo": { + "properties": { + "locations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "Locations where the SKU is restricted" + }, + "zones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "List of availability zones where the SKU is restricted." + } + }, + "description": "Describes an available Compute SKU Restriction Information." + }, + "ResourceSkusResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceSku" + }, + "description": "The list of skus available for the subscription." + }, + "nextLink": { + "type": "string", + "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus" + } + }, + "required": [ + "value" + ], + "description": "The List Resource Skus operation response." + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + }, + "IncludeExtendedLocationsParameter": { + "name": "includeExtendedLocations", + "in": "query", + "required": false, + "type": "string", + "description": "To Include Extended Locations information or not in the response.", + "x-ms-parameter-location": "method" + } + } + } \ No newline at end of file From c532df2c567c86c24ee25ede52fa70346bf5b265 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Tue, 22 Jun 2021 14:32:12 -0400 Subject: [PATCH 2/9] added readme with 2021-07-1 notes --- specification/compute/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index 6ca9f41addda..b66165693bd8 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -252,6 +252,7 @@ These settings apply only when `--tag=package-2021-07-01-only` is specified on t input-file: - Microsoft.Compute/stable/2021-07-01/compute.json - Microsoft.Compute/stable/2021-07-01/runCommands.json +- Microsoft.Compute/stable/2021-07-01/skus.json ``` ### Tag: package-2021-03-01 From f5932043fc56fcf65b49b9f2ed2c5c04d2413a45 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Tue, 22 Jun 2021 14:55:12 -0400 Subject: [PATCH 3/9] fixed examples' style --- .../examples/ListAvailableResourceSkus.json | 2 +- .../ListAvailableResourceSkusForARegion.json | 2 +- ...ableResourceSkusWithExtendedLocations.json | 43 +++++++++++-------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json index 10ab155e5767..16f3c36d3f9f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json @@ -188,4 +188,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json index b5492ef22a9f..523e931a36d9 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json @@ -189,4 +189,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json index b1a53559420c..138fe1f4b9c2 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json @@ -187,24 +187,29 @@ ], "type": "EdgeZone", "locationDetails": [ - { - "name": ["Seattle", "Portland"], - "capabilities": [ - { - "name": "UltraSSDAvailable", - "value": "False" - } - ] - }, - { - "name": ["Las Vegas"], - "capabilities": [ - { - "name": "SomeOtherThing", - "value": "10" - } - ] - } + { + "name": [ + "Seattle", + "Portland" + ], + "capabilities": [ + { + "name": "UltraSSDAvailable", + "value": "False" + } + ] + }, + { + "name": [ + "Las Vegas" + ], + "capabilities": [ + { + "name": "SomeOtherThing", + "value": "10" + } + ] + } ] } ], @@ -218,4 +223,4 @@ } } } -} \ No newline at end of file +} From 7ed4c7e3e29d8a1a42d90f013ec0c94e4455fe2e Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Tue, 22 Jun 2021 15:01:24 -0400 Subject: [PATCH 4/9] curly brace fix to skus.json --- .../Microsoft.Compute/stable/2021-07-01/skus.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json index abb75f11c0d2..0f00dcee559f 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -383,9 +383,9 @@ } } } - } - }, + }, "description": "Describes an available Compute SKU Location Information." + } }, "ResourceSkuRestrictionInfo": { "properties": { From d889c30ab6f17db26e62618e5a5bb279fa7eb6a5 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Tue, 22 Jun 2021 15:36:10 -0400 Subject: [PATCH 5/9] Prettified skus.json --- .../stable/2021-07-01/skus.json | 827 +++++++++--------- 1 file changed, 413 insertions(+), 414 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json index 0f00dcee559f..d8328f745a56 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -1,455 +1,454 @@ { - "swagger": "2.0", - "info": { - "title": "ComputeManagementClient", - "description": "The Compute Management Client.", - "version": "2020-10-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" - } + "swagger": "2.0", + "info": { + "title": "ComputeManagementClient", + "description": "The Compute Management Client.", + "version": "2020-10-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": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/skus": { - "get": { - "tags": [ - "Skus", - "AvailabilitySets" - ], - "operationId": "ResourceSkus_List", - "description": "Gets the list of Microsoft.Compute SKUs available for your Subscription.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/IncludeExtendedLocationsParameter" - }, - { - "name": "$filter", - "in": "query", - "required": false, - "type": "string", - "description": "The filter to apply on the operation. Only **location** filter is supported currently." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ResourceSkusResult" - } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/skus": { + "get": { + "tags": [ + "Skus", + "AvailabilitySets" + ], + "operationId": "ResourceSkus_List", + "description": "Gets the list of Microsoft.Compute SKUs available for your Subscription.", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/IncludeExtendedLocationsParameter" + }, + { + "name": "$filter", + "in": "query", + "required": false, + "type": "string", + "description": "The filter to apply on the operation. Only **location** filter is supported currently." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ResourceSkusResult" } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Lists all available Resource SKUs": { + "$ref": "./examples/ListAvailableResourceSkus.json" }, - "x-ms-pageable": { - "nextLinkName": "nextLink" + "Lists all available Resource SKUs for the specified region": { + "$ref": "./examples/ListAvailableResourceSkusForARegion.json" }, - "x-ms-examples": { - "Lists all available Resource SKUs": { - "$ref": "./examples/ListAvailableResourceSkus.json" - }, - "Lists all available Resource SKUs for the specified region": { - "$ref": "./examples/ListAvailableResourceSkusForARegion.json" - }, - "Lists all available Resource SKUs with Extended Location information": { - "$ref": "./examples/ListAvailableResourceSkusWithExtendedLocations.json" - } + "Lists all available Resource SKUs with Extended Location information": { + "$ref": "./examples/ListAvailableResourceSkusWithExtendedLocations.json" } } } - }, - "definitions": { - "ResourceSkuCapacity": { - "properties": { - "minimum": { - "type": "integer", - "readOnly": true, - "format": "int64", - "description": "The minimum capacity." - }, - "maximum": { - "type": "integer", - "readOnly": true, - "format": "int64", - "description": "The maximum capacity that can be set." - }, - "default": { - "type": "integer", - "readOnly": true, - "format": "int64", - "description": "The default capacity." - }, - "scaleType": { - "type": "string", - "readOnly": true, - "description": "The scale type applicable to the sku.", - "enum": [ - "Automatic", - "Manual", - "None" - ], - "x-ms-enum": { - "name": "ResourceSkuCapacityScaleType", - "modelAsString": false - } - } + } + }, + "definitions": { + "ResourceSkuCapacity": { + "properties": { + "minimum": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The minimum capacity." }, - "description": "Describes scaling information of a SKU." - }, - "ResourceSkuCosts": { - "properties": { - "meterID": { - "type": "string", - "readOnly": true, - "description": "Used for querying price from commerce." - }, - "quantity": { - "type": "integer", - "readOnly": true, - "format": "int64", - "description": "The multiplier is needed to extend the base metered cost." - }, - "extendedUnit": { - "type": "string", - "readOnly": true, - "description": "An invariant to show the extended unit." + "maximum": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The maximum capacity that can be set." + }, + "default": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The default capacity." + }, + "scaleType": { + "type": "string", + "readOnly": true, + "description": "The scale type applicable to the sku.", + "enum": [ + "Automatic", + "Manual", + "None" + ], + "x-ms-enum": { + "name": "ResourceSkuCapacityScaleType", + "modelAsString": false } + } + }, + "description": "Describes scaling information of a SKU." + }, + "ResourceSkuCosts": { + "properties": { + "meterID": { + "type": "string", + "readOnly": true, + "description": "Used for querying price from commerce." + }, + "quantity": { + "type": "integer", + "readOnly": true, + "format": "int64", + "description": "The multiplier is needed to extend the base metered cost." }, - "description": "Describes metadata for retrieving price info." + "extendedUnit": { + "type": "string", + "readOnly": true, + "description": "An invariant to show the extended unit." + } }, - "ResourceSkuCapabilities": { - "properties": { - "name": { - "type": "string", - "readOnly": true, - "description": "An invariant to describe the feature." - }, - "value": { - "type": "string", - "readOnly": true, - "description": "An invariant if the feature is measured by quantity." - } + "description": "Describes metadata for retrieving price info." + }, + "ResourceSkuCapabilities": { + "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "An invariant to describe the feature." }, - "description": "Describes The SKU capabilities object." + "value": { + "type": "string", + "readOnly": true, + "description": "An invariant if the feature is measured by quantity." + } }, - "ResourceSkuZoneDetails": { - "properties": { - "name": { - "type": "array", - "readOnly": true, - "items": { - "type": "string" - }, - "description": "The set of zones that the SKU is available in with the specified capabilities." + "description": "Describes The SKU capabilities object." + }, + "ResourceSkuZoneDetails": { + "properties": { + "name": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" + }, + "description": "The set of zones that the SKU is available in with the specified capabilities." + }, + "capabilities": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" }, - "capabilities": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSkuCapabilities" - }, - "description": "A list of capabilities that are available for the SKU in the specified list of zones." + "description": "A list of capabilities that are available for the SKU in the specified list of zones." + } + }, + "description": "Describes The zonal capabilities of a SKU." + }, + "ResourceSkuRestrictions": { + "properties": { + "type": { + "type": "string", + "readOnly": true, + "description": "The type of restrictions.", + "enum": [ + "Location", + "Zone" + ], + "x-ms-enum": { + "name": "ResourceSkuRestrictionsType", + "modelAsString": false } }, - "description": "Describes The zonal capabilities of a SKU." - }, - "ResourceSkuRestrictions": { - "properties": { - "type": { - "type": "string", - "readOnly": true, - "description": "The type of restrictions.", - "enum": [ - "Location", - "Zone" - ], - "x-ms-enum": { - "name": "ResourceSkuRestrictionsType", - "modelAsString": false - } - }, - "values": { - "type": "array", - "readOnly": true, - "items": { - "type": "string" - }, - "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." - }, - "restrictionInfo": { - "$ref": "#/definitions/ResourceSkuRestrictionInfo", - "readOnly": true, - "description": "The information about the restriction where the SKU cannot be used." + "values": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" }, - "reasonCode": { - "type": "string", - "readOnly": true, - "description": "The reason for restriction.", - "enum": [ - "QuotaId", - "NotAvailableForSubscription" - ], - "x-ms-enum": { - "name": "ResourceSkuRestrictionsReasonCode", - "modelAsString": false - } - } + "description": "The value of restrictions. If the restriction type is set to location. This would be different locations where the SKU is restricted." + }, + "restrictionInfo": { + "$ref": "#/definitions/ResourceSkuRestrictionInfo", + "readOnly": true, + "description": "The information about the restriction where the SKU cannot be used." }, - "description": "Describes scaling information of a SKU." + "reasonCode": { + "type": "string", + "readOnly": true, + "description": "The reason for restriction.", + "enum": [ + "QuotaId", + "NotAvailableForSubscription" + ], + "x-ms-enum": { + "name": "ResourceSkuRestrictionsReasonCode", + "modelAsString": false + } + } }, - "ResourceSku": { - "properties": { - "resourceType": { - "readOnly": true, - "type": "string", - "description": "The type of resource the SKU applies to." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "The name of SKU." - }, - "tier": { - "readOnly": true, - "type": "string", - "description": "Specifies the tier of virtual machines in a scale set.

Possible Values:

**Standard**

**Basic**" - }, - "size": { - "readOnly": true, - "type": "string", - "description": "The Size of the SKU." + "description": "Describes scaling information of a SKU." + }, + "ResourceSku": { + "properties": { + "resourceType": { + "readOnly": true, + "type": "string", + "description": "The type of resource the SKU applies to." + }, + "name": { + "readOnly": true, + "type": "string", + "description": "The name of SKU." + }, + "tier": { + "readOnly": true, + "type": "string", + "description": "Specifies the tier of virtual machines in a scale set.

Possible Values:

**Standard**

**Basic**" + }, + "size": { + "readOnly": true, + "type": "string", + "description": "The Size of the SKU." + }, + "family": { + "readOnly": true, + "type": "string", + "description": "The Family of this particular SKU." + }, + "kind": { + "readOnly": true, + "type": "string", + "description": "The Kind of resources that are supported in this SKU." + }, + "capacity": { + "$ref": "#/definitions/ResourceSkuCapacity", + "readOnly": true, + "description": "Specifies the number of virtual machines in the scale set." + }, + "locations": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" }, - "family": { - "readOnly": true, - "type": "string", - "description": "The Family of this particular SKU." + "description": "The set of locations that the SKU is available." + }, + "locationInfo": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuLocationInfo" }, - "kind": { - "readOnly": true, - "type": "string", - "description": "The Kind of resources that are supported in this SKU." + "description": "A list of locations and availability zones in those locations where the SKU is available." + }, + "apiVersions": { + "type": "array", + "readOnly": true, + "items": { + "type": "string" }, - "capacity": { - "$ref": "#/definitions/ResourceSkuCapacity", - "readOnly": true, - "description": "Specifies the number of virtual machines in the scale set." + "description": "The api versions that support this SKU." + }, + "costs": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCosts" }, - "locations": { - "type": "array", - "readOnly": true, - "items": { - "type": "string" - }, - "description": "The set of locations that the SKU is available." + "description": "Metadata for retrieving price info." + }, + "capabilities": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuCapabilities" }, - "locationInfo": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSkuLocationInfo" - }, - "description": "A list of locations and availability zones in those locations where the SKU is available." + "description": "A name value pair to describe the capability." + }, + "restrictions": { + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/ResourceSkuRestrictions" }, - "apiVersions": { - "type": "array", - "readOnly": true, - "items": { - "type": "string" - }, - "description": "The api versions that support this SKU." + "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." + } + }, + "description": "Describes an available Compute SKU." + }, + "ResourceSkuLocationInfo": { + "properties": { + "location": { + "readOnly": true, + "type": "string", + "description": "Location of the SKU" + }, + "zones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" }, - "costs": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSkuCosts" - }, - "description": "Metadata for retrieving price info." + "description": "List of availability zones where the SKU is supported." + }, + "zoneDetails": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/ResourceSkuZoneDetails" }, - "capabilities": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSkuCapabilities" - }, - "description": "A name value pair to describe the capability." + "description": "Details of capabilities available to a SKU in specific zones." + }, + "extendedLocations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" }, - "restrictions": { - "type": "array", - "readOnly": true, - "items": { - "$ref": "#/definitions/ResourceSkuRestrictions" - }, - "description": "The restrictions because of which SKU cannot be used. This is empty if there are no restrictions." + "description": "The names of extended locations." + }, + "type": { + "type": "string", + "readOnly": true, + "description": "The type of the extended location.", + "enum": [ + "EdgeZone" + ], + "x-ms-enum": { + "name": "ExtendedLocationType", + "modelAsString": true } }, - "description": "Describes an available Compute SKU." - }, - "ResourceSkuLocationInfo": { - "properties": { - "location": { - "readOnly": true, - "type": "string", - "description": "Location of the SKU" - }, - "zones": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "List of availability zones where the SKU is supported." - }, - "zoneDetails": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/ResourceSkuZoneDetails" - }, - "description": "Details of capabilities available to a SKU in specific zones." - }, - "extendedLocations": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "The names of extended locations." - }, - "type": { - "type": "string", - "readOnly": true, - "description": "The type of the extended location.", - "enum": [ - "EdgeZone" - ], - "x-ms-enum": { - "name": "ExtendedLocationType", - "modelAsString": true - } - }, - "locationDetails": { - "readOnly": true, - "type": "array", - "items": { + "locationDetails": { + "readOnly": true, + "type": "array", + "items": { + "properties": { + "name": { + "type": "array", + "items": { + "type": "string" + } + }, + "capabilities": { + "type": "array", + "items": { + "type": "object", "properties": { - "name": { - "type": "array", - "items": { - "type": "string" - } - }, - "capabilities": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } + "name": { + "type": "string" + }, + "value": { + "type": "string" } + } } + } } - }, - "description": "Describes an available Compute SKU Location Information." - } - }, - "ResourceSkuRestrictionInfo": { - "properties": { - "locations": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "Locations where the SKU is restricted" - }, - "zones": { - "readOnly": true, - "type": "array", - "items": { - "type": "string" - }, - "description": "List of availability zones where the SKU is restricted." } - }, - "description": "Describes an available Compute SKU Restriction Information." + } }, - "ResourceSkusResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ResourceSku" - }, - "description": "The list of skus available for the subscription." - }, - "nextLink": { - "type": "string", - "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus" - } - }, - "required": [ - "value" - ], - "description": "The List Resource Skus operation response." - } + "description": "Describes an available Compute SKU Location Information." }, - "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "required": true, - "type": "string", - "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + "ResourceSkuRestrictionInfo": { + "properties": { + "locations": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "Locations where the SKU is restricted" + }, + "zones": { + "readOnly": true, + "type": "array", + "items": { + "type": "string" + }, + "description": "List of availability zones where the SKU is restricted." + } }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "required": true, - "type": "string", - "description": "Client Api Version." + "description": "Describes an available Compute SKU Restriction Information." + }, + "ResourceSkusResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ResourceSku" + }, + "description": "The list of skus available for the subscription." + }, + "nextLink": { + "type": "string", + "description": "The URI to fetch the next page of Resource Skus. Call ListNext() with this URI to fetch the next page of Resource Skus" + } }, - "IncludeExtendedLocationsParameter": { - "name": "includeExtendedLocations", - "in": "query", - "required": false, - "type": "string", - "description": "To Include Extended Locations information or not in the response.", - "x-ms-parameter-location": "method" - } + "required": [ + "value" + ], + "description": "The List Resource Skus operation response." + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call." + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "Client Api Version." + }, + "IncludeExtendedLocationsParameter": { + "name": "includeExtendedLocations", + "in": "query", + "required": false, + "type": "string", + "description": "To Include Extended Locations information or not in the response.", + "x-ms-parameter-location": "method" } - } \ No newline at end of file + } +} From 66de27beee656b52f4f3fa1fd6bfad9b69ff4ae7 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Tue, 22 Jun 2021 17:07:52 -0400 Subject: [PATCH 6/9] change ordering for breaking change check --- .../Microsoft.Compute/stable/2021-07-01/skus.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json index d8328f745a56..6d0d7a1b5412 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -49,15 +49,15 @@ { "$ref": "#/parameters/SubscriptionIdParameter" }, - { - "$ref": "#/parameters/IncludeExtendedLocationsParameter" - }, { "name": "$filter", "in": "query", "required": false, "type": "string", "description": "The filter to apply on the operation. Only **location** filter is supported currently." + }, + { + "$ref": "#/parameters/IncludeExtendedLocationsParameter" } ], "responses": { @@ -359,6 +359,7 @@ "readOnly": true, "type": "array", "items": { + "type": "object", "properties": { "name": { "type": "array", From 8644d601016c0d790926addc9410cbb2936bd21c Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Wed, 23 Jun 2021 21:38:33 -0400 Subject: [PATCH 7/9] fixed api version in readme --- specification/compute/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/readme.md b/specification/compute/resource-manager/readme.md index b66165693bd8..ff8ef9a730c2 100644 --- a/specification/compute/resource-manager/readme.md +++ b/specification/compute/resource-manager/readme.md @@ -237,7 +237,7 @@ These settings apply only when `--tag=package-2021-07-01` is specified on the co input-file: - Microsoft.Compute/stable/2021-07-01/compute.json - Microsoft.Compute/stable/2021-07-01/runCommands.json -- Microsoft.Compute/stable/2019-04-01/skus.json +- Microsoft.Compute/stable/2021-07-01/skus.json - Microsoft.Compute/stable/2020-12-01/disk.json - Microsoft.Compute/stable/2020-09-30/gallery.json - Microsoft.Compute/stable/2020-09-30/sharedGallery.json From c4372a8b303da58ca576cdd4d266836855151d74 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Thu, 24 Jun 2021 16:22:13 -0400 Subject: [PATCH 8/9] updated location of examples --- .../examples/ListAvailableResourceSkus.json | 191 ----------------- .../ListAvailableResourceSkusForARegion.json | 192 ------------------ ...ableResourceSkusWithExtendedLocations.json | 0 .../stable/2021-07-01/skus.json | 6 +- 4 files changed, 3 insertions(+), 386 deletions(-) delete mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json delete mode 100644 specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json rename specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/{ => skus}/ListAvailableResourceSkusWithExtendedLocations.json (100%) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json deleted file mode 100644 index 16f3c36d3f9f..000000000000 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkus.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "api-version": "2020-10-01" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "resourceType": "virtualMachines", - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "20480" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "0.75" - }, - { - "name": "MaxDataDiskCount", - "value": "1" - }, - { - "name": "LowPriorityCapable", - "value": "False" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "50" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus", - "zones": [ - "2", - "1" - ], - "zoneDetails": [ - { - "name": [ - "2" - ], - "capabilities": [ - { - "name": "UltraSSDAvailable", - "value": "True" - } - ] - } - ] - } - ], - "name": "Standard_A0", - "tier": "Standard", - "size": "A0", - "family": "standardA0_A7Family" - }, - { - "resourceType": "virtualMachines", - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "71680" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "1.75" - }, - { - "name": "MaxDataDiskCount", - "value": "2" - }, - { - "name": "LowPriorityCapable", - "value": "True" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "100" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus", - "zones": [ - "1", - "2", - "3" - ] - } - ], - "name": "Standard_A1", - "tier": "Standard", - "size": "A1", - "family": "standardA0_A7Family" - } - ], - "nextLink": null - } - } - } -} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json deleted file mode 100644 index 523e931a36d9..000000000000 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusForARegion.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "parameters": { - "subscriptionId": "{subscription-id}", - "api-version": "2020-10-01", - "$filter": "location eq 'westus'" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "resourceType": "virtualMachines", - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "20480" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "0.75" - }, - { - "name": "MaxDataDiskCount", - "value": "1" - }, - { - "name": "LowPriorityCapable", - "value": "False" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "50" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus", - "zones": [ - "2", - "1" - ], - "zoneDetails": [ - { - "name": [ - "2" - ], - "capabilities": [ - { - "name": "UltraSSDAvailable", - "value": "True" - } - ] - } - ] - } - ], - "name": "Standard_A0", - "tier": "Standard", - "size": "A0", - "family": "standardA0_A7Family" - }, - { - "resourceType": "virtualMachines", - "locations": [ - "westus" - ], - "capabilities": [ - { - "name": "MaxResourceVolumeMB", - "value": "71680" - }, - { - "name": "OSVhdSizeMB", - "value": "1047552" - }, - { - "name": "vCPUs", - "value": "1" - }, - { - "name": "HyperVGenerations", - "value": "V1" - }, - { - "name": "MemoryGB", - "value": "1.75" - }, - { - "name": "MaxDataDiskCount", - "value": "2" - }, - { - "name": "LowPriorityCapable", - "value": "True" - }, - { - "name": "PremiumIO", - "value": "False" - }, - { - "name": "vCPUsAvailable", - "value": "1" - }, - { - "name": "ACUs", - "value": "100" - }, - { - "name": "vCPUsPerCore", - "value": "1" - }, - { - "name": "EphemeralOSDiskSupported", - "value": "False" - }, - { - "name": "AcceleratedNetworkingEnabled", - "value": "False" - }, - { - "name": "RdmaEnabled", - "value": "False" - }, - { - "name": "MaxNetworkInterfaces", - "value": "2" - } - ], - "locationInfo": [ - { - "location": "westus", - "zones": [ - "1", - "2", - "3" - ] - } - ], - "name": "Standard_A1", - "tier": "Standard", - "size": "A1", - "family": "standardA0_A7Family" - } - ], - "nextLink": null - } - } - } -} diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json similarity index 100% rename from specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/ListAvailableResourceSkusWithExtendedLocations.json rename to specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json index 1ece9ed8efc2..d1bdbfec2b12 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -73,13 +73,13 @@ }, "x-ms-examples": { "Lists all available Resource SKUs": { - "$ref": "./examples/ListAvailableResourceSkus.json" + "$ref": "./examples/skus/ListAvailableResourceSkus.json" }, "Lists all available Resource SKUs for the specified region": { - "$ref": "./examples/ListAvailableResourceSkusForARegion.json" + "$ref": "./examples/skus/ListAvailableResourceSkusForARegion.json" }, "Lists all available Resource SKUs with Extended Location information": { - "$ref": "./examples/ListAvailableResourceSkusWithExtendedLocations.json" + "$ref": "./examples/skus/ListAvailableResourceSkusWithExtendedLocations.json" } } } From ba165406635b7bba0dd4095b2afc41394ca607d2 Mon Sep 17 00:00:00 2001 From: Andrew Sager Date: Mon, 26 Jul 2021 16:30:55 -0400 Subject: [PATCH 9/9] removed locationdetails to match arm list sku schema --- ...ableResourceSkusWithExtendedLocations.json | 27 +---------------- .../stable/2021-07-01/skus.json | 29 ------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json index 138fe1f4b9c2..4adecf30c122 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/examples/skus/ListAvailableResourceSkusWithExtendedLocations.json @@ -185,32 +185,7 @@ "Seattle", "Portland" ], - "type": "EdgeZone", - "locationDetails": [ - { - "name": [ - "Seattle", - "Portland" - ], - "capabilities": [ - { - "name": "UltraSSDAvailable", - "value": "False" - } - ] - }, - { - "name": [ - "Las Vegas" - ], - "capabilities": [ - { - "name": "SomeOtherThing", - "value": "10" - } - ] - } - ] + "type": "EdgeZone" } ], "name": "Standard_A1", diff --git a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json index d1bdbfec2b12..464b5e4cbb13 100644 --- a/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json +++ b/specification/compute/resource-manager/Microsoft.Compute/stable/2021-07-01/skus.json @@ -354,35 +354,6 @@ "name": "ExtendedLocationType", "modelAsString": true } - }, - "locationDetails": { - "readOnly": true, - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "array", - "items": { - "type": "string" - } - }, - "capabilities": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - } } }, "description": "Describes an available Compute SKU Location Information."