From b045beb1dccfad27c2ab4df06d68b1ef38c91be0 Mon Sep 17 00:00:00 2001 From: toki95 <35834415+toki95@users.noreply.github.com> Date: Mon, 27 Jan 2020 18:09:07 +0100 Subject: [PATCH 1/9] Create GetManagedInstanceOperation.json --- .../examples/GetManagedInstanceOperation.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json new file mode 100644 index 000000000000..31329721508f --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-7398", + "managedInstanceName": "sqlcrudtest-4645", + "operationId": "00000000-1111-2222-3333-444444444444", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "managedInstanceName": "sqlcrudtest-4645", + "operation": "UpsertManagedServer", + "operationFriendlyName": "UPDATE MANAGED SERVER", + "percentComplete": 100, + "startTime": "2019-12-06T11:08:44.49Z", + "state": "Cancelled", + "isCancellable": false + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", + "name": "11111111-1111-1111-1111-111111111111", + "type": "Microsoft.Sql/managedInstances/operations" + } + } + } +} From e541d3571785f017fc83d97329fff40c99753677 Mon Sep 17 00:00:00 2001 From: toki95 <35834415+toki95@users.noreply.github.com> Date: Mon, 27 Jan 2020 18:09:50 +0100 Subject: [PATCH 2/9] Create CancelManagedInstanceOperation.json --- .../CancelManagedInstanceOperation.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json new file mode 100644 index 000000000000..31329721508f --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-7398", + "managedInstanceName": "sqlcrudtest-4645", + "operationId": "00000000-1111-2222-3333-444444444444", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "managedInstanceName": "sqlcrudtest-4645", + "operation": "UpsertManagedServer", + "operationFriendlyName": "UPDATE MANAGED SERVER", + "percentComplete": 100, + "startTime": "2019-12-06T11:08:44.49Z", + "state": "Cancelled", + "isCancellable": false + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", + "name": "11111111-1111-1111-1111-111111111111", + "type": "Microsoft.Sql/managedInstances/operations" + } + } + } +} From 9b8ae6ec5b2f3c86eb3d323a3bd20f140bffaa00 Mon Sep 17 00:00:00 2001 From: toki95 <35834415+toki95@users.noreply.github.com> Date: Mon, 27 Jan 2020 18:12:25 +0100 Subject: [PATCH 3/9] Added Ger example --- .../examples/GetManagedInstanceOperation.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json new file mode 100644 index 000000000000..31329721508f --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-7398", + "managedInstanceName": "sqlcrudtest-4645", + "operationId": "00000000-1111-2222-3333-444444444444", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "managedInstanceName": "sqlcrudtest-4645", + "operation": "UpsertManagedServer", + "operationFriendlyName": "UPDATE MANAGED SERVER", + "percentComplete": 100, + "startTime": "2019-12-06T11:08:44.49Z", + "state": "Cancelled", + "isCancellable": false + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", + "name": "11111111-1111-1111-1111-111111111111", + "type": "Microsoft.Sql/managedInstances/operations" + } + } + } +} From 9f66d7c86eb2857218652b20a32c75faf69513a8 Mon Sep 17 00:00:00 2001 From: toki95 <35834415+toki95@users.noreply.github.com> Date: Tue, 28 Jan 2020 09:16:12 +0100 Subject: [PATCH 4/9] Add files via upload --- .../examples/GetManagedInstanceOperation.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json index 31329721508f..006d81df4377 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json @@ -1,27 +1,27 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-7398", - "managedInstanceName": "sqlcrudtest-4645", - "operationId": "00000000-1111-2222-3333-444444444444", - "api-version": "2018-06-01-preview" - }, - "responses": { - "200": { - "body": { - "properties": { - "managedInstanceName": "sqlcrudtest-4645", - "operation": "UpsertManagedServer", - "operationFriendlyName": "UPDATE MANAGED SERVER", - "percentComplete": 100, - "startTime": "2019-12-06T11:08:44.49Z", - "state": "Cancelled", - "isCancellable": false - }, - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", - "name": "11111111-1111-1111-1111-111111111111", - "type": "Microsoft.Sql/managedInstances/operations" - } - } - } -} +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-7398", + "managedInstanceName": "sqlcrudtest-4645", + "operationId": "00000000-1111-2222-3333-444444444444", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "managedInstanceName": "sqlcrudtest-4645", + "operation": "UpsertManagedServer", + "operationFriendlyName": "UPDATE MANAGED SERVER", + "percentComplete": 100, + "startTime": "2019-12-06T11:08:44.49Z", + "state": "Cancelled", + "isCancellable": false + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", + "name": "11111111-1111-1111-1111-111111111111", + "type": "Microsoft.Sql/managedInstances/operations" + } + } + } +} \ No newline at end of file From 5e5b2ab94e8d5e482d1283d3a40a7c83761a5b30 Mon Sep 17 00:00:00 2001 From: Jovana Toroman Date: Fri, 28 Feb 2020 14:56:35 +0100 Subject: [PATCH 5/9] Added changes to readme file --- specification/sql/resource-manager/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 0dec1ce04728..88e9515470f8 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -135,10 +135,13 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/capabilities.json - Microsoft.Sql/preview/2018-06-01-preview/LongTermRetentionManagedInstanceBackups.json - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceLongTermRetentionPolicies.json +- Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json - Microsoft.Sql/preview/2019-06-01-preview/WorkloadGroups.json - Microsoft.Sql/preview/2019-06-01-preview/WorkloadClassifiers.json - Microsoft.Sql/preview/2019-06-01-preview/managedDatabases.json - Microsoft.Sql/preview/2019-06-01-preview/ServerAzureADAdministrators.json +- Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json + # Needed when there is more than one input file override-info: From 743307cc480a55519fa53bebe8ba142e7466f374 Mon Sep 17 00:00:00 2001 From: Jovana Toroman Date: Fri, 28 Feb 2020 15:03:06 +0100 Subject: [PATCH 6/9] Removing not needed files --- .../CancelManagedInstanceOperation.json | 27 ------------------- specification/sql/resource-manager/readme.md | 1 - 2 files changed, 28 deletions(-) delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json deleted file mode 100644 index 31329721508f..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/CancelManagedInstanceOperation.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-7398", - "managedInstanceName": "sqlcrudtest-4645", - "operationId": "00000000-1111-2222-3333-444444444444", - "api-version": "2018-06-01-preview" - }, - "responses": { - "200": { - "body": { - "properties": { - "managedInstanceName": "sqlcrudtest-4645", - "operation": "UpsertManagedServer", - "operationFriendlyName": "UPDATE MANAGED SERVER", - "percentComplete": 100, - "startTime": "2019-12-06T11:08:44.49Z", - "state": "Cancelled", - "isCancellable": false - }, - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-7398/providers/Microsoft.Sql/managedInstances/sqlcrudtest-4645/operations/11111111-1111-1111-1111-111111111111", - "name": "11111111-1111-1111-1111-111111111111", - "type": "Microsoft.Sql/managedInstances/operations" - } - } - } -} diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 88e9515470f8..5307622531ec 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -142,7 +142,6 @@ input-file: - Microsoft.Sql/preview/2019-06-01-preview/ServerAzureADAdministrators.json - Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json - # Needed when there is more than one input file override-info: title: SqlManagementClient From 27b01fb7a9f9369e672f0eb354d5edd199c1ea41 Mon Sep 17 00:00:00 2001 From: Jovana Toroman Date: Fri, 28 Feb 2020 15:37:56 +0100 Subject: [PATCH 7/9] Changed operationId to operationName --- .../examples/GetManagedInstanceOperation.json | 2 +- .../2018-06-01-preview/managedInstanceOperations.json | 4 ++-- .../examples/CancelManagedInstanceOperation.json | 2 +- .../examples/GetManagedInstanceOperation.json | 2 +- .../2019-06-01-preview/managedInstanceOperations.json | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json index 9f390521b5cb..032fd3d8a381 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationId": "00000000-1111-2222-3333-444444444444", + "operationName": "00000000-1111-2222-3333-444444444444", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json index 261d8aad543f..7e5f59c68355 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json @@ -58,7 +58,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}": { "get": { "tags": [ "ManagedInstanceOperations" @@ -73,7 +73,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationId", + "name": "operationName", "in": "path", "required": true, "type": "string", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json index 0892244a049d..32731e940ea7 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationId": "11111111-1111-1111-1111-111111111111", + "operationName": "11111111-1111-1111-1111-111111111111", "api-version": "2019-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json index 9f390521b5cb..032fd3d8a381 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationId": "00000000-1111-2222-3333-444444444444", + "operationName": "00000000-1111-2222-3333-444444444444", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json index 7b425988000e..01fef0ed9947 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}/cancel": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}/cancel": { "post": { "tags": [ "ManagedInstanceOperations" @@ -31,7 +31,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationId", + "name": "operationName", "in": "path", "required": true, "type": "string", @@ -49,7 +49,7 @@ "description": "The request for cancel has been executed successfully." }, "default": { - "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 405 CannotCancelOperation - The management operation is in a state that cannot be cancelled.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationNameNotFound - The operation with Id does not exist.\n\n * 404 OperationNameNotFound - The operation with Id does not exist.\n\n * 405 CannotCancelOperation - The management operation is in a state that cannot be cancelled.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." } }, "x-ms-examples": { @@ -101,7 +101,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}": { "get": { "tags": [ "ManagedInstanceOperations" @@ -116,7 +116,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationId", + "name": "operationName", "in": "path", "required": true, "type": "string", From 5711f927fb84044b48ef6447873d2d0628004f57 Mon Sep 17 00:00:00 2001 From: Jovana Toroman Date: Fri, 28 Feb 2020 16:59:56 +0100 Subject: [PATCH 8/9] Removed seconbd managedInstanceOperations --- specification/sql/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 5307622531ec..1535657c90d1 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -135,7 +135,6 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/capabilities.json - Microsoft.Sql/preview/2018-06-01-preview/LongTermRetentionManagedInstanceBackups.json - Microsoft.Sql/preview/2018-06-01-preview/ManagedInstanceLongTermRetentionPolicies.json -- Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json - Microsoft.Sql/preview/2019-06-01-preview/WorkloadGroups.json - Microsoft.Sql/preview/2019-06-01-preview/WorkloadClassifiers.json - Microsoft.Sql/preview/2019-06-01-preview/managedDatabases.json From 7f91f5f527677a31b40eb837dcbf54f8f725f126 Mon Sep 17 00:00:00 2001 From: Jovana Toroman Date: Fri, 28 Feb 2020 17:20:12 +0100 Subject: [PATCH 9/9] Removerting not needed changes --- .../examples/GetManagedInstanceOperation.json | 2 +- .../2018-06-01-preview/managedInstanceOperations.json | 4 ++-- .../examples/CancelManagedInstanceOperation.json | 2 +- .../examples/GetManagedInstanceOperation.json | 2 +- .../2019-06-01-preview/managedInstanceOperations.json | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json index 032fd3d8a381..9f390521b5cb 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/GetManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationName": "00000000-1111-2222-3333-444444444444", + "operationId": "00000000-1111-2222-3333-444444444444", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json index 7e5f59c68355..261d8aad543f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/managedInstanceOperations.json @@ -58,7 +58,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}": { "get": { "tags": [ "ManagedInstanceOperations" @@ -73,7 +73,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationName", + "name": "operationId", "in": "path", "required": true, "type": "string", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json index 32731e940ea7..0892244a049d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/CancelManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationName": "11111111-1111-1111-1111-111111111111", + "operationId": "11111111-1111-1111-1111-111111111111", "api-version": "2019-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json index 032fd3d8a381..9f390521b5cb 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/GetManagedInstanceOperation.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-7398", "managedInstanceName": "sqlcrudtest-4645", - "operationName": "00000000-1111-2222-3333-444444444444", + "operationId": "00000000-1111-2222-3333-444444444444", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json index 01fef0ed9947..7b425988000e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2019-06-01-preview/managedInstanceOperations.json @@ -16,7 +16,7 @@ "application/json" ], "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}/cancel": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}/cancel": { "post": { "tags": [ "ManagedInstanceOperations" @@ -31,7 +31,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationName", + "name": "operationId", "in": "path", "required": true, "type": "string", @@ -49,7 +49,7 @@ "description": "The request for cancel has been executed successfully." }, "default": { - "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationNameNotFound - The operation with Id does not exist.\n\n * 404 OperationNameNotFound - The operation with Id does not exist.\n\n * 405 CannotCancelOperation - The management operation is in a state that cannot be cancelled.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 405 CannotCancelOperation - The management operation is in a state that cannot be cancelled.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." } }, "x-ms-examples": { @@ -101,7 +101,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/operations/{operationId}": { "get": { "tags": [ "ManagedInstanceOperations" @@ -116,7 +116,7 @@ "$ref": "#/parameters/ManagedInstanceNameParameter" }, { - "name": "operationName", + "name": "operationId", "in": "path", "required": true, "type": "string",