Skip to content

Commit d3db2d3

Browse files
Lira-tronMirzaSikander
Lira-tron
authored and
MirzaSikander
committed
Adding fixes made in 2019-10-01 to 2019-11-01 (Azure#13414)
The PR for adding new version 2019-11-01 took longer than expected to be approved, so some fixes made in 10-01 were not included in 2019-11-01 version. The missing changes were the following PRs: Azure#12777 Azure#12555 Azure#13039 Azure#13097 Azure#12822 Azure#13280 Azure#12942 Azure#13248 Azure#13378 This PR is to add those corrections to 2019-11-01 version
1 parent ec451ec commit d3db2d3

File tree

2 files changed

+119
-5
lines changed

2 files changed

+119
-5
lines changed

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/consumption.json‎

Lines changed: 117 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@
11791179
"default": {
11801180
"description": "Error response describing why the operation failed.",
11811181
"schema": {
1182-
"$ref": "#/definitions/ErrorResponse"
1182+
"$ref": "#/definitions/HighCasedErrorResponse"
11831183
}
11841184
}
11851185
}
@@ -2350,7 +2350,7 @@
23502350
"readOnly": true
23512351
},
23522352
"productIdentifier": {
2353-
"description": "Identifier for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SKuId in partner center.",
2353+
"description": "Identifier for the product that has accrued charges by consumption or purchase . This is the concatenated key of productId and SkuId in partner center.",
23542354
"type": "string",
23552355
"readOnly": true
23562356
},
@@ -2440,6 +2440,12 @@
24402440
"description": "Flag to indicate if partner earned credit has been applied or not.",
24412441
"type": "string",
24422442
"readOnly": true
2443+
},
2444+
"payGPrice": {
2445+
"description": "Retail price for the resource.",
2446+
"type": "number",
2447+
"format": "decimal",
2448+
"readOnly": true
24432449
}
24442450
}
24452451
},
@@ -2515,6 +2521,11 @@
25152521
"type": "string",
25162522
"readOnly": true
25172523
},
2524+
"additionalInfo": {
2525+
"description": "Additional information.",
2526+
"type": "string",
2527+
"readOnly": true
2528+
},
25182529
"orderNumber": {
25192530
"description": "The order number.",
25202531
"type": "string",
@@ -3003,6 +3014,10 @@
30033014
"type": "string",
30043015
"description": "Resource sku"
30053016
},
3017+
"etag": {
3018+
"type": "string",
3019+
"description": "Resource etag."
3020+
},
30063021
"properties": {
30073022
"x-ms-client-flatten": true,
30083023
"$ref": "#/definitions/ReservationRecommendationDetailsProperties",
@@ -3208,6 +3223,11 @@
32083223
"description": "The link (url) to the next page of results.",
32093224
"type": "string",
32103225
"readOnly": true
3226+
},
3227+
"previousLink": {
3228+
"description": "The link (url) to the previous page of results.",
3229+
"type": "string",
3230+
"readOnly": true
32113231
}
32123232
}
32133233
},
@@ -3295,6 +3315,11 @@
32953315
"format": "uuid",
32963316
"readOnly": true
32973317
},
3318+
"resourceType": {
3319+
"description": "The azure resource type.",
3320+
"type": "string",
3321+
"readOnly": true
3322+
},
32983323
"term": {
32993324
"description": "RI recommendations in one or three year terms.",
33003325
"type": "string",
@@ -3383,9 +3408,15 @@
33833408
"ModernReservationRecommendationProperties": {
33843409
"description": "The properties of the reservation recommendation.",
33853410
"properties": {
3411+
"location": {
3412+
"type": "string",
3413+
"description": "Resource Location.",
3414+
"readOnly": true
3415+
},
33863416
"lookBackPeriod": {
33873417
"description": "The number of days of usage to look back for recommendation.",
3388-
"type": "string",
3418+
"type": "integer",
3419+
"format": "int32",
33893420
"readOnly": true
33903421
},
33913422
"instanceFlexibilityRatio": {
@@ -3458,6 +3489,11 @@
34583489
"$ref": "#/definitions/SkuProperty"
34593490
},
34603491
"readOnly": true
3492+
},
3493+
"skuName": {
3494+
"description": "This is the ARM Sku name.",
3495+
"type": "string",
3496+
"readOnly": true
34613497
}
34623498
}
34633499
},
@@ -3814,6 +3850,13 @@
38143850
"key": {
38153851
"description": "Tag key.",
38163852
"type": "string"
3853+
},
3854+
"value": {
3855+
"description": "Tag values.",
3856+
"type": "array",
3857+
"items": {
3858+
"type": "string"
3859+
}
38173860
}
38183861
}
38193862
},
@@ -3908,6 +3951,11 @@
39083951
"$ref": "#/definitions/Notification"
39093952
},
39103953
"maxItems": 5
3954+
},
3955+
"forecastSpend": {
3956+
"description": "The forecasted cost which is being tracked for a budget.",
3957+
"$ref": "#/definitions/ForecastSpend",
3958+
"readOnly": true
39113959
}
39123960
},
39133961
"required": [
@@ -4022,6 +4070,22 @@
40224070
}
40234071
}
40244072
},
4073+
"ForecastSpend": {
4074+
"description": "The forecasted cost which is being tracked for a budget.",
4075+
"properties": {
4076+
"amount": {
4077+
"description": "The forecasted cost for the total time period which is being tracked by the budget. This value is only provided if the budget contains a forecast alert type.",
4078+
"type": "number",
4079+
"format": "decimal",
4080+
"readOnly": true
4081+
},
4082+
"unit": {
4083+
"description": "The unit of measure for the budget amount.",
4084+
"type": "string",
4085+
"readOnly": true
4086+
}
4087+
}
4088+
},
40254089
"Notification": {
40264090
"description": "The notification associated with a budget.",
40274091
"properties": {
@@ -4123,6 +4187,26 @@
41234187
"description": "The link (url) to the next page of results.",
41244188
"type": "string",
41254189
"readOnly": true
4190+
},
4191+
"download": {
4192+
"description": "Pricesheet download details.",
4193+
"$ref": "#/definitions/MeterDetails",
4194+
"readOnly": true
4195+
}
4196+
}
4197+
},
4198+
"DownloadProperties": {
4199+
"description": "The properties of the price sheet download.",
4200+
"properties": {
4201+
"downloadUrl": {
4202+
"description": "The link (url) to download the pricesheet.",
4203+
"type": "string",
4204+
"readOnly": true
4205+
},
4206+
"validTill": {
4207+
"description": "Download link validity.",
4208+
"type": "string",
4209+
"readOnly": true
41264210
}
41274211
}
41284212
},
@@ -4603,6 +4687,31 @@
46034687
}
46044688
}
46054689
},
4690+
"HighCasedErrorDetails": {
4691+
"description": "The details of the error.",
4692+
"properties": {
4693+
"code": {
4694+
"description": "Error code.",
4695+
"type": "string",
4696+
"readOnly": true
4697+
},
4698+
"message": {
4699+
"description": "Error message indicating why the operation failed.",
4700+
"type": "string",
4701+
"readOnly": true
4702+
}
4703+
}
4704+
},
4705+
"HighCasedErrorResponse": {
4706+
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header.",
4707+
"type": "object",
4708+
"properties": {
4709+
"error": {
4710+
"description": "The details of the error.",
4711+
"$ref": "#/definitions/HighCasedErrorDetails"
4712+
}
4713+
}
4714+
},
46064715
"ErrorResponse": {
46074716
"description": "Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. \n\nSome Error responses: \n\n * 429 TooManyRequests - Request is throttled. Retry after waiting for the time specified in the \"x-ms-ratelimit-microsoft.consumption-retry-after\" header. \n\n * 503 ServiceUnavailable - Service is temporarily unavailable. Retry after waiting for the time specified in the \"Retry-After\" header.",
46084717
"type": "object",
@@ -4644,6 +4753,11 @@
46444753
"description": "Operation type: Read, write, delete, etc.",
46454754
"type": "string",
46464755
"readOnly": true
4756+
},
4757+
"description": {
4758+
"description": "Description of the operation.",
4759+
"type": "string",
4760+
"readOnly": true
46474761
}
46484762
}
46494763
}

‎specification/consumption/resource-manager/Microsoft.Consumption/stable/2019-11-01/examples/ReservationRecommendationsByBillingProfile.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"firstUsageDate": "2019-07-07T00:00:00-07:00",
3434
"scope": "Shared",
35-
"lookBackPeriod": "Last7Days",
35+
"lookBackPeriod": 7,
3636
"instanceFlexibilityRatio": 1,
3737
"instanceFlexibilityGroup": "DSv2 Series",
3838
"normalizedSize": "Standard_DS1_v2",
@@ -74,7 +74,7 @@
7474
},
7575
"firstUsageDate": "2019-07-07T00:00:00-07:00",
7676
"scope": "Shared",
77-
"lookBackPeriod": "Last7Days",
77+
"lookBackPeriod": 7,
7878
"instanceFlexibilityRatio": 1,
7979
"instanceFlexibilityGroup": "DSv2 Series",
8080
"normalizedSize": "Standard_DS1",

0 commit comments

Comments
 (0)