Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix s360 errors in Reservation APIs #19575

Merged
merged 2 commits into from
Jun 25, 2022
Merged

Fix s360 errors in Reservation APIs #19575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25927a0
Fix s360 errors in Reservation APIs
pednekarpraj Jun 23, 2022
c59fb35
Add type to Reservation API resources
pednekarpraj Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 58 additions & 5 deletions ...ion/consumption/resource-manager/Microsoft.Consumption/stable/2019-10-01/consumption.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "#/definitions/RevisedResource"
}
],
"properties": {
Expand All @@ -2791,6 +2791,7 @@
},
"ReservationSummariesListResult": {
"description": "Result of listing reservation summaries.",
"type": "object",
"properties": {
"value": {
"description": "The list of reservation summaries.",
Expand All @@ -2809,6 +2810,7 @@
},
"ReservationSummaryProperties": {
"description": "The properties of the reservation summary.",
"type": "object",
"properties": {
"reservationOrderId": {
"description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.",
Expand Down Expand Up @@ -2903,7 +2905,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "#/definitions/RevisedResource"
}
],
"properties": {
Expand All @@ -2916,6 +2918,7 @@
},
"ReservationDetailsListResult": {
"description": "Result of listing reservation details.",
"type": "object",
"properties": {
"value": {
"description": "The list of reservation details.",
Expand All @@ -2934,6 +2937,7 @@
},
"ReservationDetailProperties": {
"description": "The properties of the reservation detail.",
"type": "object",
"properties": {
"reservationOrderId": {
"description": "The reservation order ID is the identifier for a reservation purchase. Each reservation order ID represents a single purchase transaction. A reservation order contains reservations. The reservation order specifies the VM size and region for the reservations.",
Expand Down Expand Up @@ -3022,6 +3026,7 @@
},
"ReservationRecommendationDetailsProperties": {
"description": "The properties of the reservation recommendation.",
"type": "object",
"properties": {
"currency": {
"description": "An ISO 4217 currency code identifier for the costs and savings ",
Expand Down Expand Up @@ -3057,6 +3062,7 @@
},
"ReservationRecommendationDetailsCalculatedSavingsProperties": {
"description": "Details of estimated savings.",
"type": "object",
"properties": {
"onDemandCost": {
"description": "The cost without reservation.",
Expand Down Expand Up @@ -3096,6 +3102,7 @@
},
"ReservationRecommendationDetailsResourceProperties": {
"description": "Details of the resource.",
"type": "object",
"properties": {
"appliedScopes": {
"description": "List of subscriptions for which the reservation is applied.",
Expand Down Expand Up @@ -3134,6 +3141,7 @@
},
"ReservationRecommendationDetailsSavingsProperties": {
"description": "Details of the estimated savings.",
"type": "object",
"properties": {
"calculatedSavings": {
"description": "List of calculated savings.",
Expand Down Expand Up @@ -3172,6 +3180,7 @@
},
"ReservationRecommendationDetailsUsageProperties": {
"description": "Details about historical usage data that has been used for computing the recommendation.",
"type": "object",
"properties": {
"firstConsumptionDate": {
"description": "The first usage date used for looking back for computing the recommendation.",
Expand Down Expand Up @@ -3205,6 +3214,7 @@
},
"ReservationRecommendationsListResult": {
"description": "Result of listing reservation recommendations.",
"type": "object",
"properties": {
"value": {
"description": "The list of reservation recommendations.",
Expand Down Expand Up @@ -3237,7 +3247,7 @@
"discriminator": "kind",
"allOf": [
{
"$ref": "#/definitions/Resource"
"$ref": "#/definitions/RevisedResource"
},
{
"$ref": "#/definitions/ResourceAttributes"
Expand Down Expand Up @@ -3283,6 +3293,7 @@
},
"LegacyReservationRecommendationProperties": {
"description": "The properties of the reservation recommendation.",
"type": "object",
"properties": {
"lookBackPeriod": {
"description": "The number of days of usage to look back for recommendation.",
Expand Down Expand Up @@ -3372,6 +3383,7 @@
},
"SkuProperty": {
"description": "The Sku property",
"type": "object",
"properties": {
"name": {
"description": "The name of sku property.",
Expand Down Expand Up @@ -3407,6 +3419,7 @@
},
"ModernReservationRecommendationProperties": {
"description": "The properties of the reservation recommendation.",
"type": "object",
"properties": {
"location": {
"type": "string",
Expand Down Expand Up @@ -3478,8 +3491,9 @@
"readOnly": true
},
"scope": {
"description": "Shared or single recommendation.",
"type": "string",
"description": "Shared (corresponds to integer 2) or single (corresponds to integer 1) recommendation.",
"type": "integer",
"format": "int32",
"readOnly": true
},
"skuProperties": {
Expand Down Expand Up @@ -3509,6 +3523,7 @@
},
"ModernReservationTransactionProperties": {
"description": "The properties of a modern reservation transaction.",
"type": "object",
"properties": {
"amount": {
"description": "The charge of the transaction.",
Expand Down Expand Up @@ -3656,6 +3671,7 @@
},
"LegacyReservationTransactionProperties": {
"description": "The properties of a legacy reservation transaction.",
"type": "object",
"properties": {
"eventDate": {
"description": "The date of the transaction",
Expand Down Expand Up @@ -3781,6 +3797,7 @@
},
"ReservationTransactionsListResult": {
"description": "Result of listing reservation recommendations.",
"type": "object",
"properties": {
"value": {
"description": "The list of reservation recommendations.",
Expand All @@ -3799,6 +3816,7 @@
},
"ModernReservationTransactionsListResult": {
"description": "Result of listing reservation recommendations.",
"type": "object",
"properties": {
"value": {
"description": "The list of reservation recommendations.",
Expand Down Expand Up @@ -5230,6 +5248,41 @@
},
"x-ms-azure-resource": true
},
"RevisedResource": {
"description": "The Resource model definition.",
"type": "object",
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Resource Id."
},
"name": {
"readOnly": true,
"type": "string",
"description": "Resource name."
},
"type": {
"readOnly": true,
"type": "string",
"description": "Resource type."
},
"eTag": {
"readOnly": true,
"type": "string",
"description": "Resource eTag."
},
"tags": {
"readOnly": true,
"type": "object",
"additionalProperties": {
"type": "string"
},
"description": "Resource tags."
}
},
"x-ms-azure-resource": true
},
"ReservationTransactionResource": {
"description": "The Resource model definition.",
"properties": {
Expand Down
4 changes: 2 additions & 2 deletions ...ft.Consumption/stable/2019-10-01/examples/ReservationRecommendationsByBillingProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"value": 0.39824251795372
},
"firstUsageDate": "2019-07-07T00:00:00-07:00",
"scope": "Shared",
"scope": 2,
"lookBackPeriod": 7,
"instanceFlexibilityRatio": 1,
"instanceFlexibilityGroup": "DSv2 Series",
Expand Down Expand Up @@ -73,7 +73,7 @@
"value": 0.40694246575372
},
"firstUsageDate": "2019-07-07T00:00:00-07:00",
"scope": "Shared",
"scope": 2,
"lookBackPeriod": 7,
"instanceFlexibilityRatio": 1,
"instanceFlexibilityGroup": "DSv2 Series",
Expand Down