Skip to content

Commit 15806e2

Browse files
gaoyp830anandanthony
authored andcommitted
[Reservations][S360] Fixing reservation property by adding swapProperties (Azure#20905)
1 parent 7e1a832 commit 15806e2

File tree

4 files changed

+74
-0
lines changed

4 files changed

+74
-0
lines changed

specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationDetails.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
"currencyCode": "USD",
7171
"amount": 466.0
7272
}
73+
},
74+
"swapProperties": {
75+
"swapSource": "/providers/microsoft.capacity/reservationOrders/63037ae3-385a-4716-ad77-02f42ce93c06/reservations/5c6383f5-3f2c-4159-ae74-j72i1c1a49bc"
7376
}
7477
}
7578
}

specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationRevisions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
103103
"/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/e0e4b4f5-77ea-4984-9ee4-6bf9850ee6de"
104104
]
105+
},
106+
"swapProperties": {
107+
"swapDestination": "/providers/microsoft.capacity/reservationOrders/afadf486-3432-4254-b297-4db8ef055f38/reservations/317efb41-b3ef-3706-8447-c2c045ab3ef5"
105108
}
106109
}
107110
},

specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationsFromOrder.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,38 @@
158158
]
159159
}
160160
}
161+
},
162+
{
163+
"sku": {
164+
"name": "Standard_D1_v2"
165+
},
166+
"id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc",
167+
"type": "Microsoft.Capacity/reservationOrders/reservations",
168+
"name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/5se63214-3382-40da-ed79-787f823e34bc",
169+
"etag": 2,
170+
"location": "eastus",
171+
"properties": {
172+
"appliedScopes": [
173+
"/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
174+
],
175+
"renew": false,
176+
"billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
177+
"appliedScopeType": "Single",
178+
"quantity": 3,
179+
"provisioningState": "Succeeded",
180+
"expiryDate": "2018-09-22",
181+
"displayName": "cabri_test",
182+
"billingPlan": "Monthly",
183+
"effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
184+
"lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
185+
"benefitStartTime": "2017-09-22T22:40:32.7632798Z",
186+
"reservedResourceType": "VirtualMachines",
187+
"instanceFlexibility": "On",
188+
"skuDescription": "D1 v2",
189+
"swapProperties": {
190+
"swapDestination": "/providers/microsoft.capacity/reservationOrders/63027ae3-389a-4716-ad77-04f42ce93c06/reservations/4jf50113-3382-40da-ed79-787f823e34bc"
191+
}
192+
}
161193
}
162194
]
163195
}

specification/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2394,6 +2394,12 @@
23942394
"mergeProperties": {
23952395
"$ref": "#/definitions/ReservationMergeProperties"
23962396
},
2397+
"swapProperties": {
2398+
"$ref": "#/definitions/ReservationSwapProperties"
2399+
},
2400+
"appliedScopeProperties": {
2401+
"$ref": "#/definitions/AppliedScopeProperties"
2402+
},
23972403
"billingScopeId": {
23982404
"$ref": "#/definitions/BillingScopeId"
23992405
},
@@ -2447,6 +2453,23 @@
24472453
}
24482454
}
24492455
},
2456+
"AppliedScopeProperties": {
2457+
"type": "object",
2458+
"properties": {
2459+
"tenantId": {
2460+
"type": "string",
2461+
"description": "Tenant ID of the applied scope type"
2462+
},
2463+
"managementGroupId": {
2464+
"type": "string",
2465+
"description": "Management group ID of the format /providers/Microsoft.Management/managementGroups/{managementGroupId}"
2466+
},
2467+
"displayName": {
2468+
"type": "string",
2469+
"description": "Management group display name"
2470+
}
2471+
}
2472+
},
24502473
"ReservationSplitProperties": {
24512474
"type": "object",
24522475
"properties": {
@@ -2479,6 +2502,19 @@
24792502
}
24802503
}
24812504
},
2505+
"ReservationSwapProperties": {
2506+
"type": "object",
2507+
"properties": {
2508+
"swapSource": {
2509+
"type": "string",
2510+
"description": "Resource Id of the Source Reservation that gets swapped. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
2511+
},
2512+
"swapDestination": {
2513+
"type": "string",
2514+
"description": "Reservation Resource Id that the original resource gets swapped to. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
2515+
}
2516+
}
2517+
},
24822518
"PurchaseRequestProperties": {
24832519
"type": "object",
24842520
"properties": {

0 commit comments

Comments
 (0)