Enabling archival and unarchival of a reservation.

Azure · Oct 16, 2020 · b14abd9 · b14abd9
1 parent d0e81d2
commit b14abd9
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 35 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1982,4 +1982,6 @@ appxmanifest
 Appxmanifest
 msixpackage
 xml
-Creds
+Creds
+unarchive
+unarchiving
diff --git a/...reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/Archive.json b/...reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/Archive.json
@@ -0,0 +1,10 @@
+{
+  "parameters": {
+    "api-version": "2019-04-01",
+    "reservationOrderId": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da",
+    "reservationId": "356e7ae4-84d0-4da6-ab4b-d6b94f3557da"
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/...rce-manager/Microsoft.Capacity/preview/2019-04-01/examples/CalculateReservationOrder.json b/...rce-manager/Microsoft.Capacity/preview/2019-04-01/examples/CalculateReservationOrder.json
@@ -11,7 +11,7 @@
         "billingScopeId": "/subscriptions/ed3a1871-612d-abcd-a849-c2542a68be83",
         "term": "P1Y",
         "billingPlan": "Monthly",
-        "quantity": "1",
+        "quantity": 1,
         "displayName": "TestReservationOrder",
         "appliedScopes": null,
         "appliedScopeType": "Shared",

diff --git a/...ervations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json b/...ervations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/GetCatalog.json
@@ -59,20 +59,16 @@
             "P1Y",
             "P3Y"
           ],
-          "billingPlans": [
-            {
-              "P1Y": [
-                "Upfront",
-                "Monthly"
-              ]
-            },
-            {
-              "P3Y": [
-                "Upfront",
-                "Monthly"
-              ]
-            }
-          ],
+          "billingPlans": {
+            "P1Y": [
+              "Upfront",
+              "Monthly"
+            ],
+            "P3Y": [
+              "Upfront",
+              "Monthly"
+            ]
+          },
           "locations": [
             "eastus"
           ],
@@ -122,20 +118,16 @@
             "P1Y",
             "P3Y"
           ],
-          "billingPlans": [
-            {
-              "P1Y": [
-                "Upfront",
-                "Monthly"
-              ]
-            },
-            {
-              "P3Y": [
-                "Upfront",
-                "Monthly"
-              ]
-            }
-          ],
+          "billingPlans": {
+            "P1Y": [
+              "Upfront",
+              "Monthly"
+            ],
+            "P3Y": [
+              "Upfront",
+              "Monthly"
+            ]
+          },
           "locations": [
             "eastus"
           ],

diff --git a/...urce-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json b/...urce-manager/Microsoft.Capacity/preview/2019-04-01/examples/PurchaseReservationOrder.json
@@ -12,7 +12,7 @@
         "billingScopeId": "/subscriptions/ed3a1871-612d-abcd-a849-c2542a68be83",
         "term": "P1Y",
         "billingPlan": "Monthly",
-        "quantity": "1",
+        "quantity": 1,
         "displayName": "TestReservationOrder",
         "appliedScopes": null,
         "appliedScopeType": "Shared",

diff --git a/...servations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/Unarchive.json b/...servations/resource-manager/Microsoft.Capacity/preview/2019-04-01/examples/Unarchive.json
@@ -0,0 +1,10 @@
+{
+  "parameters": {
+    "api-version": "2019-04-01",
+    "reservationOrderId": "276e7ae4-84d0-4da6-ab4b-d6b94f3557da",
+    "reservationId": "356e7ae4-84d0-4da6-ab4b-d6b94f3557da"
+  },
+  "responses": {
+    "200": {}
+  }
+}
diff --git a/...ion/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json b/...ion/reservations/resource-manager/Microsoft.Capacity/preview/2019-04-01/reservations.json
@@ -594,6 +594,80 @@
         }
       }
     },
+    "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}/archive": {
+      "post": {
+        "summary": "Archive a `Reservation`.",
+        "description": "Archiving a `Reservation` moves it to `Archived` state.",
+        "operationId": "Reservation_Archive",
+        "x-ms-examples": {
+          "Archive": {
+            "$ref": "./examples/Archive.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/ReservationOrderIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ReservationIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          }
+        ],
+        "tags": [
+          "Reservation, Archive"
+        ],
+        "responses": {
+          "200": {
+            "description": "Archived a reservation."
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}/unarchive": {
+      "post": {
+        "summary": "Unarchive a `Reservation`.",
+        "description": "Unarchiving a `Reservation` moves it to the state it was before archiving.\n",
+        "operationId": "Reservation_Unarchive",
+        "x-ms-examples": {
+          "Unarchive": {
+            "$ref": "./examples/Unarchive.json"
+          }
+        },
+        "parameters": [
+          {
+            "$ref": "#/parameters/ReservationOrderIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ReservationIdParameter"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          }
+        ],
+        "tags": [
+          "Reservation, Unarchive"
+        ],
+        "responses": {
+          "200": {
+            "description": "Unarchive complete for the reservation."
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
+    },
     "/providers/Microsoft.Capacity/operations": {
       "get": {
         "summary": "Get operations.",
@@ -1639,6 +1713,27 @@
           "format": "double"
         }
       }
+    },
+    "AvailableScopeRequest": {
+      "type": "object",
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/AvailableScopeRequestProperties"
+        }
+      }
+    },
+    "AvailableScopeRequestProperties": {
+      "description": "List of scopes for which availability should be checked",
+      "type": "object",
+      "properties": {
+        "scopes": {
+          "description": "Scopes to be checked for availability",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
     }
   },
   "parameters": {
@@ -1647,11 +1742,9 @@
       "x-ms-parameter-location": "method",
       "in": "body",
       "required": true,
+      "description": "Parameter for listing the available scopes",
       "schema": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
+        "$ref": "#/definitions/AvailableScopeRequest"
       }
     },
     "PurchaseParameter": {