Skip to content

[Hub Generated] Review request for Microsoft.Capacity to add version preview/2019-04-01 #5745

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

Merged
dsgouda merged 13 commits into from
Apr 23, 2019
Merged

[Hub Generated] Review request for Microsoft.Capacity to add version preview/2019-04-01 #5745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ae86067
Task 4321317: RI renewal : ARM review
Apr 19, 2019
7df7e27
Task 4321317: RI renewal : ARM review
Apr 19, 2019
9a9f4f0
Task 4321317: RI renewal : ARM review
Apr 19, 2019
e94725c
Task 4321317: RI renewal : ARM review
Apr 19, 2019
40558a2
Task 4321317: RI renewal : ARM review
Apr 19, 2019
7b87329
FW: More changes
Apr 19, 2019
b601cf5
FW: More changes
Apr 19, 2019
9c13224
FW: More changes
Apr 19, 2019
97da0de
Task 4321317: RI renewal : ARM review
Apr 19, 2019
95edc21
Task 4321317: RI renewal : ARM review
Apr 22, 2019
d66256b
Task 4321317: RI renewal : ARM review
Apr 22, 2019
6029216
Merge branch 'master' into dev-reservations-Microsoft.Capacity-2019-0…
Apr 23, 2019
7f6156e
FW: [Revert][Hub Generated] Review request for Microsoft.Capacity to …
Apr 23, 2019
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
1 change: 0 additions & 1 deletion ...esource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservationDetails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Succeeded",
Expand Down
4 changes: 0 additions & 4 deletions ...ions/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetReservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Cancelled",
Expand Down Expand Up @@ -56,7 +55,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 1,
"provisioningState": "Cancelled",
Expand Down Expand Up @@ -92,7 +90,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 2,
"provisioningState": "Cancelled",
Expand Down Expand Up @@ -128,7 +125,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Succeeded",
Expand Down
3 changes: 0 additions & 3 deletions ...ns/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/MergeReservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 1,
"provisioningState": "Cancelled",
Expand Down Expand Up @@ -63,7 +62,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 2,
"provisioningState": "Cancelled",
Expand Down Expand Up @@ -99,7 +97,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Succeeded",
Expand Down
3 changes: 1 addition & 2 deletions ...urce-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"appliedScopeType": "Shared",
"reservedResourceProperties": {
"instanceFlexibility": "On"
},
"renew": false
}
}
}
},
Expand Down
3 changes: 0 additions & 3 deletions ...ons/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/SplitReservation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 1,
"provisioningState": "Succeeded",
Expand Down Expand Up @@ -57,7 +56,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 2,
"provisioningState": "Succeeded",
Expand Down Expand Up @@ -86,7 +84,6 @@
"appliedScopes": [
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
],
"renew": false,
"appliedScopeType": "Single",
"quantity": 3,
"provisioningState": "Cancelled",
Expand Down
1 change: 0 additions & 1 deletion ...ns/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/UpdateReservation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"location": "eastus",
"properties": {
"appliedScopeType": "Shared",
"renew": false,
"quantity": 3,
"provisioningState": "Succeeded",
"expiryDate": "2018-09-22",
Expand Down
188 changes: 62 additions & 126 deletions ...ion/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"schemes" : [ "https" ],
"produces" : [ "application/json" ],
"consumes" : [ "application/json" ],
"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"
"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"
}
}
},
Expand Down Expand Up @@ -363,9 +363,7 @@
"$ref" : "#/parameters/ReservationOrderIdParameter"
}, {
"$ref" : "#/parameters/ApiVersionParameter"
}, {
"$ref" : "#/parameters/AppendRenewPropertiesParameter"
}],
} ],
"tags" : [ "Reservation" ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -672,74 +670,40 @@
}
}
},
"ReservationResponse": {
"type": "object",
"x-ms-azure-resource": true,
"properties": {
"location": {
"type": "string",
"readOnly": true,
"description": "The Azure Region where the reserved resource lives."
},
"etag": {
"type": "integer"
},
"id": {
"type": "string",
"readOnly": true,
"description": "Identifier of the reservation"
},
"name": {
"type": "string",
"readOnly": true,
"description": "Name of the reservation"
},
"sku": {
"$ref": "#/definitions/SkuName"
},
"properties": {
"$ref": "#/definitions/ReservationProperties"
},
"type": {
"type": "string",
"readOnly": true,
"description": "Type of resource. \"Microsoft.Capacity/reservationOrders/reservations\""
}
}
},
"RenewPropertiesResponse": {
"type": "object",
"properties": {
"purchaseProperties": {
"$ref": "#/definitions/PurchaseRequest"
},
"lockedPriceTotal": {
"type": "object",
"description": "Locked currency & amount for new reservation purchase at the time of renewal. Price is locked 30 days before expiry date time if renew is true.",
"properties": {
"currencyCode": {
"type": "string"
},
"amount": {
"type": "string"
}
}
},
"links": {
"type": "object",
"description": "Contains prev and next reservation Ids' because of renewal.",
"properties": {
"renewSource": {
"type": "string",
"description": "Reservation Id of the reservation from which this reservation is renewed. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}."
},
"renewDestination": {
"type": "string",
"description": "Reservation Id of the reservation which is purchased because of renew. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}."
}
}
}
"ReservationResponse" : {
"type" : "object",
"x-ms-azure-resource" : true,
"properties" : {
"location" : {
"type" : "string",
"readOnly" : true,
"description" : "The Azure Region where the reserved resource lives."
},
"etag" : {
"type" : "integer"
},
"id" : {
"type" : "string",
"readOnly" : true,
"description" : "Identifier of the reservation"
},
"name" : {
"type" : "string",
"readOnly" : true,
"description" : "Name of the reservation"
},
"sku" : {
"$ref" : "#/definitions/SkuName"
},
"properties" : {
"$ref" : "#/definitions/ReservationProperties"
},
"type" : {
"type" : "string",
"readOnly" : true,
"description" : "Type of resource. \"Microsoft.Capacity/reservationOrders/reservations\""
}
}
},
"CalculatePriceResponse" : {
"type" : "object",
Expand Down Expand Up @@ -846,14 +810,8 @@
"splitProperties" : {
"$ref" : "#/definitions/ReservationSplitProperties"
},
"mergeProperties": {
"$ref": "#/definitions/ReservationMergeProperties"
},
"renew": {
"$ref": "#/definitions/Renew"
},
"renewProperties": {
"$ref": "#/definitions/RenewPropertiesResponse"
"mergeProperties" : {
"$ref" : "#/definitions/ReservationMergeProperties"
}
}
},
Expand Down Expand Up @@ -911,11 +869,8 @@
"appliedScopeType" : {
"$ref" : "#/definitions/AppliedScopeType"
},
"appliedScopes": {
"$ref": "#/definitions/AppliedScopes"
},
"renew": {
"$ref": "#/definitions/Renew"
"appliedScopes" : {
"$ref" : "#/definitions/AppliedScopes"
},
"reservedResourceProperties" : {
"type" : "object",
Expand All @@ -934,14 +889,8 @@
"appliedScopeType" : {
"$ref" : "#/definitions/AppliedScopeType"
},
"appliedScopes": {
"$ref": "#/definitions/AppliedScopes"
},
"renew": {
"$ref": "#/definitions/Renew"
},
"renewProperties": {
"$ref": "#/definitions/PurchaseRequest"
"appliedScopes" : {
"$ref" : "#/definitions/AppliedScopes"
},
"instanceFlexibility" : {
"$ref" : "#/definitions/InstanceFlexibility"
Expand Down Expand Up @@ -1198,19 +1147,14 @@
"modelAsString" : true
}
},
"AppliedScopes": {
"type": "array",
"description": "List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared.",
"items": {
"type": "string",
"minItems": 1,
"maxItems": 1
}
},
"Renew": {
"type": "boolean",
"default": false,
"description": "Setting this to true will automatically purchase a new reservation on the expiration date time."
"AppliedScopes" : {
"type" : "array",
"description" : "List of the subscriptions that the benefit will be applied. Do not specify if AppliedScopeType is Shared.",
"items" : {
"type" : "string",
"minItems" : 1,
"maxItems" : 1
}
},
"BillingScopeId" : {
"type" : "string",
Expand Down Expand Up @@ -1280,20 +1224,12 @@
"$ref" : "#/definitions/SplitRequest"
}
},
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"description": "Supported version for this document is 2019-04-01",
"required": true,
"type": "string"
},
"AppendRenewPropertiesParameter": {
"name": "append",
"x-ms-parameter-location" : "method",
"in": "query",
"description": "Supported value of this query is renewProperties",
"required": false,
"type": "string"
"ApiVersionParameter" : {
"name" : "api-version",
"in" : "query",
"description" : "Supported version for this document is 2019-04-01",
"required" : true,
"type" : "string"
},
"SubscriptionIdParameter" : {
"name" : "subscriptionId",
Expand Down