From 9cf3c40d0e87055e57338617cfada4d6506d28dc Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Mon, 30 Aug 2021 11:17:04 +0000 Subject: [PATCH 1/9] Add missing features, quotaLimist and Rotterdam networkFeatures --- .../2021-06-01/examples/QuotaLimits.json | 46 +++++ .../2021-06-01/examples/Volumes_Get.json | 5 +- .../2021-06-01/examples/Volumes_List.json | 5 +- .../2021-06-01/examples/Volumes_Update.json | 3 + .../stable/2021-06-01/netapp.json | 171 ++++++++++++++++++ 5 files changed, 228 insertions(+), 2 deletions(-) create mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json new file mode 100644 index 000000000000..33b4d662def4 --- /dev/null +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", + "location": "eastus", + "api-version": "2021-06-01" + }, + "responses": { + "200": { + "body": { + "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", + "accountsPerSubscription": { + "current": 10, + "default": 10 + }, + "poolsPerAccount": { + "current": 25, + "default": 25 + }, + "volumesPerPool": { + "current": 500, + "default": 500 + }, + "snapshotsPerVolume": { + "current": 255, + "default": 255 + }, + "totalTiBsPerSubscription": { + "current": 1000, + "default": 25 + }, + "totalDPVolumesPerSubscription": { + "current": 10, + "default": 10 + }, + "totalVolumesPerSubscription": { + "current": 500, + "default": 500 + }, + "totalCoolAccessVolumesPerSubscription": { + "current": 10, + "default": 10 + } + } + } + } +} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Get.json index 66c4cdc7bab2..42b607281427 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Get.json @@ -21,7 +21,10 @@ "serviceLevel": "Premium", "provisioningState": "Succeeded", "throughputMibps": 128, - "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3", + "networkFeatures": "Standard", + "networkSiblingSetId": "0f434a03-ce0b-4935-81af-d98652ffb1c4", + "storageToNetworkProximity": "T2" } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_List.json index 1e399be2ce63..431fc1fefa55 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_List.json @@ -22,7 +22,10 @@ "serviceLevel": "Premium", "provisioningState": "Succeeded", "throughputMibps": 128, - "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3" + "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3", + "networkFeatures": "Standard", + "networkSiblingSetId": "0f434a03-ce0b-4935-81af-d98652ffb1c4", + "storageToNetworkProximity": "T2" } } ] diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Update.json index 3b61a881e0a4..0fc672807b9c 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Update.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/Volumes_Update.json @@ -23,6 +23,9 @@ "provisioningState": "Succeeded", "throughputMibps": 128, "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3", + "networkFeatures": "Standard", + "networkSiblingSetId": "0f434a03-ce0b-4935-81af-d98652ffb1c4", + "storageToNetworkProximity": "T2", "dataProtection": { "snapshot": { "snapshotPolicyId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRP/providers/Microsoft.NetApp/netAppAccounts/account1/snapshotPolicies/snapshotPolicy1" diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index af16acd6f543..12f92bdbae25 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -207,6 +207,43 @@ } } }, + "/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits": { + "get": { + "tags": [ + "NetApp Resource" + ], + "summary": "Get quota limits", + "description": "Get the default and current limits for quotas", + "operationId": "NetAppResourceQuotaLimits_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/location" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/QuotaLimitsResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed." + } + }, + "x-ms-examples": { + "QuotaLimits": { + "$ref": "examples/QuotaLimits.json" + } + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/netAppAccounts": { "get": { "summary": "Describe all NetApp Accounts in a subscription", @@ -3040,6 +3077,75 @@ } } }, + "SubscriptionQuotaItem": { + "description": "Information regarding Subscription Quota Item", + "type": "object", + "properties": { + "current": { + "description": "The current quota value.", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "default": { + "description": "The default quota value.", + "readOnly": true, + "type": "integer", + "format": "int32" + } + } + }, + "QuotaLimitsResponse": { + "description": "Information regarding quota limits on subscription", + "type": "object", + "properties": { + "subscriptionId": { + "description": "Subscription identifier.", + "readOnly": true, + "type": "string" + }, + "accountsPerSubscription": { + "description": "The quota for maximum number of accounts per subscription.", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "poolsPerAccount": { + "description": "The quota for maximum number of capacity pools per account.", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "volumesPerPool": { + "description": "The quota for maximum number of volumes per capacity pool.", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "snapshotsPerVolume": { + "description": "The quota for maximum number of snapshots per volume", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "totalTiBsPerSubscription": { + "description": "The quota for maximum number of Tebibytes per subscription", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "totalDPVolumesPerSubscription": { + "description": "The quota for maximum number of data protection volumes per subscription.", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "totalVolumesPerSubscription": { + "description": "The quota for maximum number of volumes per subscription.", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + }, + "totalCoolAccessVolumesPerSubscription": { + "description": "The quota for maximum number of cool access volumes per subscription", + "type": "object", + "$ref": "#/definitions/SubscriptionQuotaItem" + } + } + }, "netAppAccountList": { "description": "List of NetApp account resources", "type": "object", @@ -3783,6 +3889,71 @@ "type": "string", "description": "The Azure Resource URI for a delegated subnet. Must have the delegation Microsoft.NetApp/volumes" }, + "networkFeatures": { + "title": "Network features", + "description": "Basic network, or Standard features available to the volume.", + "type": "string", + "enum": [ + "Basic", + "Standard" + ], + "x-ms-enum": { + "name": "NetworkFeatures", + "modelAsString": true, + "values": [ + { + "value": "Basic", + "description": "Basic network feature." + }, + { + "value": "Standard", + "description": "Standard network feature." + } + ] + }, + "example": "Standard", + "default": "Basic" + }, + "networkSiblingSetId": { + "title": "Network Sibling Set ID", + "description": "Network Sibling Set ID for the the group of volumes sharing networking resources.", + "type": "string", + "readOnly": true, + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "maxLength": 36, + "minLength": 36, + "example": "9760acf5-4638-11e7-9bdb-020073ca3333" + }, + "storageToNetworkProximity": { + "title": "Storage to Network Proximity", + "description": "Provides storage to network proximity information for the volume.", + "type": "string", + "enum": [ + "Default", + "T1", + "T2" + ], + "readOnly": true, + "x-ms-enum": { + "name": "VolumeStorageToNetworkProximity", + "modelAsString": true, + "values": [ + { + "value": "Default", + "description": "Basic storage to network connectivity." + }, + { + "value": "T1", + "description": "Standard T1 storage to network connectivity." + }, + { + "value": "T2", + "description": "Standard T2 storage to network connectivity." + } + ] + }, + "example": "T1" + }, "mountTargets": { "title": "mountTargets", "type": "array", From 9669f700aff09f9e8856b422ab50f0caa849c939 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Tue, 7 Sep 2021 10:47:32 +0000 Subject: [PATCH 2/9] Update quotaLimits get and add get list --- .../2021-06-01/examples/QuotaLimits.json | 46 ------------ .../2021-06-01/examples/QuotaLimits_Get.json | 17 +++++ .../2021-06-01/examples/QuotaLimits_List.json | 55 +++++++++++++++ .../stable/2021-06-01/netapp.json | 70 ++++++++++++++++++- 4 files changed, 140 insertions(+), 48 deletions(-) delete mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json create mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json create mode 100644 specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json deleted file mode 100644 index 33b4d662def4..000000000000 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "parameters": { - "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", - "location": "eastus", - "api-version": "2021-06-01" - }, - "responses": { - "200": { - "body": { - "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", - "accountsPerSubscription": { - "current": 10, - "default": 10 - }, - "poolsPerAccount": { - "current": 25, - "default": 25 - }, - "volumesPerPool": { - "current": 500, - "default": 500 - }, - "snapshotsPerVolume": { - "current": 255, - "default": 255 - }, - "totalTiBsPerSubscription": { - "current": 1000, - "default": 25 - }, - "totalDPVolumesPerSubscription": { - "current": 10, - "default": 10 - }, - "totalVolumesPerSubscription": { - "current": 500, - "default": 500 - }, - "totalCoolAccessVolumesPerSubscription": { - "current": 10, - "default": 10 - } - } - } - } -} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json new file mode 100644 index 000000000000..b071b33c4809 --- /dev/null +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", + "location": "eastus", + "quotaLimitName": "totalCoolAccessVolumesPerSubscription", + "api-version": "2021-06-01" + }, + "responses": { + "200": { + "body": { + "name": "totalCoolAccessVolumesPerSubscription", + "current": 10, + "default": 10 + } + } + } +} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json new file mode 100644 index 000000000000..195a2e2c5fa6 --- /dev/null +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json @@ -0,0 +1,55 @@ +{ + "parameters": { + "subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9", + "location": "eastus", + "api-version": "2021-06-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "accountsPerSubscription", + "current": 10, + "default": 10 + }, + { + "name": "poolsPerAccount", + "current": 25, + "default": 25 + }, + { + "name": "volumesPerPool", + "current": 500, + "default": 500 + }, + { + "name": "snapshotsPerVolume", + "current": 255, + "default": 255 + }, + { + "name": "totalTiBsPerSubscription", + "current": 1000, + "default": 25 + }, + { + "name": "totalDPVolumesPerSubscription", + "current": 10, + "default": 10 + }, + { + "name": "totalVolumesPerSubscription", + "current": 500, + "default": 500 + }, + { + "name": "totalCoolAccessVolumesPerSubscription", + "current": 10, + "default": 10 + } + ] + } + } + } +} diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 12f92bdbae25..d9226230847e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -214,6 +214,43 @@ ], "summary": "Get quota limits", "description": "Get the default and current limits for quotas", + "operationId": "NetAppResourceQuotaLimits_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/location" + }, + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SubscriptionQuotaItemList" + } + }, + "default": { + "description": "Error response describing why the operation failed." + } + }, + "x-ms-examples": { + "QuotaLimits": { + "$ref": "examples/QuotaLimits_List.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits/{quotaLimitName}": { + "get": { + "tags": [ + "NetApp Resource" + ], + "summary": "Get quota limits", + "description": "Get the default and current subscription quota limit", "operationId": "NetAppResourceQuotaLimits_Get", "parameters": [ { @@ -222,6 +259,9 @@ { "$ref": "#/parameters/location" }, + { + "$ref": "#/parameters/QuotaLimitName" + }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } @@ -230,7 +270,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/QuotaLimitsResponse" + "$ref": "#/definitions/SubscriptionQuotaItem" } }, "default": { @@ -239,7 +279,7 @@ }, "x-ms-examples": { "QuotaLimits": { - "$ref": "examples/QuotaLimits.json" + "$ref": "examples/QuotaLimits_Get.json" } } } @@ -3077,10 +3117,28 @@ } } }, + "SubscriptionQuotaItemList": { + "description": "List of Subscription Quota Items", + "type": "object", + "properties": { + "value": { + "description": "A list of SubscriptionQuotaItems", + "type": "array", + "items": { + "$ref": "#/definitions/SubscriptionQuotaItem" + } + } + } + }, "SubscriptionQuotaItem": { "description": "Information regarding Subscription Quota Item", "type": "object", "properties": { + "name": { + "type": "string", + "readOnly": true, + "description": "Quota Item name" + }, "current": { "description": "The current quota value.", "readOnly": true, @@ -5661,6 +5719,14 @@ "type": "string", "description": "Backup policy Name which uniquely identify backup policy.", "x-ms-parameter-location": "method" + }, + "QuotaLimitName": { + "name": "quotaLimitName", + "type": "string", + "in": "path", + "required": true, + "description": "The name of the Quota Limit", + "x-ms-parameter-location": "method" } } } From 8aeb32103b9a9f569f0bf04701fed8d00069ba51 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Tue, 7 Sep 2021 12:26:23 +0000 Subject: [PATCH 3/9] Update description for volume type --- .../Microsoft.NetApp/stable/2021-06-01/netapp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index d9226230847e..00392ce564d2 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -4023,7 +4023,7 @@ }, "volumeType": { "type": "string", - "description": "What type of volume is this", + "description": "What type of volume is this. For destination volumes in Cross Region Replication, set type to DataProtection", "example": "DataProtection" }, "dataProtection": { From 59fd60748c90d965431a60bba88eafe41aa4adf5 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Tue, 7 Sep 2021 16:55:43 +0000 Subject: [PATCH 4/9] S360 Add missing serviceSpecification and metricsSpecification properties --- .../stable/2021-06-01/netapp.json | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 00392ce564d2..1c82184ae45c 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -2913,6 +2913,12 @@ "items": { "$ref": "#/definitions/MetricSpecification" } + }, + "logSpecifications": { + "type": "array", + "items": { + "$ref": "#/definitions/LogSpecification" + } } } }, @@ -2961,6 +2967,10 @@ "type": "string", "description": "The internal metric name." }, + "enableRegionalMdmAccount": { + "description": "Whether or not the service is using regional MDM accounts.", + "type": "boolean" + }, "sourceMdmAccount": { "type": "string", "description": "The source MDM account." @@ -2991,6 +3001,22 @@ "resourceIdDimensionNameOverride": { "type": "string", "description": "Account Resource Id." + }, + "isInternal": { + "description": "Whether the metric is internal.", + "type": "boolean" + } + } + }, + "LogSpecification": { + "description": "Log Definition of a single resource metric.", + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "displayName": { + "type": "string" } } }, From 1a37b0273ba6f5c39870e222efa7e586f3caadd5 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Wed, 8 Sep 2021 13:47:52 +0000 Subject: [PATCH 5/9] Remove quotalimit response no longer used --- .../stable/2021-06-01/netapp.json | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 1c82184ae45c..f6581f2d7256 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -3179,57 +3179,6 @@ } } }, - "QuotaLimitsResponse": { - "description": "Information regarding quota limits on subscription", - "type": "object", - "properties": { - "subscriptionId": { - "description": "Subscription identifier.", - "readOnly": true, - "type": "string" - }, - "accountsPerSubscription": { - "description": "The quota for maximum number of accounts per subscription.", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "poolsPerAccount": { - "description": "The quota for maximum number of capacity pools per account.", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "volumesPerPool": { - "description": "The quota for maximum number of volumes per capacity pool.", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "snapshotsPerVolume": { - "description": "The quota for maximum number of snapshots per volume", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "totalTiBsPerSubscription": { - "description": "The quota for maximum number of Tebibytes per subscription", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "totalDPVolumesPerSubscription": { - "description": "The quota for maximum number of data protection volumes per subscription.", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "totalVolumesPerSubscription": { - "description": "The quota for maximum number of volumes per subscription.", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - }, - "totalCoolAccessVolumesPerSubscription": { - "description": "The quota for maximum number of cool access volumes per subscription", - "type": "object", - "$ref": "#/definitions/SubscriptionQuotaItem" - } - } - }, "netAppAccountList": { "description": "List of NetApp account resources", "type": "object", From 3b9622e113f5708abe11ab5a0fd2b2924a1294d3 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Wed, 8 Sep 2021 17:11:31 +0000 Subject: [PATCH 6/9] pagable --- .../Microsoft.NetApp/stable/2021-06-01/netapp.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index f6581f2d7256..262c24029de2 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -233,6 +233,9 @@ "$ref": "#/definitions/SubscriptionQuotaItemList" } }, + "x-ms-pageable": { + "nextLinkName": null + }, "default": { "description": "Error response describing why the operation failed." } From 915a7d65564a5e82cb3165453c81a201d73233f4 Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Thu, 9 Sep 2021 14:22:38 +0000 Subject: [PATCH 7/9] Update to use common type proxy resource --- .../2021-06-01/examples/QuotaLimits_Get.json | 8 ++- .../2021-06-01/examples/QuotaLimits_List.json | 64 ++++++++++++++----- .../stable/2021-06-01/netapp.json | 25 ++++++-- 3 files changed, 75 insertions(+), 22 deletions(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json index b071b33c4809..b089ed8386cb 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_Get.json @@ -8,9 +8,13 @@ "responses": { "200": { "body": { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/totalCoolAccessVolumesPerSubscription", "name": "totalCoolAccessVolumesPerSubscription", - "current": 10, - "default": 10 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 10, + "default": 10 + } } } } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json index 195a2e2c5fa6..3e07b8c302be 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/examples/QuotaLimits_List.json @@ -9,44 +9,76 @@ "body": { "value": [ { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/accountsPerSubscription", "name": "accountsPerSubscription", - "current": 10, - "default": 10 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 10, + "default": 10 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/poolsPerAccount", "name": "poolsPerAccount", - "current": 25, - "default": 25 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 25, + "default": 25 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/volumesPerPool", "name": "volumesPerPool", - "current": 500, - "default": 500 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 500, + "default": 500 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/snapshotsPerVolume", "name": "snapshotsPerVolume", - "current": 255, - "default": 255 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 255, + "default": 255 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/totalTiBsPerSubscription", "name": "totalTiBsPerSubscription", - "current": 1000, - "default": 25 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 1000, + "default": 25 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/totalDPVolumesPerSubscription", "name": "totalDPVolumesPerSubscription", - "current": 10, - "default": 10 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 10, + "default": 10 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/totalVolumesPerSubscription", "name": "totalVolumesPerSubscription", - "current": 500, - "default": 500 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 500, + "default": 500 + } }, { + "id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/quotaLimists/totalCoolAccessVolumesPerSubscription", "name": "totalCoolAccessVolumesPerSubscription", - "current": 10, - "default": 10 + "type": "Microsoft.NetApp/quotaLimists", + "properties": { + "current": 10, + "default": 10 + } } ] } diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 262c24029de2..6c43fe6e1098 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -226,6 +226,9 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], + "x-ms-pageable": { + "nextLinkName": null + }, "responses": { "200": { "description": "OK", @@ -233,9 +236,6 @@ "$ref": "#/definitions/SubscriptionQuotaItemList" } }, - "x-ms-pageable": { - "nextLinkName": null - }, "default": { "description": "Error response describing why the operation failed." } @@ -3160,7 +3160,24 @@ } }, "SubscriptionQuotaItem": { - "description": "Information regarding Subscription Quota Item", + "description": "Information regarding Subscription Quota Item.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "description": "SubscriptionQuotaItem properties", + "$ref": "#/definitions/SubscriptionQuotaItemProperties", + "x-ms-client-flatten": true + } + } + }, + + "SubscriptionQuotaItemProperties": { + "description": "SubscriptionQuotaItem Properties", "type": "object", "properties": { "name": { From 9cf43586e03e1c0d1a7083b3c49621dcd1b3c75a Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Thu, 9 Sep 2021 14:55:56 +0000 Subject: [PATCH 8/9] pretty --- .../Microsoft.NetApp/stable/2021-06-01/netapp.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 6c43fe6e1098..6a81dccb6a2e 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -3175,7 +3175,6 @@ } } }, - "SubscriptionQuotaItemProperties": { "description": "SubscriptionQuotaItem Properties", "type": "object", From 92d4fb03b8c76f4769cf89c488f6d9ac22248f4e Mon Sep 17 00:00:00 2001 From: Audunn Baldvinsson Date: Thu, 9 Sep 2021 15:28:38 +0000 Subject: [PATCH 9/9] systemdata --- .../Microsoft.NetApp/stable/2021-06-01/netapp.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json index 6a81dccb6a2e..c2ac7d014f2d 100644 --- a/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json +++ b/specification/netapp/resource-manager/Microsoft.NetApp/stable/2021-06-01/netapp.json @@ -3172,6 +3172,11 @@ "description": "SubscriptionQuotaItem properties", "$ref": "#/definitions/SubscriptionQuotaItemProperties", "x-ms-client-flatten": true + }, + "systemData": { + "readOnly": true, + "description": "The system meta data relating to this resource.", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" } } },