Microsoft.Capacity 2020-10-01-preview update (#11668)

Azure · Nov 19, 2020 · fb69291 · fb69291
1 parent f80190f
commit fb69291
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 45 deletions.
diff --git a/...rce-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/CalculateExchange.json b/...rce-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/CalculateExchange.json
@@ -27,14 +27,8 @@
         ],
         "reservationsToExchange": [
           {
-            "id": "/providers/microsoft.capacity/reservationOrders/1f14354c-dc12-4c8d-8090-6f295a3a34aa",
-            "properties": {
-              "scope": "Reservation",
-              "reservationToReturn": {
-                "reservationId": "/providers/microsoft.capacity/reservationOrders/1f14354c-dc12-4c8d-8090-6f295a3a34aa/reservations/c8c926bd-fc5d-4e29-9d43-b68340ac23a6",
-                "quantity": 1
-              }
-            }
+            "reservationId": "/providers/microsoft.capacity/reservationOrders/1f14354c-dc12-4c8d-8090-6f295a3a34aa/reservations/c8c926bd-fc5d-4e29-9d43-b68340ac23a6",
+            "quantity": 1
           }
         ]
       }

diff --git a/...ons/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/Exchange.json b/...ons/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/Exchange.json
@@ -33,7 +33,8 @@
               "billingCurrencyTotal": {
                 "currencyCode": "EUR",
                 "amount": 2250.0
-              }
+              },
+              "status": "Succeeded"
             }
           ],
           "reservationsToExchange": [
@@ -57,7 +58,8 @@
                   "currencyCode": "EUR",
                   "amount": 2903.94
                 }
-              }
+              },
+              "status": "Succeeded"
             }
           ],
           "policyResult": {

diff --git a/...rvations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/...rvations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json
@@ -797,7 +797,7 @@
           "type": "array",
           "description": "List of reservations that are being returned in this exchange.",
           "items": {
-            "$ref": "#/definitions/ReturnRequest"
+            "$ref": "#/definitions/ReservationToReturn"
           }
         }
       }
@@ -812,41 +812,9 @@
         }
       }
     },
-    "ReturnRequest": {
-      "type": "object",
-      "description": "Return request",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Fully qualified identifier of the ReservationOrder being returned"
-        },
-        "properties": {
-          "$ref": "#/definitions/ReturnRequestProperties"
-        }
-      }
-    },
-    "ReturnRequestProperties": {
-      "type": "object",
-      "description": "Return request properties",
-      "properties": {
-        "scope": {
-          "$ref": "#/definitions/ReturnRequestScope"
-        },
-        "reservationToReturn": {
-          "$ref": "#/definitions/ReservationToReturn"
-        }
-      }
-    },
-    "ReturnRequestScope": {
-      "type": "string",
-      "description": "Indicates whether it is a reservation return or entire order return",
-      "enum": [
-        "Reservation"
-      ]
-    },
     "ReservationToReturn": {
       "type": "object",
-      "description": "To be present only if ReturnRequestScope = Reservation and null otherwise",
+      "description": "Reservation to return",
       "properties": {
         "reservationId": {
           "type": "string",
@@ -1096,7 +1064,7 @@
           "type": "array",
           "description": "Details of the reservations being returned",
           "items": {
-            "$ref": "#/definitions/ReservationToExchange"
+            "$ref": "#/definitions/ReservationToReturnForExchange"
           }
         },
         "policyResult": {
@@ -1150,6 +1118,30 @@
         }
       }
     },
+    "ReservationToReturnForExchange": {
+      "type": "object",
+      "description": "Reservation refund details",
+      "properties": {
+        "reservationId": {
+          "type": "string",
+          "description": "Fully qualified id of the Reservation being returned."
+        },
+        "quantity": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Quantity to be returned"
+        },
+        "billingRefundAmount": {
+          "$ref": "#/definitions/Price"
+        },
+        "billingInformation": {
+          "$ref": "#/definitions/BillingInformation"
+        },
+        "status": {
+          "$ref": "#/definitions/OperationStatus"
+        }
+      }
+    },
     "BillingInformation": {
       "type": "object",
       "description": "billing information",
@@ -1184,6 +1176,9 @@
         },
         "billingCurrencyTotal": {
           "$ref": "#/definitions/Price"
+        },
+        "status": {
+          "$ref": "#/definitions/OperationStatus"
         }
       }
     },
@@ -2103,6 +2098,20 @@
           "format": "double"
         }
       }
+    },
+    "OperationStatus": {
+      "type": "string",
+      "description": "Status of the individual operation.",
+      "enum": [
+        "Succeeded",
+        "Failed",
+        "Cancelled",
+        "Pending"
+      ],
+      "x-ms-enum": {
+        "name": "OperationStatus",
+        "modelAsString": true
+      }
     }
   },
   "parameters": {