From 064f7a9f86a72620d123d69a13c23ef8a61c38b7 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 5 Nov 2020 16:46:03 -0800 Subject: [PATCH 1/9] Add change directory to reservations spec 2020-10-01-preview --- .../ChangeDirectoryReservationOrder.json | 29 +++++ .../2020-10-01-preview/reservations.json | 115 ++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json new file mode 100644 index 000000000000..e31627c889dc --- /dev/null +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2020-10-01-preview", + "reservationOrderId": "a075419f-44cc-497f-b68a-14ee811d48b9", + "body": { + "destinationTenantId": "906655ea-30be-4587-9d12-b50e077b0f32" + } + }, + "responses": { + "200": { + "body": { + "reservationOrder" : { + "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", + "name": "VM_RI_10-02-2020_15-21", + "isSucceeded": true, + "error": "error string" + }, + "reservations" : [ + { + "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", + "name": "VM_RI_10-02-2020_15-21", + "isSucceeded": true, + "error": "error string" + } + ] + } + } + } +} diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index 65ffe539d6a2..2cf222b5ddf8 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -322,6 +322,49 @@ } } }, + "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory": { + "post": { + "summary": "Change direcotory of `ReservationOrder`.", + "description": "Change directory (tenant) of `ReservationOrder` and all `Reservation` under it to specified tenant id", + "operationId": "ReservationOrder_ChangeDirectory", + "x-ms-examples": { + "Split": { + "$ref": "./examples/ChangeDirectoryReservationOrder.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ReservationOrderIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ChangeDirectoryParameter" + } + ], + "tags": [ + "ReservationOrder, ChangeDirectory" + ], + "responses": { + "200": { + "description": "List of `Reservation`s created after the split operation.", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/ChangeDirectoryResponse" + } + } + }, + "default": { + "description": "Unexpected error", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/split": { "post": { "summary": "Split the `Reservation`.", @@ -1482,6 +1525,59 @@ } } }, + "ChangeDirectoryResponse": { + "type": "object", + "description": "Change direcotry response", + "properties": { + "reservationOrder": { + "type": "object", + "description": "Change direcotry result for reservation order", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation order" + }, + "name": { + "type": "string", + "description": "Name of the reservation order" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation order", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } + }, + "reservations": { + "type": "array", + "items": { + "type": "object", + "description": "Change direcotry result for reservation", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation" + }, + "name": { + "type": "string", + "description": "Name of the reservation" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } + } + } + } + }, "RenewPropertiesResponse": { "type": "object", "properties": { @@ -1829,6 +1925,15 @@ } } }, + "ChangeDirectoryRequest": { + "type": "object", + "properties": { + "destinationTenantId": { + "description": "Tenant id GUID that reservation order is to be tranferred to", + "type": "string" + } + } + }, "Error": { "type": "object", "properties": { @@ -2183,6 +2288,16 @@ "$ref": "#/definitions/SplitRequest" } }, + "ChangeDirectoryParameter": { + "name": "body", + "x-ms-parameter-location": "method", + "in": "body", + "required": true, + "description": "Information needed to change directory of reservation order", + "schema": { + "$ref": "#/definitions/ChangeDirectoryRequest" + } + }, "ApiVersionParameter": { "name": "api-version", "in": "query", From 9dfdd7878629eb83a33070712b302bc1fba94f1e Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 9 Nov 2020 16:50:46 -0800 Subject: [PATCH 2/9] refactoring and updating description --- .../ChangeDirectoryReservationOrder.json | 2 +- .../2020-10-01-preview/reservations.json | 71 +++++++------------ 2 files changed, 27 insertions(+), 46 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json index e31627c889dc..50d03943bf5b 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json @@ -10,7 +10,7 @@ "200": { "body": { "reservationOrder" : { - "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", + "id": "a075419f-44cc-497f-b68a-14ee811d48b9", "name": "VM_RI_10-02-2020_15-21", "isSucceeded": true, "error": "error string" diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index 2cf222b5ddf8..c12d1687ba96 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -348,12 +348,9 @@ ], "responses": { "200": { - "description": "List of `Reservation`s created after the split operation.", + "description": "List of `Reservation`s created after the change directory operation.", "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/ChangeDirectoryResponse" - } + "$ref": "#/definitions/ChangeDirectoryResponse" } }, "default": { @@ -1530,54 +1527,38 @@ "description": "Change direcotry response", "properties": { "reservationOrder": { - "type": "object", - "description": "Change direcotry result for reservation order", - "properties": { - "id": { - "type": "string", - "description": "Identifier of the reservation order" - }, - "name": { - "type": "string", - "description": "Name of the reservation order" - }, - "isSucceeded": { - "description": "True if change directory operation succeeded on this reservation order", - "type": "boolean" - }, - "error": { - "type": "string", - "description": "Error reason if operation failed. Null otherwise" - } - } + "$ref": "#/definitions/ChangeDirectoryResult" }, "reservations": { "type": "array", "items": { - "type": "object", - "description": "Change direcotry result for reservation", - "properties": { - "id": { - "type": "string", - "description": "Identifier of the reservation" - }, - "name": { - "type": "string", - "description": "Name of the reservation" - }, - "isSucceeded": { - "description": "True if change directory operation succeeded on this reservation", - "type": "boolean" - }, - "error": { - "type": "string", - "description": "Error reason if operation failed. Null otherwise" - } - } + "$ref": "#/definitions/ChangeDirectoryResult" } } } }, + "ChangeDirectoryResult": { + "type": "object", + "description": "Change direcotry result for reservation order or reservation", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation order or reservation" + }, + "name": { + "type": "string", + "description": "Name of the reservation order or reservation" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation order or reservation", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } + }, "RenewPropertiesResponse": { "type": "object", "properties": { From b2a9735fe4791b6202083c5d4111a2f588b5b947 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 9 Nov 2020 17:35:12 -0800 Subject: [PATCH 3/9] prettier and spellcheck --- .../examples/ChangeDirectoryReservationOrder.json | 4 ++-- .../preview/2020-10-01-preview/reservations.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json index 50d03943bf5b..e83a01f30d7a 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json @@ -9,13 +9,13 @@ "responses": { "200": { "body": { - "reservationOrder" : { + "reservationOrder": { "id": "a075419f-44cc-497f-b68a-14ee811d48b9", "name": "VM_RI_10-02-2020_15-21", "isSucceeded": true, "error": "error string" }, - "reservations" : [ + "reservations": [ { "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", "name": "VM_RI_10-02-2020_15-21", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index c12d1687ba96..70f86c3a5634 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -324,7 +324,7 @@ }, "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory": { "post": { - "summary": "Change direcotory of `ReservationOrder`.", + "summary": "Change directory of `ReservationOrder`.", "description": "Change directory (tenant) of `ReservationOrder` and all `Reservation` under it to specified tenant id", "operationId": "ReservationOrder_ChangeDirectory", "x-ms-examples": { @@ -1524,7 +1524,7 @@ }, "ChangeDirectoryResponse": { "type": "object", - "description": "Change direcotry response", + "description": "Change directory response", "properties": { "reservationOrder": { "$ref": "#/definitions/ChangeDirectoryResult" @@ -1539,7 +1539,7 @@ }, "ChangeDirectoryResult": { "type": "object", - "description": "Change direcotry result for reservation order or reservation", + "description": "Change directory result for reservation order or reservation", "properties": { "id": { "type": "string", @@ -1910,7 +1910,7 @@ "type": "object", "properties": { "destinationTenantId": { - "description": "Tenant id GUID that reservation order is to be tranferred to", + "description": "Tenant id GUID that reservation order is to be transferred to", "type": "string" } } From 9a5b398fe2f58eec7d57a35a99aae6d1bee48356 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 19 Nov 2020 09:07:21 -0800 Subject: [PATCH 4/9] Revert "prettier and spellcheck" This reverts commit b2a9735fe4791b6202083c5d4111a2f588b5b947. --- .../examples/ChangeDirectoryReservationOrder.json | 4 ++-- .../preview/2020-10-01-preview/reservations.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json index e83a01f30d7a..50d03943bf5b 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json @@ -9,13 +9,13 @@ "responses": { "200": { "body": { - "reservationOrder": { + "reservationOrder" : { "id": "a075419f-44cc-497f-b68a-14ee811d48b9", "name": "VM_RI_10-02-2020_15-21", "isSucceeded": true, "error": "error string" }, - "reservations": [ + "reservations" : [ { "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", "name": "VM_RI_10-02-2020_15-21", diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index 70f86c3a5634..c12d1687ba96 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -324,7 +324,7 @@ }, "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory": { "post": { - "summary": "Change directory of `ReservationOrder`.", + "summary": "Change direcotory of `ReservationOrder`.", "description": "Change directory (tenant) of `ReservationOrder` and all `Reservation` under it to specified tenant id", "operationId": "ReservationOrder_ChangeDirectory", "x-ms-examples": { @@ -1524,7 +1524,7 @@ }, "ChangeDirectoryResponse": { "type": "object", - "description": "Change directory response", + "description": "Change direcotry response", "properties": { "reservationOrder": { "$ref": "#/definitions/ChangeDirectoryResult" @@ -1539,7 +1539,7 @@ }, "ChangeDirectoryResult": { "type": "object", - "description": "Change directory result for reservation order or reservation", + "description": "Change direcotry result for reservation order or reservation", "properties": { "id": { "type": "string", @@ -1910,7 +1910,7 @@ "type": "object", "properties": { "destinationTenantId": { - "description": "Tenant id GUID that reservation order is to be transferred to", + "description": "Tenant id GUID that reservation order is to be tranferred to", "type": "string" } } From 1a3447e1b79fc709c2c78f8caf58394eddd96686 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 19 Nov 2020 09:07:41 -0800 Subject: [PATCH 5/9] Revert "refactoring and updating description" This reverts commit 9dfdd7878629eb83a33070712b302bc1fba94f1e. --- .../ChangeDirectoryReservationOrder.json | 2 +- .../2020-10-01-preview/reservations.json | 71 ++++++++++++------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json index 50d03943bf5b..e31627c889dc 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json @@ -10,7 +10,7 @@ "200": { "body": { "reservationOrder" : { - "id": "a075419f-44cc-497f-b68a-14ee811d48b9", + "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", "name": "VM_RI_10-02-2020_15-21", "isSucceeded": true, "error": "error string" diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index c12d1687ba96..2cf222b5ddf8 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -348,9 +348,12 @@ ], "responses": { "200": { - "description": "List of `Reservation`s created after the change directory operation.", + "description": "List of `Reservation`s created after the split operation.", "schema": { - "$ref": "#/definitions/ChangeDirectoryResponse" + "type": "array", + "items": { + "$ref": "#/definitions/ChangeDirectoryResponse" + } } }, "default": { @@ -1527,38 +1530,54 @@ "description": "Change direcotry response", "properties": { "reservationOrder": { - "$ref": "#/definitions/ChangeDirectoryResult" + "type": "object", + "description": "Change direcotry result for reservation order", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation order" + }, + "name": { + "type": "string", + "description": "Name of the reservation order" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation order", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } }, "reservations": { "type": "array", "items": { - "$ref": "#/definitions/ChangeDirectoryResult" + "type": "object", + "description": "Change direcotry result for reservation", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation" + }, + "name": { + "type": "string", + "description": "Name of the reservation" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } } } } }, - "ChangeDirectoryResult": { - "type": "object", - "description": "Change direcotry result for reservation order or reservation", - "properties": { - "id": { - "type": "string", - "description": "Identifier of the reservation order or reservation" - }, - "name": { - "type": "string", - "description": "Name of the reservation order or reservation" - }, - "isSucceeded": { - "description": "True if change directory operation succeeded on this reservation order or reservation", - "type": "boolean" - }, - "error": { - "type": "string", - "description": "Error reason if operation failed. Null otherwise" - } - } - }, "RenewPropertiesResponse": { "type": "object", "properties": { From deff1155fb42030644010a7bb3a6ee6e1f27395a Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 19 Nov 2020 09:08:00 -0800 Subject: [PATCH 6/9] Revert "Add change directory to reservations spec 2020-10-01-preview" This reverts commit 064f7a9f86a72620d123d69a13c23ef8a61c38b7. --- .../ChangeDirectoryReservationOrder.json | 29 ----- .../2020-10-01-preview/reservations.json | 115 ------------------ 2 files changed, 144 deletions(-) delete mode 100644 specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json deleted file mode 100644 index e31627c889dc..000000000000 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/examples/ChangeDirectoryReservationOrder.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "api-version": "2020-10-01-preview", - "reservationOrderId": "a075419f-44cc-497f-b68a-14ee811d48b9", - "body": { - "destinationTenantId": "906655ea-30be-4587-9d12-b50e077b0f32" - } - }, - "responses": { - "200": { - "body": { - "reservationOrder" : { - "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", - "name": "VM_RI_10-02-2020_15-21", - "isSucceeded": true, - "error": "error string" - }, - "reservations" : [ - { - "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", - "name": "VM_RI_10-02-2020_15-21", - "isSucceeded": true, - "error": "error string" - } - ] - } - } - } -} diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json index 2cf222b5ddf8..65ffe539d6a2 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-10-01-preview/reservations.json @@ -322,49 +322,6 @@ } } }, - "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory": { - "post": { - "summary": "Change direcotory of `ReservationOrder`.", - "description": "Change directory (tenant) of `ReservationOrder` and all `Reservation` under it to specified tenant id", - "operationId": "ReservationOrder_ChangeDirectory", - "x-ms-examples": { - "Split": { - "$ref": "./examples/ChangeDirectoryReservationOrder.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/ReservationOrderIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/ChangeDirectoryParameter" - } - ], - "tags": [ - "ReservationOrder, ChangeDirectory" - ], - "responses": { - "200": { - "description": "List of `Reservation`s created after the split operation.", - "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/ChangeDirectoryResponse" - } - } - }, - "default": { - "description": "Unexpected error", - "schema": { - "$ref": "#/definitions/Error" - } - } - } - } - }, "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/split": { "post": { "summary": "Split the `Reservation`.", @@ -1525,59 +1482,6 @@ } } }, - "ChangeDirectoryResponse": { - "type": "object", - "description": "Change direcotry response", - "properties": { - "reservationOrder": { - "type": "object", - "description": "Change direcotry result for reservation order", - "properties": { - "id": { - "type": "string", - "description": "Identifier of the reservation order" - }, - "name": { - "type": "string", - "description": "Name of the reservation order" - }, - "isSucceeded": { - "description": "True if change directory operation succeeded on this reservation order", - "type": "boolean" - }, - "error": { - "type": "string", - "description": "Error reason if operation failed. Null otherwise" - } - } - }, - "reservations": { - "type": "array", - "items": { - "type": "object", - "description": "Change direcotry result for reservation", - "properties": { - "id": { - "type": "string", - "description": "Identifier of the reservation" - }, - "name": { - "type": "string", - "description": "Name of the reservation" - }, - "isSucceeded": { - "description": "True if change directory operation succeeded on this reservation", - "type": "boolean" - }, - "error": { - "type": "string", - "description": "Error reason if operation failed. Null otherwise" - } - } - } - } - } - }, "RenewPropertiesResponse": { "type": "object", "properties": { @@ -1925,15 +1829,6 @@ } } }, - "ChangeDirectoryRequest": { - "type": "object", - "properties": { - "destinationTenantId": { - "description": "Tenant id GUID that reservation order is to be tranferred to", - "type": "string" - } - } - }, "Error": { "type": "object", "properties": { @@ -2288,16 +2183,6 @@ "$ref": "#/definitions/SplitRequest" } }, - "ChangeDirectoryParameter": { - "name": "body", - "x-ms-parameter-location": "method", - "in": "body", - "required": true, - "description": "Information needed to change directory of reservation order", - "schema": { - "$ref": "#/definitions/ChangeDirectoryRequest" - } - }, "ApiVersionParameter": { "name": "api-version", "in": "query", From ad91ba65cd2553a8186a5cb88aeded79c5b687d9 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 19 Nov 2020 09:30:17 -0800 Subject: [PATCH 7/9] moving change directory to new api version --- .../ChangeDirectoryReservationOrder.json | 29 +++ .../reservationsChangeDirectory.json | 230 ++++++++++++++++++ .../reservations/resource-manager/readme.md | 11 + 3 files changed, 270 insertions(+) create mode 100644 specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/examples/ChangeDirectoryReservationOrder.json create mode 100644 specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/examples/ChangeDirectoryReservationOrder.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/examples/ChangeDirectoryReservationOrder.json new file mode 100644 index 000000000000..e83a01f30d7a --- /dev/null +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/examples/ChangeDirectoryReservationOrder.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2020-10-01-preview", + "reservationOrderId": "a075419f-44cc-497f-b68a-14ee811d48b9", + "body": { + "destinationTenantId": "906655ea-30be-4587-9d12-b50e077b0f32" + } + }, + "responses": { + "200": { + "body": { + "reservationOrder": { + "id": "a075419f-44cc-497f-b68a-14ee811d48b9", + "name": "VM_RI_10-02-2020_15-21", + "isSucceeded": true, + "error": "error string" + }, + "reservations": [ + { + "id": "1f14354c-dc12-4c8d-8090-6f295a3a34aa", + "name": "VM_RI_10-02-2020_15-21", + "isSucceeded": true, + "error": "error string" + } + ] + } + } + } +} diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json new file mode 100644 index 000000000000..6c2096a97e7e --- /dev/null +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json @@ -0,0 +1,230 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure Reservation API", + "description": "This API describe Azure Reservation", + "version": "2020-11-15-preview" + }, + "host": "management.azure.com", + "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" + } + } + }, + "paths": { + "/providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory": { + "post": { + "summary": "Change directory of `ReservationOrder`.", + "description": "Change directory (tenant) of `ReservationOrder` and all `Reservation` under it to specified tenant id", + "operationId": "ReservationOrder_ChangeDirectory", + "x-ms-examples": { + "ChangeDirectory": { + "$ref": "./examples/ChangeDirectoryReservationOrder.json" + } + }, + "parameters": [ + { + "$ref": "#/parameters/ReservationOrderIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ChangeDirectoryParameter" + } + ], + "tags": [ + "ReservationOrder, ChangeDirectory" + ], + "responses": { + "200": { + "description": "List of `Reservation`s created after the change directory operation.", + "schema": { + "$ref": "#/definitions/ChangeDirectoryResponse" + } + }, + "default": { + "description": "Unexpected error", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + } + }, + "definitions": { + "ChangeDirectoryRequest": { + "type": "object", + "properties": { + "destinationTenantId": { + "description": "Tenant id GUID that reservation order is to be transferred to", + "type": "string" + } + } + }, + "ChangeDirectoryResponse": { + "type": "object", + "description": "Change directory response", + "properties": { + "reservationOrder": { + "$ref": "#/definitions/ChangeDirectoryResult" + }, + "reservations": { + "type": "array", + "items": { + "$ref": "#/definitions/ChangeDirectoryResult" + } + } + } + }, + "ChangeDirectoryResult": { + "type": "object", + "description": "Change directory result for reservation order or reservation", + "properties": { + "id": { + "type": "string", + "description": "Identifier of the reservation order or reservation" + }, + "name": { + "type": "string", + "description": "Name of the reservation order or reservation" + }, + "isSucceeded": { + "description": "True if change directory operation succeeded on this reservation order or reservation", + "type": "boolean" + }, + "error": { + "type": "string", + "description": "Error reason if operation failed. Null otherwise" + } + } + }, + "Error": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/ExtendedErrorInfo" + } + } + }, + "ExtendedErrorInfo": { + "type": "object", + "properties": { + "code": { + "$ref": "#/definitions/ErrorResponseCode" + }, + "message": { + "type": "string" + } + } + }, + "ErrorResponseCode": { + "type": "string", + "enum": [ + "NotSpecified", + "InternalServerError", + "ServerTimeout", + "AuthorizationFailed", + "BadRequest", + "ClientCertificateThumbprintNotSet", + "InvalidRequestContent", + "OperationFailed", + "HttpMethodNotSupported", + "InvalidRequestUri", + "MissingTenantId", + "InvalidTenantId", + "InvalidReservationOrderId", + "InvalidReservationId", + "ReservationIdNotInReservationOrder", + "ReservationOrderNotFound", + "InvalidSubscriptionId", + "InvalidAccessToken", + "InvalidLocationId", + "UnauthenticatedRequestsThrottled", + "InvalidHealthCheckType", + "Forbidden", + "BillingScopeIdCannotBeChanged", + "AppliedScopesNotAssociatedWithCommerceAccount", + "PatchValuesSameAsExisting", + "RoleAssignmentCreationFailed", + "ReservationOrderCreationFailed", + "ReservationOrderNotEnabled", + "CapacityUpdateScopesFailed", + "UnsupportedReservationTerm", + "ReservationOrderIdAlreadyExists", + "RiskCheckFailed", + "CreateQuoteFailed", + "ActivateQuoteFailed", + "NonsupportedAccountId", + "PaymentInstrumentNotFound", + "MissingAppliedScopesForSingle", + "NoValidReservationsToReRate", + "ReRateOnlyAllowedForEA", + "OperationCannotBePerformedInCurrentState", + "InvalidSingleAppliedScopesCount", + "InvalidFulfillmentRequestParameters", + "NotSupportedCountry", + "InvalidRefundQuantity", + "PurchaseError", + "BillingCustomerInputError", + "BillingPaymentInstrumentSoftError", + "BillingPaymentInstrumentHardError", + "BillingTransientError", + "BillingError", + "FulfillmentConfigurationError", + "FulfillmentOutOfStockError", + "FulfillmentTransientError", + "FulfillmentError", + "CalculatePriceFailed", + "CspTenantTransferNotSupported" + ], + "x-ms-enum": { + "name": "ErrorResponseCode", + "modelAsString": true + } + } + }, + "parameters": { + "ReservationOrderIdParameter": { + "name": "reservationOrderId", + "x-ms-parameter-location": "method", + "in": "path", + "required": true, + "type": "string", + "description": "Order Id of the reservation" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Supported version for this document is 2020-10-01-preview", + "required": true, + "type": "string" + }, + "ChangeDirectoryParameter": { + "name": "body", + "x-ms-parameter-location": "method", + "in": "body", + "required": true, + "description": "Information needed to change directory of reservation order", + "schema": { + "$ref": "#/definitions/ChangeDirectoryRequest" + } + } + } +} diff --git a/specification/reservations/resource-manager/readme.md b/specification/reservations/resource-manager/readme.md index df5d162954de..9cf06fd21a16 100644 --- a/specification/reservations/resource-manager/readme.md +++ b/specification/reservations/resource-manager/readme.md @@ -29,6 +29,17 @@ openapi-type: arm tag: package-2020-10-preview ``` +### Tag: package-2020-11-preview + +These settings apply only when `--tag=package-2020-11-preview` is specified on the command line. + +```yaml $(tag) == 'package-2020-11-preview' +input-file: + - Microsoft.Capacity/preview/2019-07-19/quota.json + - Microsoft.Capacity/preview/2020-10-01-preview/reservations.json + - Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json +``` + ### Tag: package-2020-10-preview These settings apply only when `--tag=package-2020-10-preview` is specified on the command line. From 092984054439a56cffa876b537ce33f02481921a Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Thu, 19 Nov 2020 15:40:50 -0800 Subject: [PATCH 8/9] fixing lint error --- .../2020-11-15-preview/reservationsChangeDirectory.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json index 6c2096a97e7e..9136bc10eca8 100644 --- a/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json +++ b/specification/reservations/resource-manager/Microsoft.Capacity/preview/2020-11-15-preview/reservationsChangeDirectory.json @@ -191,8 +191,7 @@ "FulfillmentOutOfStockError", "FulfillmentTransientError", "FulfillmentError", - "CalculatePriceFailed", - "CspTenantTransferNotSupported" + "CalculatePriceFailed" ], "x-ms-enum": { "name": "ErrorResponseCode", From 12e8a9dee8dba53ad936bd0e42612e2cd084d9b4 Mon Sep 17 00:00:00 2001 From: Sean Oh Date: Mon, 23 Nov 2020 10:53:46 -0800 Subject: [PATCH 9/9] update default tag --- specification/reservations/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/reservations/resource-manager/readme.md b/specification/reservations/resource-manager/readme.md index 9cf06fd21a16..cbbdc7ea762c 100644 --- a/specification/reservations/resource-manager/readme.md +++ b/specification/reservations/resource-manager/readme.md @@ -26,7 +26,7 @@ These are the global settings for the Reservations API. ``` yaml openapi-type: arm -tag: package-2020-10-preview +tag: package-2020-11-preview ``` ### Tag: package-2020-11-preview