[Reservations][S360] Fixing reservation property by adding swapProper…

…ties (Azure#20905)
anandMicro · Dec 16, 2022 · 15806e2 · 15806e2
1 parent 7e1a832
commit 15806e2
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 0 deletions.
diff --git a/...resource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationDetails.json b/...resource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationDetails.json
@@ -70,6 +70,9 @@
               "currencyCode": "USD",
               "amount": 466.0
             }
+          },
+          "swapProperties": {
+            "swapSource": "/providers/microsoft.capacity/reservationOrders/63037ae3-385a-4716-ad77-02f42ce93c06/reservations/5c6383f5-3f2c-4159-ae74-j72i1c1a49bc"
           }
         }
       }

diff --git a/...source-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationRevisions.json b/...source-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationRevisions.json
@@ -102,6 +102,9 @@
                   "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/00238563-7312-4c20-a134-8c030bf938a7",
                   "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/e0e4b4f5-77ea-4984-9ee4-6bf9850ee6de"
                 ]
+              },
+              "swapProperties": {
+                "swapDestination": "/providers/microsoft.capacity/reservationOrders/afadf486-3432-4254-b297-4db8ef055f38/reservations/317efb41-b3ef-3706-8447-c2c045ab3ef5"
               }
             }
           },

diff --git a/...ource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationsFromOrder.json b/...ource-manager/Microsoft.Capacity/stable/2022-03-01/examples/GetReservationsFromOrder.json
@@ -158,6 +158,38 @@
                 ]
               }
             }
+          },
+          {
+            "sku": {
+              "name": "Standard_D1_v2"
+            },
+            "id": "/providers/microsoft.capacity/reservationOrders/276e7ae4-84d0-4da6-ab4b-d6b94f3557da/reservations/5se63214-3382-40da-ed79-787f823e34bc",
+            "type": "Microsoft.Capacity/reservationOrders/reservations",
+            "name": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da/5se63214-3382-40da-ed79-787f823e34bc",
+            "etag": 2,
+            "location": "eastus",
+            "properties": {
+              "appliedScopes": [
+                "/subscriptions/98df3792-7962-4f18-8be2-d5576f122de3"
+              ],
+              "renew": false,
+              "billingScopeId": "/subscriptions/19376483-64b8-49e4-a931-d5248828720a",
+              "appliedScopeType": "Single",
+              "quantity": 3,
+              "provisioningState": "Succeeded",
+              "expiryDate": "2018-09-22",
+              "displayName": "cabri_test",
+              "billingPlan": "Monthly",
+              "effectiveDateTime": "2017-09-22T22:46:32.7632798Z",
+              "lastUpdatedDateTime": "2017-09-22T22:46:32.7632798Z",
+              "benefitStartTime": "2017-09-22T22:40:32.7632798Z",
+              "reservedResourceType": "VirtualMachines",
+              "instanceFlexibility": "On",
+              "skuDescription": "D1 v2",
+              "swapProperties": {
+                "swapDestination": "/providers/microsoft.capacity/reservationOrders/63027ae3-389a-4716-ad77-04f42ce93c06/reservations/4jf50113-3382-40da-ed79-787f823e34bc"
+              }
+            }
           }
         ]
       }

diff --git a/...tion/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json b/...tion/reservations/resource-manager/Microsoft.Capacity/stable/2022-03-01/reservations.json
@@ -2394,6 +2394,12 @@
         "mergeProperties": {
           "$ref": "#/definitions/ReservationMergeProperties"
         },
+        "swapProperties": {
+          "$ref": "#/definitions/ReservationSwapProperties"
+        },
+        "appliedScopeProperties": {
+          "$ref": "#/definitions/AppliedScopeProperties"
+        },
         "billingScopeId": {
           "$ref": "#/definitions/BillingScopeId"
         },
@@ -2447,6 +2453,23 @@
         }
       }
     },
+    "AppliedScopeProperties": {
+      "type": "object",
+      "properties": {
+        "tenantId": {
+          "type": "string",
+          "description": "Tenant ID of the applied scope type"
+        },
+        "managementGroupId": {
+          "type": "string",
+          "description": "Management group ID of the format /providers/Microsoft.Management/managementGroups/{managementGroupId}"
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Management group display name"
+        }
+      }
+    },
     "ReservationSplitProperties": {
       "type": "object",
       "properties": {
@@ -2479,6 +2502,19 @@
         }
       }
     },
+    "ReservationSwapProperties": {
+      "type": "object",
+      "properties": {
+        "swapSource": {
+          "type": "string",
+          "description": "Resource Id of the Source Reservation that gets swapped. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
+        },
+        "swapDestination": {
+          "type": "string",
+          "description": "Reservation Resource Id that the original resource gets swapped to. Format of the resource Id is /providers/microsoft.capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}"
+        }
+      }
+    },
     "PurchaseRequestProperties": {
       "type": "object",
       "properties": {