From 03ad526dd04d4429a4cd3e337edcf87260433122 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:11 -0700 Subject: [PATCH 01/29] New Readme Config File --- specification/quantum/data-plane/readme.md | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 specification/quantum/data-plane/readme.md diff --git a/specification/quantum/data-plane/readme.md b/specification/quantum/data-plane/readme.md new file mode 100644 index 000000000000..7a81d1e8b21b --- /dev/null +++ b/specification/quantum/data-plane/readme.md @@ -0,0 +1,79 @@ +# quantum + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for quantum. + +## Getting Started + +To build the SDKs for My API, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: + +> `autorest readme.md` + +To see additional help and options, run: + +> `autorest --help` + +For other options on installation see [Installing AutoRest](https://aka.ms/autorest/install) on the AutoRest github page. + +--- + +## Configuration + +### Basic Information + +These are the global settings for the quantum. + +```yaml +openapi-type: data-plane +tag: package-2019-11-04-preview +``` + +### Tag: package-2019-11-04-preview + +These settings apply only when `--tag=package-2019-11-04-preview` is specified on the command line. + +```yaml $(tag) == 'package-2019-11-04-preview' +input-file: + - Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +``` + +--- + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +```yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + - repo: azure-sdk-for-java + - repo: azure-sdk-for-go + - repo: azure-sdk-for-js + - repo: azure-sdk-for-ruby + after_scripts: + - bundle install && rake arm:regen_all_profiles['azure_mgmt_quantum'] +``` + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## Ruby + +See configuration in [readme.ruby.md](./readme.ruby.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## CSharp + +See configuration in [readme.csharp.md](./readme.csharp.md) From 309bbd9c61907c1cf7a051efd626afb823b4eba9 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:11 -0700 Subject: [PATCH 02/29] New Go Language Readme Config File --- specification/quantum/data-plane/readme.go.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 specification/quantum/data-plane/readme.go.md diff --git a/specification/quantum/data-plane/readme.go.md b/specification/quantum/data-plane/readme.go.md new file mode 100644 index 000000000000..084fbca58b64 --- /dev/null +++ b/specification/quantum/data-plane/readme.go.md @@ -0,0 +1,19 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +```yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + clear-output-folder: true +``` + +### Tag: package-2019-11-04-preview and go + +These settings apply only when `--tag=package-2019-11-04-preview --go` is specified on the command line. +Please also specify `--go-sdks-folder=`. + +```yaml $(tag) == 'package-2019-11-04-preview' && $(go) +namespace: Microsoft.Quantum +output-folder: $(go-sdks-folder)/quantum/Generated +``` From ae1df570c8c33aa173487d53ae33046b43ada6fb Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:12 -0700 Subject: [PATCH 03/29] New Typescript Language Readme Config File --- .../quantum/data-plane/readme.typescript.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 specification/quantum/data-plane/readme.typescript.md diff --git a/specification/quantum/data-plane/readme.typescript.md b/specification/quantum/data-plane/readme.typescript.md new file mode 100644 index 000000000000..995a0be4829e --- /dev/null +++ b/specification/quantum/data-plane/readme.typescript.md @@ -0,0 +1,13 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +```yaml $(typescript) +typescript: + azure-arm: true + package-name: "quantum" + output-folder: "$(typescript-sdks-folder)/packages/quantum" + payload-flattening-threshold: 1 + generate-metadata: true +``` From fa488bb4bd8108a475d01ed9b9367ae623527e48 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:13 -0700 Subject: [PATCH 04/29] New Python Language Readme Config File --- .../quantum/data-plane/readme.python.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 specification/quantum/data-plane/readme.python.md diff --git a/specification/quantum/data-plane/readme.python.md b/specification/quantum/data-plane/readme.python.md new file mode 100644 index 000000000000..1024661a26d4 --- /dev/null +++ b/specification/quantum/data-plane/readme.python.md @@ -0,0 +1,21 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +```yaml $(python) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: Microsoft.Quantum + package-name: quantum + package-version: 2019-11-04-preview + clear-output-folder: true +``` + +```yaml $(python) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/azure-mgmt/quantum +``` From f9ab3c547431e2a9043b4d21dd30dc47d45635be Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:14 -0700 Subject: [PATCH 05/29] New C# Language Readme Config File --- specification/quantum/data-plane/readme.csharp.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 specification/quantum/data-plane/readme.csharp.md diff --git a/specification/quantum/data-plane/readme.csharp.md b/specification/quantum/data-plane/readme.csharp.md new file mode 100644 index 000000000000..b7dd205ebd8e --- /dev/null +++ b/specification/quantum/data-plane/readme.csharp.md @@ -0,0 +1,15 @@ +## C + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +```yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.Quantum + output-folder: $(csharp-sdks-folder)/quantum/management/Microsoft.Quantum/GeneratedProtocol +``` From 1e461ff626e3b39bd95b9c8b316194570e3ee4ce Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:15 -0700 Subject: [PATCH 06/29] New Ruby Language Readme Config File --- .../quantum/data-plane/readme.ruby.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 specification/quantum/data-plane/readme.ruby.md diff --git a/specification/quantum/data-plane/readme.ruby.md b/specification/quantum/data-plane/readme.ruby.md new file mode 100644 index 000000000000..75e6147d4df2 --- /dev/null +++ b/specification/quantum/data-plane/readme.ruby.md @@ -0,0 +1,19 @@ +## Ruby + +These settings apply only when `--ruby` is specified on the command line. + +```yaml +package-name: azure_mgmt_quantum +package-version: 2019-11-04-preview +azure-arm: true +``` + +### Tag: package-2019-11-04-preview and ruby + +These settings apply only when `--tag=package-2019-11-04-preview --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2019-11-04-preview' && $(ruby) +namespace: Microsoft.Quantum +output-folder: $(ruby-sdks-folder)/quantum +``` From a22fb079fc875cfdd592cac7d1e963b5f706e2a8 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:16 -0700 Subject: [PATCH 07/29] New Swagger Spec File --- .../preview/2019-11-04-preview/quantum.json | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json new file mode 100644 index 000000000000..412486ffac98 --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -0,0 +1,132 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-11-04-preview", + "title": "quantum", + "description": "Description of the new service", + "x-ms-code-generation-settings": { + "name": "quantumClient" + } + }, + "host": "management.azure.com", + "schemes": ["https"], + "consumes": ["application/json"], + "produces": ["application/json"], + "security": [ + { + "azure_auth": ["user_impersonation"] + } + ], + "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": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/operations": { + "get": { + "tags": ["Tag1"], + "operationId": "OperationGroup_Get", + "x-ms-examples": { + "BatchAccountDelete": { "$ref": "./examples/OperationGroupGet.json" } + }, + "description": "This is a sample get operation, please see guidelines in azure-rest-api-specs repository for more info", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/Result" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "Result": { + "description": "Sample result definition", + "properties": { + "sampleProperty": { + "type": "string", + "description": "Sample property of type string" + } + } + }, + "ErrorResponse": { + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "description": "Error definition.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to be used with the HTTP request." + } + } +} From ba1523e4b5947360f1ba85977ccd47693e0bc23d Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:10:17 -0700 Subject: [PATCH 08/29] New Swagger Example Spec File --- .../examples/OperationGroupGet.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json new file mode 100644 index 000000000000..0c1ee6f52e48 --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "accountName": "sampleacct", + "resourceGroupName": "quantumClient", + "api-version": "2019-11-04-preview", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "sampleProperty": "sampleProperty" + } + } + } +} From 7130d9cfad2264392d9ba9057edfc7a58cace5e0 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 16 Oct 2020 23:14:59 -0700 Subject: [PATCH 09/29] Creating swagger for Azure Quantum --- .../examples/OperationGroupGet.json | 15 - .../examples/jobDelete.json | 37 ++ .../2019-11-04-preview/examples/jobGet.json | 35 ++ .../2019-11-04-preview/examples/jobList.json | 63 ++ .../2019-11-04-preview/examples/jobPut.json | 76 +++ .../examples/providerStatus.json | 88 +++ .../examples/storageGet.json | 18 + .../preview/2019-11-04-preview/quantum.json | 548 ++++++++++++++++-- .../quantum/data-plane/readme.csharp.md | 4 +- 9 files changed, 803 insertions(+), 81 deletions(-) delete mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json create mode 100644 specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json deleted file mode 100644 index 0c1ee6f52e48..000000000000 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/OperationGroupGet.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parameters": { - "accountName": "sampleacct", - "resourceGroupName": "quantumClient", - "api-version": "2019-11-04-preview", - "subscriptionId": "subid" - }, - "responses": { - "200": { - "body": { - "sampleProperty": "sampleProperty" - } - } - } -} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json new file mode 100644 index 000000000000..ef8da0bc6fbe --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json @@ -0,0 +1,37 @@ +{ + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": "2020-09-30T23:57:11.6180743Z", + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": null, + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Cancelled", + "target": "microsoft.tabu.cpu" + } + }, + "204": { + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json new file mode 100644 index 000000000000..2e96def8769d --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json @@ -0,0 +1,35 @@ +{ + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json new file mode 100644 index 000000000000..59d6d7ea296b --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json @@ -0,0 +1,63 @@ +{ + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + }, + { + "id": "ab1aeddd-f191-4884-b8a9-13cdfa020fc6", + "name": "Superposition: true", + "beginExecutionTime": "2020-09-18T23:25:45.781389Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", + "creationTime": "2020-09-18T23:25:33.5541484+00:00", + "endExecutionTime": "2020-09-18T23:25:53.911837Z", + "errorData": null, + "inputDataFormat": "microsoft.qci-ir.v1", + "inputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/inputData?sv=2019-02-02&sr=b&sig=nDMUBPqNskFDLq591NGBE4nVnCiQhXYQBhSiU4xseVY%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw", + "inputParams": { + "shots": "10" + }, + "metadata": { + "entryPointInput": "true", + "outputMappingBlobUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/mappingData?sv=2019-02-02&sr=b&sig=k6Gvd396GUtBxJasU9muSzkYXPQb8utASRSz932MFiw%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw" + }, + "outputDataFormat": "microsoft.quantum-results.v1", + "outputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/outputData?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", + "providerId": "qci", + "status": "Succeeded", + "target": "qci.simulator" + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json new file mode 100644 index 000000000000..66a8f0f786f8 --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json @@ -0,0 +1,76 @@ +{ + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1", + "jobDefinition": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "target": "microsoft.tabu.cpu" + } + }, + "responses": { + "200": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } + }, + "201": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json new file mode 100644 index 000000000000..992b36dc6616 --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json @@ -0,0 +1,88 @@ +{ + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "Microsoft", + "currentAvailability": "Available", + "targets": [ + { + "id": "microsoft.paralleltempering-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.paralleltempering.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.tabu-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.tabu.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing-parameterfree.fpga", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing.fpga", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + } + ] + }, + { + "id": "ionq", + "currentAvailability": "Available", + "targets": [ + { + "id": "ionq.qpu", + "currentAvailability": "Available", + "averageQueueTime": 1679, + "statusPage": "https://status.ionq.co" + }, + { + "id": "ionq.simulator", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": "https://status.ionq.co" + } + ] + } + ], + "nextLink": null + } + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json new file mode 100644 index 000000000000..203d14979276 --- /dev/null +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json @@ -0,0 +1,18 @@ +{ + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1", + "blobDetails": { + "containerName": "some_container", + "blobName": "input_blob" + } + }, + "responses": { + "200": { + "body":{ + "sasUri": "https://storage.blob.core.windows.net/some_container/input_blob?sv=2019-02-02&sr=b&sig=cdO24OOoXterLJVM8T6QpSaog3ST4PjQsDj3mLflfJA%3D&se=2020-10-17T10%3A03%3A01Z&sp=rcw" + } + } + } +} \ No newline at end of file diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index 412486ffac98..b0f1938d9baf 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -1,61 +1,267 @@ { "swagger": "2.0", "info": { + "title": "Azure Quantum Client", + "description": "Azure Quantum REST API client", "version": "2019-11-04-preview", - "title": "quantum", - "description": "Description of the new service", "x-ms-code-generation-settings": { - "name": "quantumClient" + "name": "QuantumClient" } }, - "host": "management.azure.com", - "schemes": ["https"], - "consumes": ["application/json"], - "produces": ["application/json"], - "security": [ - { - "azure_auth": ["user_impersonation"] - } + "host": "app-jobscheduler-prod.azurewebsites.net", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "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": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/operations": { + "/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/workspaces/{workspaceName}/jobs": { + "get": { + "operationId": "Jobs_List", + "description": "List jobs.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + } + ], + "responses": { + "200": { + "description": "The operation completed successfully.", + "schema": { + "$ref": "#/definitions/jobDetailsList" + } + } + }, + "x-ms-examples": { + "Get list of jobs in a Quantum Workspace": { + "$ref": "./examples/jobList.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/workspaces/{workspaceName}/jobs/{jobId}": { + "get": { + "operationId": "Jobs_Get", + "description": "Get job by id", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + }, + { + "$ref": "#/parameters/jobIdParameter" + } + ], + "x-ms-examples": { + "Get a job's metadata": { + "$ref": "./examples/jobGet.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/jobDetails" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/restError" + } + } + } + }, + "put": { + "operationId": "Jobs_Put", + "description": "Create a job.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + }, + { + "$ref": "#/parameters/jobIdParameter" + }, + { + "name": "jobDefinition", + "description": "The complete metadata of the job to submit.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/jobDetails" + } + } + ], + "x-ms-examples": { + "Submit a new job for execution to a Quantum Workspace": { + "$ref": "./examples/jobPut.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/jobDetails" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/jobDetails" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/restError" + } + } + } + }, + "delete": { + "operationId": "Jobs_Delete", + "description": "Cancel a job.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + }, + { + "$ref": "#/parameters/jobIdParameter" + } + ], + "x-ms-examples": { + "Cancel the execution of an existing job": { + "$ref": "./examples/jobDelete.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/jobDetails" + } + }, + "204": { + "description": "NoContent - The job was successfully cancelled." + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/restError" + } + } + } + } + }, + "/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/workspaces/{workspaceName}/providerStatus": { "get": { - "tags": ["Tag1"], - "operationId": "OperationGroup_Get", + "operationId": "Providers_GetStatus", + "description": "Get provider status.", + "parameters": [ + { + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" + } + ], "x-ms-examples": { - "BatchAccountDelete": { "$ref": "./examples/OperationGroupGet.json" } + "Get list of of providers and their status for a Quantum Workspace": { + "$ref": "./examples/providerStatus.json" + } }, - "description": "This is a sample get operation, please see guidelines in azure-rest-api-specs repository for more info", + "responses": { + "200": { + "description": "The operation completed successfully.", + "schema": { + "$ref": "#/definitions/providerStatusList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/restError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Quantum/workspaces/{workspaceName}/storage/sasUri": { + "post": { + "operationId": "Storage_SasUri", + "description": "Gets a URL with SAS token for a container/blob in the storage account associated with the workspace. The SAS URL can be used to upload job input and/or download job output.", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "#/parameters/subscriptionIdParameter" + }, + { + "$ref": "#/parameters/resourceGroupNameParameter" + }, + { + "$ref": "#/parameters/workspaceNameParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameter" + "name": "blobDetails", + "description": "The details (name and container) of the blob to store or download data.", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/blobDetails" + } } ], + "x-ms-examples": { + "Get a SAS token to upload data for a Quantum Workspace": { + "$ref": "./examples/storageGet.json" + } + }, "responses": { "200": { - "description": "Describe the result of a successful operation.", + "description": "OK", "schema": { - "$ref": "#/definitions/Result" + "$ref": "#/definitions/sasUriResponse" } }, "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "#/definitions/restError" } } } @@ -63,70 +269,284 @@ } }, "definitions": { - "Result": { - "description": "Sample result definition", + "jobDetailsList": { + "description": "List of job details.", + "properties": { + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/jobDetails" + } + }, + "count": { + "type": "integer", + "format": "int64", + "description": "Total records count number." + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "Link to the next page of results." + } + } + }, + "jobDetails": { + "description": "Job details.", + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The job id." + }, + "name": { + "type": "string", + "description": "The job name. Is not required for the name to be unique and it's only used for display purposes." + }, + "containerUri": { + "type": "string", + "description": "The blob container SAS uri, the container is used to host job data." + }, + "inputDataUri": { + "type": "string", + "description": "The input blob SAS uri, if specified, it will override the default input blob in the container." + }, + "inputDataFormat": { + "type": "string", + "description": "The format of the input data." + }, + "inputParams": { + "type": "object", + "description": "The input parameters for the job. JSON object used by the target solver. It is expected that the size of this object is small and only used to specify parameters for the execution target, not the input data." + }, + "providerId": { + "type": "string", + "description": "The unique identifier for the provider." + }, + "target": { + "type": "string", + "description": "The target identifier to run the job." + }, + "metadata": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "The job metadata. Metadata provides client the ability to store client-specific information" + }, + "outputDataUri": { + "type": "string", + "description": "The output blob SAS uri. When a job finishes successfully, results will be uploaded to this blob." + }, + "outputDataFormat": { + "type": "string", + "description": "The format of the output data." + }, + "status": { + "type": "string", + "description": "The job status.", + "readOnly": true, + "enum": [ + "Waiting", + "Executing", + "Succeeded", + "Failed", + "Cancelled" + ], + "x-ms-enum" : { + "name": "JobStatus", + "modelAsString": true + } + }, + "creationTime": { + "type": "string", + "readOnly": true, + "description": "The creation time of the job." + }, + "beginExecutionTime": { + "type": "string", + "readOnly": true, + "description": "The time when the job began execution." + }, + "endExecutionTime": { + "type": "string", + "readOnly": true, + "description": "The time when the job finished execution." + }, + "cancellationTime": { + "type": "string", + "readOnly": true, + "description": "The time when a job was successfully cancelled." + }, + "errorData": { + "$ref": "#/definitions/restError", + "readOnly": true, + "description": "The error data for the job. This is expected only when Status 'Failed'." + } + }, + "required": [ + "containerUri", + "inputDataFormat", + "providerId", + "target" + ] + }, + "blobDetails": { + "description": "Blob details.", + "type": "object", + "properties": { + "containerName": { + "type": "string", + "description": "The container name." + }, + "blobName": { + "type": "string", + "description": "The blob name." + } + }, + "required": [ + "containerName" + ] + }, + "sasUriResponse": { + "description": "Get SAS URL operation response.", + "type": "object", "properties": { - "sampleProperty": { + "sasUri": { "type": "string", - "description": "Sample property of type string" + "description": "A URL with a SAS token to upload a blob for execution in the given workspace." } } }, - "ErrorResponse": { - "description": "Error response.", + "providerStatusList": { + "description": "Providers status.", "properties": { - "error": { - "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "value": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/providerStatus" + } + }, + "nextLink": { + "type": "string", + "readOnly": true, + "description": "Link to the next page of results." } } }, - "ErrorDefinition": { - "description": "Error definition.", + "providerStatus": { + "description": "Providers status.", "properties": { - "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "id": { "type": "string", - "readOnly": true + "readOnly": true, + "description": "Provider id." }, - "message": { - "description": "Description of the error.", + "currentAvailability": { "type": "string", - "readOnly": true + "readOnly": true, + "description": "Provider availability.", + "enum": [ + "Available", + "Degraded", + "Unavailable" + ], + "x-ms-enum" : { + "name": "ProviderAvailability", + "modelAsString": true + } }, - "details": { - "description": "Internal error details.", + "targets": { + "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/ErrorDefinition" - }, - "readOnly": true + "$ref": "#/definitions/targetStatus" + } + } + } + }, + "targetStatus": { + "description": "Target status.", + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "Target id." + }, + "currentAvailability": { + "type": "string", + "readOnly": true, + "description": "Target availability.", + "enum": [ + "Available", + "Degraded", + "Unavailable" + ], + "x-ms-enum" : { + "name": "TargetAvailability", + "modelAsString": true + } + }, + "averageQueueTime": { + "type": "integer", + "format": "int64", + "readOnly": true, + "description": "Average queue time in seconds." + }, + "statusPage": { + "type": "string", + "readOnly": true, + "description": "A page with detailed status of the provider." } } + }, + "restError": { + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the error, intended to be suitable for displaying in a user interface." + } + }, + "description": "An error response from Azure." } }, "parameters": { - "SubscriptionIdParameter": { + "subscriptionIdParameter": { "name": "subscriptionId", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)", "in": "path", "required": true, - "type": "string", - "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + "x-ms-parameter-location":"client", + "type": "string" }, - "ResourceGroupNameParameter": { + "resourceGroupNameParameter": { "name": "resourceGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the resource group.", - "x-ms-parameter-location": "method" + "x-ms-parameter-location":"client", + "description": "Name of an Azure resource group." }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", + "workspaceNameParameter": { + "name": "workspaceName", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location":"client", + "description": "Name of the workspace." + }, + "jobIdParameter": { + "name": "jobId", + "in": "path", "required": true, "type": "string", - "description": "The API version to be used with the HTTP request." + "x-ms-parameter-location": "method", + "description": "Id of the job." } } } diff --git a/specification/quantum/data-plane/readme.csharp.md b/specification/quantum/data-plane/readme.csharp.md index b7dd205ebd8e..2027524beabe 100644 --- a/specification/quantum/data-plane/readme.csharp.md +++ b/specification/quantum/data-plane/readme.csharp.md @@ -9,7 +9,7 @@ csharp: license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 1 clear-output-folder: true - client-side-validation: false - namespace: Microsoft.Quantum + client-side-validation: true + namespace: Microsoft.Azure.Quantum.Client output-folder: $(csharp-sdks-folder)/quantum/management/Microsoft.Quantum/GeneratedProtocol ``` From 4ed80d91ce3e805db0a547b3524e7f3bb3c4387f Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:24:09 -0700 Subject: [PATCH 10/29] error wrapper --- .../preview/2019-11-04-preview/quantum.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index b0f1938d9baf..a0ed476a10cb 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -379,7 +379,7 @@ "description": "The time when a job was successfully cancelled." }, "errorData": { - "$ref": "#/definitions/restError", + "$ref": "#/definitions/errorData", "readOnly": true, "description": "The error data for the job. This is expected only when Status 'Failed'." } @@ -500,8 +500,17 @@ "description": "A page with detailed status of the provider." } } - }, + }, "restError": { + "type": "object", + "description": "Error information returned by the API", + "properties": { + "error": { + "$ref": "#/definitions/errorData" + } + } + }, + "errorData": { "properties": { "code": { "type": "string", From a0da7b98d846eaa6d19a2266a04da6e42e2b3c00 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:34:29 -0700 Subject: [PATCH 11/29] remove 200 from cancel. --- .../examples/jobDelete.json | 25 ------------------- .../preview/2019-11-04-preview/quantum.json | 6 ----- 2 files changed, 31 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json index ef8da0bc6fbe..69c30f47ad64 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json @@ -6,31 +6,6 @@ "workspaceName": "quantumworkspace1" }, "responses": { - "200": { - "body": { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", - "cancellationTime": "2020-09-30T23:57:11.6180743Z", - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "creationTime": "2020-09-30T23:57:02.3737928+00:00", - "endExecutionTime": null, - "errorData": null, - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "metadata": null, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "status": "Cancelled", - "target": "microsoft.tabu.cpu" - } - }, "204": { } } diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index a0ed476a10cb..1700a3ca3e30 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -165,12 +165,6 @@ } }, "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/jobDetails" - } - }, "204": { "description": "NoContent - The job was successfully cancelled." }, From 197887f1dd737bcd389d403cf8131df18ce3aa3e Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:40:37 -0700 Subject: [PATCH 12/29] prettier --- .../examples/jobDelete.json | 21 +-- .../2019-11-04-preview/examples/jobGet.json | 66 +++---- .../2019-11-04-preview/examples/jobList.json | 122 ++++++------- .../2019-11-04-preview/examples/jobPut.json | 142 +++++++-------- .../examples/providerStatus.json | 172 +++++++++--------- .../examples/storageGet.json | 32 ++-- .../preview/2019-11-04-preview/quantum.json | 14 +- 7 files changed, 284 insertions(+), 285 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json index 69c30f47ad64..705e0ea4d43c 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobDelete.json @@ -1,12 +1,11 @@ { - "parameters": { - "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1" - }, - "responses": { - "204": { - } - } -} \ No newline at end of file + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "204": {} + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json index 2e96def8769d..856b90a6eef1 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobGet.json @@ -1,35 +1,35 @@ { - "parameters": { - "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1" - }, - "responses": { - "200": { - "body": { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", - "cancellationTime": null, - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "creationTime": "2020-09-30T23:57:02.3737928+00:00", - "endExecutionTime": "2020-09-30T23:57:11.6180743Z", - "errorData": null, - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "metadata": null, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "status": "Succeeded", - "target": "microsoft.tabu.cpu" - } - } + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } } -} \ No newline at end of file + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json index 59d6d7ea296b..6ab73f697d25 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobList.json @@ -1,63 +1,63 @@ { - "parameters": { - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", - "cancellationTime": null, - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "creationTime": "2020-09-30T23:57:02.3737928+00:00", - "endExecutionTime": "2020-09-30T23:57:11.6180743Z", - "errorData": null, - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "metadata": null, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "status": "Succeeded", - "target": "microsoft.tabu.cpu" - }, - { - "id": "ab1aeddd-f191-4884-b8a9-13cdfa020fc6", - "name": "Superposition: true", - "beginExecutionTime": "2020-09-18T23:25:45.781389Z", - "cancellationTime": null, - "containerUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", - "creationTime": "2020-09-18T23:25:33.5541484+00:00", - "endExecutionTime": "2020-09-18T23:25:53.911837Z", - "errorData": null, - "inputDataFormat": "microsoft.qci-ir.v1", - "inputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/inputData?sv=2019-02-02&sr=b&sig=nDMUBPqNskFDLq591NGBE4nVnCiQhXYQBhSiU4xseVY%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw", - "inputParams": { - "shots": "10" - }, - "metadata": { - "entryPointInput": "true", - "outputMappingBlobUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/mappingData?sv=2019-02-02&sr=b&sig=k6Gvd396GUtBxJasU9muSzkYXPQb8utASRSz932MFiw%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw" - }, - "outputDataFormat": "microsoft.quantum-results.v1", - "outputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/outputData?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", - "providerId": "qci", - "status": "Succeeded", - "target": "qci.simulator" - } - ], - "nextLink": null - } - } + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + }, + { + "id": "ab1aeddd-f191-4884-b8a9-13cdfa020fc6", + "name": "Superposition: true", + "beginExecutionTime": "2020-09-18T23:25:45.781389Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", + "creationTime": "2020-09-18T23:25:33.5541484+00:00", + "endExecutionTime": "2020-09-18T23:25:53.911837Z", + "errorData": null, + "inputDataFormat": "microsoft.qci-ir.v1", + "inputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/inputData?sv=2019-02-02&sr=b&sig=nDMUBPqNskFDLq591NGBE4nVnCiQhXYQBhSiU4xseVY%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw", + "inputParams": { + "shots": "10" + }, + "metadata": { + "entryPointInput": "true", + "outputMappingBlobUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/mappingData?sv=2019-02-02&sr=b&sig=k6Gvd396GUtBxJasU9muSzkYXPQb8utASRSz932MFiw%3D&se=2020-09-19T00%3A25%3A33Z&sp=rcw" + }, + "outputDataFormat": "microsoft.quantum-results.v1", + "outputDataUri": "https://storage.blob.core.windows.net/quantum-job-ab1aeddd-f191-4884-b8a9-13cdfa020fc6/outputData?sv=2019-02-02&sr=c&sig=xhQtyt7Forj1HtpEkBTJTXAMTuuEvN0dTssv2OZlUNk%3D&se=2020-09-25T23%3A25%3A32Z&sp=rcw", + "providerId": "qci", + "status": "Succeeded", + "target": "qci.simulator" + } + ], + "nextLink": null + } } -} \ No newline at end of file + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json index 66a8f0f786f8..27452ff46f95 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json @@ -1,76 +1,76 @@ { - "parameters": { - "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1", - "jobDefinition": { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "target": "microsoft.tabu.cpu" + "parameters": { + "jobId": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1", + "jobDefinition": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 } + }, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "target": "microsoft.tabu.cpu" + } + }, + "responses": { + "200": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } + }, + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } }, - "responses": { - "200": { - "body": { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", - "cancellationTime": null, - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "creationTime": "2020-09-30T23:57:02.3737928+00:00", - "endExecutionTime": "2020-09-30T23:57:11.6180743Z", - "errorData": null, - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "metadata": null, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "status": "Succeeded", - "target": "microsoft.tabu.cpu" - } + "201": { + "body": { + "name": "tabu-demo", + "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", + "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", + "cancellationTime": null, + "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "creationTime": "2020-09-30T23:57:02.3737928+00:00", + "endExecutionTime": "2020-09-30T23:57:11.6180743Z", + "errorData": null, + "inputDataFormat": "microsoft.qio.v2", + "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "inputParams": { + "params": { + "sweeps": 300 + } }, - "201": { - "body": { - "name": "tabu-demo", - "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", - "beginExecutionTime": "2020-09-30T23:57:11.5659691Z", - "cancellationTime": null, - "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "creationTime": "2020-09-30T23:57:02.3737928+00:00", - "endExecutionTime": "2020-09-30T23:57:11.6180743Z", - "errorData": null, - "inputDataFormat": "microsoft.qio.v2", - "inputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/inputData?sv=2019-02-02&sr=b&sig=MtgxZEmrCv%2FmeQWFUe6%2Bx9tViSrhxSxYr6euGGHtWnw%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "inputParams": { - "params": { - "sweeps": 300 - } - }, - "metadata": null, - "outputDataFormat": "microsoft.qio-results.v2", - "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", - "providerId": "microsoft", - "status": "Succeeded", - "target": "microsoft.tabu.cpu" - } - } + "metadata": null, + "outputDataFormat": "microsoft.qio-results.v2", + "outputDataUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3/rawOutputData?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw", + "providerId": "microsoft", + "status": "Succeeded", + "target": "microsoft.tabu.cpu" + } } -} \ No newline at end of file + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json index 992b36dc6616..4369f518c3ec 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/providerStatus.json @@ -1,88 +1,88 @@ { - "parameters": { - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "Microsoft", - "currentAvailability": "Available", - "targets": [ - { - "id": "microsoft.paralleltempering-parameterfree.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.paralleltempering.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.simulatedannealing-parameterfree.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.simulatedannealing.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.tabu-parameterfree.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.tabu.cpu", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.simulatedannealing-parameterfree.fpga", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - }, - { - "id": "microsoft.simulatedannealing.fpga", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": null - } - ] - }, - { - "id": "ionq", - "currentAvailability": "Available", - "targets": [ - { - "id": "ionq.qpu", - "currentAvailability": "Available", - "averageQueueTime": 1679, - "statusPage": "https://status.ionq.co" - }, - { - "id": "ionq.simulator", - "currentAvailability": "Available", - "averageQueueTime": 0, - "statusPage": "https://status.ionq.co" - } - ] - } - ], - "nextLink": null - } - } + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "Microsoft", + "currentAvailability": "Available", + "targets": [ + { + "id": "microsoft.paralleltempering-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.paralleltempering.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.tabu-parameterfree.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.tabu.cpu", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing-parameterfree.fpga", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + }, + { + "id": "microsoft.simulatedannealing.fpga", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": null + } + ] + }, + { + "id": "ionq", + "currentAvailability": "Available", + "targets": [ + { + "id": "ionq.qpu", + "currentAvailability": "Available", + "averageQueueTime": 1679, + "statusPage": "https://status.ionq.co" + }, + { + "id": "ionq.simulator", + "currentAvailability": "Available", + "averageQueueTime": 0, + "statusPage": "https://status.ionq.co" + } + ] + } + ], + "nextLink": null + } } -} \ No newline at end of file + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json index 203d14979276..d968ec0660e6 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/storageGet.json @@ -1,18 +1,18 @@ { - "parameters": { - "resourceGroupName": "quantumResourcegroup", - "subscriptionId": "00000000-0000-0000-0000-000000000000", - "workspaceName": "quantumworkspace1", - "blobDetails": { - "containerName": "some_container", - "blobName": "input_blob" - } - }, - "responses": { - "200": { - "body":{ - "sasUri": "https://storage.blob.core.windows.net/some_container/input_blob?sv=2019-02-02&sr=b&sig=cdO24OOoXterLJVM8T6QpSaog3ST4PjQsDj3mLflfJA%3D&se=2020-10-17T10%3A03%3A01Z&sp=rcw" - } - } + "parameters": { + "resourceGroupName": "quantumResourcegroup", + "subscriptionId": "00000000-0000-0000-0000-000000000000", + "workspaceName": "quantumworkspace1", + "blobDetails": { + "containerName": "some_container", + "blobName": "input_blob" } -} \ No newline at end of file + }, + "responses": { + "200": { + "body": { + "sasUri": "https://storage.blob.core.windows.net/some_container/input_blob?sv=2019-02-02&sr=b&sig=cdO24OOoXterLJVM8T6QpSaog3ST4PjQsDj3mLflfJA%3D&se=2020-10-17T10%3A03%3A01Z&sp=rcw" + } + } + } +} diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index 1700a3ca3e30..c32f2a202c0a 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -347,7 +347,7 @@ "Failed", "Cancelled" ], - "x-ms-enum" : { + "x-ms-enum": { "name": "JobStatus", "modelAsString": true } @@ -446,7 +446,7 @@ "Degraded", "Unavailable" ], - "x-ms-enum" : { + "x-ms-enum": { "name": "ProviderAvailability", "modelAsString": true } @@ -477,7 +477,7 @@ "Degraded", "Unavailable" ], - "x-ms-enum" : { + "x-ms-enum": { "name": "TargetAvailability", "modelAsString": true } @@ -494,7 +494,7 @@ "description": "A page with detailed status of the provider." } } - }, + }, "restError": { "type": "object", "description": "Error information returned by the API", @@ -524,7 +524,7 @@ "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)", "in": "path", "required": true, - "x-ms-parameter-location":"client", + "x-ms-parameter-location": "client", "type": "string" }, "resourceGroupNameParameter": { @@ -532,7 +532,7 @@ "in": "path", "required": true, "type": "string", - "x-ms-parameter-location":"client", + "x-ms-parameter-location": "client", "description": "Name of an Azure resource group." }, "workspaceNameParameter": { @@ -540,7 +540,7 @@ "in": "path", "required": true, "type": "string", - "x-ms-parameter-location":"client", + "x-ms-parameter-location": "client", "description": "Name of the workspace." }, "jobIdParameter": { From ebdc215f4a6c1c847044dc6748a79902e1877f36 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:42:48 -0700 Subject: [PATCH 13/29] remove arm tag --- .../kubernetesconfiguration/resource-manager/readme.csharp.md | 1 - .../kubernetesconfiguration/resource-manager/readme.java.md | 1 - .../kubernetesconfiguration/resource-manager/readme.python.md | 1 - .../kubernetesconfiguration/resource-manager/readme.ruby.md | 1 - .../resource-manager/readme.typescript.md | 1 - 5 files changed, 5 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.csharp.md b/specification/kubernetesconfiguration/resource-manager/readme.csharp.md index dce4dccdbb77..a659dab47f99 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.csharp.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.csharp.md @@ -5,7 +5,6 @@ Please also specify `--csharp-sdks-folder=`. ``` yaml $(java) -azure-arm: true fluent: true namespace: com.microsoft.azure.management.kubernetesconfiguration license-header: MICROSOFT_MIT_NO_CODEGEN diff --git a/specification/kubernetesconfiguration/resource-manager/readme.python.md b/specification/kubernetesconfiguration/resource-manager/readme.python.md index cc0640133e87..3b1dc63093ee 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.python.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.python.md @@ -7,7 +7,6 @@ Use `--python-mode=update` if you already have a setup.py and just want to updat ```yaml $(python) python: python-mode: create - azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 2 namespace: azure.mgmt.kubernetesconfiguration diff --git a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md index 18eab73d201b..0129debc998c 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md @@ -5,7 +5,6 @@ These settings apply only when `--ruby` is specified on the command line. ```yaml package-name: azure_mgmt_kubernetesconfiguration package-version: "0.1.1" -azure-arm: true ``` ### Ruby multi-api diff --git a/specification/kubernetesconfiguration/resource-manager/readme.typescript.md b/specification/kubernetesconfiguration/resource-manager/readme.typescript.md index f9fd82a61c46..4d5f342830e6 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.typescript.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.typescript.md @@ -5,7 +5,6 @@ Please also specify `--typescript-sdks-folder= Date: Tue, 27 Oct 2020 22:48:41 -0700 Subject: [PATCH 14/29] python --- .../resource-manager/readme.python.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.python.md b/specification/kubernetesconfiguration/resource-manager/readme.python.md index 3b1dc63093ee..57b81434b2df 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.python.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.python.md @@ -4,14 +4,13 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -```yaml $(python) +```yaml python: python-mode: create license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 namespace: azure.mgmt.kubernetesconfiguration package-name: azure-mgmt-kubernetesconfiguration - package-version: 0.1.1 + package-version: 0.13.2010b1 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' From a04e4dc663810519bde433f7287a3b6504d6d755 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:49:25 -0700 Subject: [PATCH 15/29] rm ruby --- .../resource-manager/readme.md | 7 ------ .../resource-manager/readme.ruby.md | 25 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 specification/kubernetesconfiguration/resource-manager/readme.ruby.md diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index 5115badb9a86..c636754b8e88 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -62,9 +62,6 @@ swagger-to-sdk: - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js - - repo: azure-sdk-for-ruby - after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_kubernetesconfiguration'] - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js kubernetesconfiguration/resource-manager @@ -78,10 +75,6 @@ See configuration in [readme.go.md](./readme.go.md) See configuration in [readme.python.md](./readme.python.md) -## Ruby - -See configuration in [readme.ruby.md](./readme.ruby.md) - ## TypeScript See configuration in [readme.typescript.md](./readme.typescript.md) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md deleted file mode 100644 index 0129debc998c..000000000000 --- a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md +++ /dev/null @@ -1,25 +0,0 @@ -## Ruby - -These settings apply only when `--ruby` is specified on the command line. - -```yaml -package-name: azure_mgmt_kubernetesconfiguration -package-version: "0.1.1" -``` - -### Ruby multi-api - -``` yaml $(ruby) && $(multiapi) -batch: - - tag: package-2019-11-01-preview' -``` - -### Tag: package-2019-11-01-preview and ruby - -These settings apply only when `--tag=package-2019-11-01-preview --ruby` is specified on the command line. -Please also specify `--ruby-sdks-folder=`. - -```yaml $(tag) == 'package-2019-11-01-preview' && $(ruby) -namespace: "Azure::KubernetesConfiguration::Mgmt::V2019_11_01_preview" -output-folder: $(ruby-sdks-folder)/management/azure_mgmt_kubernetesconfiguration/lib -``` From 7af481b5c747f5e5f444ab08c4700f383719da7b Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Tue, 27 Oct 2020 22:51:45 -0700 Subject: [PATCH 16/29] +jobscheduler --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index b073225beb55..ce7bee800bac 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -812,6 +812,7 @@ jobpreparation jobpreparationandreleasetaskstatus jobrelease jobschedule +jobscheduler jobschedules johnc johnsmith From c599b57a0074c30e68b0fee8d4795a1023ff8c84 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Fri, 18 Dec 2020 10:36:20 -0800 Subject: [PATCH 17/29] merge from master --- .../resource-manager/readme.csharp.md | 1 + .../resource-manager/readme.java.md | 1 + .../resource-manager/readme.md | 7 +++++ .../resource-manager/readme.python.md | 6 +++-- .../resource-manager/readme.ruby.md | 26 +++++++++++++++++++ .../resource-manager/readme.typescript.md | 1 + 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 specification/kubernetesconfiguration/resource-manager/readme.ruby.md diff --git a/specification/kubernetesconfiguration/resource-manager/readme.csharp.md b/specification/kubernetesconfiguration/resource-manager/readme.csharp.md index a659dab47f99..dce4dccdbb77 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.csharp.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.csharp.md @@ -5,6 +5,7 @@ Please also specify `--csharp-sdks-folder=`. ``` yaml $(java) +azure-arm: true fluent: true namespace: com.microsoft.azure.management.kubernetesconfiguration license-header: MICROSOFT_MIT_NO_CODEGEN diff --git a/specification/kubernetesconfiguration/resource-manager/readme.md b/specification/kubernetesconfiguration/resource-manager/readme.md index c636754b8e88..5115badb9a86 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.md @@ -62,6 +62,9 @@ swagger-to-sdk: - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js + - repo: azure-sdk-for-ruby + after_scripts: + - bundle install && rake arm:regen_all_profiles['azure_mgmt_kubernetesconfiguration'] - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js kubernetesconfiguration/resource-manager @@ -75,6 +78,10 @@ See configuration in [readme.go.md](./readme.go.md) See configuration in [readme.python.md](./readme.python.md) +## Ruby + +See configuration in [readme.ruby.md](./readme.ruby.md) + ## TypeScript See configuration in [readme.typescript.md](./readme.typescript.md) diff --git a/specification/kubernetesconfiguration/resource-manager/readme.python.md b/specification/kubernetesconfiguration/resource-manager/readme.python.md index 57b81434b2df..cc0640133e87 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.python.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.python.md @@ -4,13 +4,15 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -```yaml +```yaml $(python) python: python-mode: create + azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 namespace: azure.mgmt.kubernetesconfiguration package-name: azure-mgmt-kubernetesconfiguration - package-version: 0.13.2010b1 + package-version: 0.1.1 clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' diff --git a/specification/kubernetesconfiguration/resource-manager/readme.ruby.md b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md new file mode 100644 index 000000000000..18eab73d201b --- /dev/null +++ b/specification/kubernetesconfiguration/resource-manager/readme.ruby.md @@ -0,0 +1,26 @@ +## Ruby + +These settings apply only when `--ruby` is specified on the command line. + +```yaml +package-name: azure_mgmt_kubernetesconfiguration +package-version: "0.1.1" +azure-arm: true +``` + +### Ruby multi-api + +``` yaml $(ruby) && $(multiapi) +batch: + - tag: package-2019-11-01-preview' +``` + +### Tag: package-2019-11-01-preview and ruby + +These settings apply only when `--tag=package-2019-11-01-preview --ruby` is specified on the command line. +Please also specify `--ruby-sdks-folder=`. + +```yaml $(tag) == 'package-2019-11-01-preview' && $(ruby) +namespace: "Azure::KubernetesConfiguration::Mgmt::V2019_11_01_preview" +output-folder: $(ruby-sdks-folder)/management/azure_mgmt_kubernetesconfiguration/lib +``` diff --git a/specification/kubernetesconfiguration/resource-manager/readme.typescript.md b/specification/kubernetesconfiguration/resource-manager/readme.typescript.md index 4d5f342830e6..f9fd82a61c46 100644 --- a/specification/kubernetesconfiguration/resource-manager/readme.typescript.md +++ b/specification/kubernetesconfiguration/resource-manager/readme.typescript.md @@ -5,6 +5,7 @@ Please also specify `--typescript-sdks-folder= Date: Sat, 19 Dec 2020 12:32:24 -0800 Subject: [PATCH 18/29] -ruby --- specification/quantum/data-plane/readme.md | 7 ------- .../quantum/data-plane/readme.ruby.md | 19 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 specification/quantum/data-plane/readme.ruby.md diff --git a/specification/quantum/data-plane/readme.md b/specification/quantum/data-plane/readme.md index 7a81d1e8b21b..38a9d011c579 100644 --- a/specification/quantum/data-plane/readme.md +++ b/specification/quantum/data-plane/readme.md @@ -53,9 +53,6 @@ swagger-to-sdk: - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js - - repo: azure-sdk-for-ruby - after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_quantum'] ``` ## Go @@ -66,10 +63,6 @@ See configuration in [readme.go.md](./readme.go.md) See configuration in [readme.python.md](./readme.python.md) -## Ruby - -See configuration in [readme.ruby.md](./readme.ruby.md) - ## TypeScript See configuration in [readme.typescript.md](./readme.typescript.md) diff --git a/specification/quantum/data-plane/readme.ruby.md b/specification/quantum/data-plane/readme.ruby.md deleted file mode 100644 index 75e6147d4df2..000000000000 --- a/specification/quantum/data-plane/readme.ruby.md +++ /dev/null @@ -1,19 +0,0 @@ -## Ruby - -These settings apply only when `--ruby` is specified on the command line. - -```yaml -package-name: azure_mgmt_quantum -package-version: 2019-11-04-preview -azure-arm: true -``` - -### Tag: package-2019-11-04-preview and ruby - -These settings apply only when `--tag=package-2019-11-04-preview --ruby` is specified on the command line. -Please also specify `--ruby-sdks-folder=`. - -```yaml $(tag) == 'package-2019-11-04-preview' && $(ruby) -namespace: Microsoft.Quantum -output-folder: $(ruby-sdks-folder)/quantum -``` From aa782b7bdd76feab4bb24cb55558cd8b4a7b9330 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sat, 19 Dec 2020 12:48:25 -0800 Subject: [PATCH 19/29] go --- specification/quantum/data-plane/readme.go.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/quantum/data-plane/readme.go.md b/specification/quantum/data-plane/readme.go.md index 084fbca58b64..1a0fc5c06d9d 100644 --- a/specification/quantum/data-plane/readme.go.md +++ b/specification/quantum/data-plane/readme.go.md @@ -5,6 +5,7 @@ These settings apply only when `--go` is specified on the command line. ```yaml $(go) go: license-header: MICROSOFT_APACHE_NO_VERSION + namespace: quantum clear-output-folder: true ``` @@ -14,6 +15,5 @@ These settings apply only when `--tag=package-2019-11-04-preview --go` is specif Please also specify `--go-sdks-folder=`. ```yaml $(tag) == 'package-2019-11-04-preview' && $(go) -namespace: Microsoft.Quantum -output-folder: $(go-sdks-folder)/quantum/Generated +output-folder: $(go-sdk-folder)/services/quantum/v2019-11-04-preview/$(namespace) ``` From fc1834e61bc085181cb6b9dc92410f91ed0e99e4 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sat, 19 Dec 2020 15:56:14 -0800 Subject: [PATCH 20/29] python --- .../preview/2019-11-04-preview/quantum.json | 7 ++----- .../quantum/data-plane/readme.python.md | 18 +++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index c32f2a202c0a..78237817483d 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -1,12 +1,9 @@ { "swagger": "2.0", "info": { - "title": "Azure Quantum Client", + "title": "Quantum Client", "description": "Azure Quantum REST API client", - "version": "2019-11-04-preview", - "x-ms-code-generation-settings": { - "name": "QuantumClient" - } + "version": "2019-11-04-preview" }, "host": "app-jobscheduler-prod.azurewebsites.net", "schemes": [ diff --git a/specification/quantum/data-plane/readme.python.md b/specification/quantum/data-plane/readme.python.md index 1024661a26d4..c192d9b75b1c 100644 --- a/specification/quantum/data-plane/readme.python.md +++ b/specification/quantum/data-plane/readme.python.md @@ -3,19 +3,23 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. -```yaml $(python) +``` yaml $(python) +python-mode: create python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 2 - namespace: Microsoft.Quantum - package-name: quantum - package-version: 2019-11-04-preview + namespace: azure.quantum + package-name: azure-quantum clear-output-folder: true ``` - -```yaml $(python) +``` yaml $(python) && $(python-mode) == 'update' python: no-namespace-folders: true - output-folder: $(python-sdks-folder)/azure-mgmt/quantum + output-folder: $(python-sdks-folder)/quantum/azure-quantum/azure/quantum +``` +``` yaml $(python) && $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/quantum/azure-quantum ``` From e8901f8ac98692676eea0d11592de5e46202c43c Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sat, 19 Dec 2020 16:09:10 -0800 Subject: [PATCH 21/29] js --- specification/quantum/data-plane/readme.typescript.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/quantum/data-plane/readme.typescript.md b/specification/quantum/data-plane/readme.typescript.md index 995a0be4829e..db52f3e4a82d 100644 --- a/specification/quantum/data-plane/readme.typescript.md +++ b/specification/quantum/data-plane/readme.typescript.md @@ -6,8 +6,12 @@ Please also specify `--typescript-sdks-folder= Date: Sat, 19 Dec 2020 16:14:35 -0800 Subject: [PATCH 22/29] csharp --- specification/quantum/data-plane/readme.csharp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/quantum/data-plane/readme.csharp.md b/specification/quantum/data-plane/readme.csharp.md index 2027524beabe..1d4e496f5040 100644 --- a/specification/quantum/data-plane/readme.csharp.md +++ b/specification/quantum/data-plane/readme.csharp.md @@ -11,5 +11,5 @@ csharp: clear-output-folder: true client-side-validation: true namespace: Microsoft.Azure.Quantum.Client - output-folder: $(csharp-sdks-folder)/quantum/management/Microsoft.Quantum/GeneratedProtocol + output-folder: $(csharp-sdks-folder)/batch/Microsoft.Azure.Quantum.Client/src/GeneratedProtocol ``` From b2c691a68df1ec6a1e9365b5ec497f56ed9d4b09 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sat, 19 Dec 2020 16:21:56 -0800 Subject: [PATCH 23/29] -go +java --- .../quantum/data-plane/readme.csharp.md | 2 +- specification/quantum/data-plane/readme.go.md | 19 ------------------- .../quantum/data-plane/readme.java.md | 14 ++++++++++++++ specification/quantum/data-plane/readme.md | 10 +++++----- 4 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 specification/quantum/data-plane/readme.go.md create mode 100644 specification/quantum/data-plane/readme.java.md diff --git a/specification/quantum/data-plane/readme.csharp.md b/specification/quantum/data-plane/readme.csharp.md index 1d4e496f5040..2b4dfa0aee34 100644 --- a/specification/quantum/data-plane/readme.csharp.md +++ b/specification/quantum/data-plane/readme.csharp.md @@ -11,5 +11,5 @@ csharp: clear-output-folder: true client-side-validation: true namespace: Microsoft.Azure.Quantum.Client - output-folder: $(csharp-sdks-folder)/batch/Microsoft.Azure.Quantum.Client/src/GeneratedProtocol + output-folder: $(csharp-sdks-folder)/quantum/Microsoft.Azure.Quantum.Client/src/Generated ``` diff --git a/specification/quantum/data-plane/readme.go.md b/specification/quantum/data-plane/readme.go.md deleted file mode 100644 index 1a0fc5c06d9d..000000000000 --- a/specification/quantum/data-plane/readme.go.md +++ /dev/null @@ -1,19 +0,0 @@ -## Go - -These settings apply only when `--go` is specified on the command line. - -```yaml $(go) -go: - license-header: MICROSOFT_APACHE_NO_VERSION - namespace: quantum - clear-output-folder: true -``` - -### Tag: package-2019-11-04-preview and go - -These settings apply only when `--tag=package-2019-11-04-preview --go` is specified on the command line. -Please also specify `--go-sdks-folder=`. - -```yaml $(tag) == 'package-2019-11-04-preview' && $(go) -output-folder: $(go-sdk-folder)/services/quantum/v2019-11-04-preview/$(namespace) -``` diff --git a/specification/quantum/data-plane/readme.java.md b/specification/quantum/data-plane/readme.java.md new file mode 100644 index 000000000000..e077e23055e3 --- /dev/null +++ b/specification/quantum/data-plane/readme.java.md @@ -0,0 +1,14 @@ +## Java + +These settings apply only when `--java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(java) +java: + azure-arm: true + fluent: true + namespace: com.microsoft.azure.quantum + license-header: MICROSOFT_MIT_NO_CODEGEN + payload-flattening-threshold: 1 + output-folder: $(azure-libraries-for-java-folder)/azure-quantum +``` \ No newline at end of file diff --git a/specification/quantum/data-plane/readme.md b/specification/quantum/data-plane/readme.md index 38a9d011c579..7cbaee7cc172 100644 --- a/specification/quantum/data-plane/readme.md +++ b/specification/quantum/data-plane/readme.md @@ -51,14 +51,9 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-python - repo: azure-sdk-for-java - - repo: azure-sdk-for-go - repo: azure-sdk-for-js ``` -## Go - -See configuration in [readme.go.md](./readme.go.md) - ## Python See configuration in [readme.python.md](./readme.python.md) @@ -70,3 +65,8 @@ See configuration in [readme.typescript.md](./readme.typescript.md) ## CSharp See configuration in [readme.csharp.md](./readme.csharp.md) + +## Java + +See configuration in [readme.go.md](./readme.java.md) + From 60320d43c99c9caef079323f80b356d49f8b45e0 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sat, 19 Dec 2020 16:28:23 -0800 Subject: [PATCH 24/29] nodejs --- specification/quantum/data-plane/readme.md | 13 +++++++++---- specification/quantum/data-plane/readme.nodejs.md | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 specification/quantum/data-plane/readme.nodejs.md diff --git a/specification/quantum/data-plane/readme.md b/specification/quantum/data-plane/readme.md index 7cbaee7cc172..107be6e48189 100644 --- a/specification/quantum/data-plane/readme.md +++ b/specification/quantum/data-plane/readme.md @@ -52,16 +52,13 @@ swagger-to-sdk: - repo: azure-sdk-for-python - repo: azure-sdk-for-java - repo: azure-sdk-for-js + - repo: azure-sdk-for-node ``` ## Python See configuration in [readme.python.md](./readme.python.md) -## TypeScript - -See configuration in [readme.typescript.md](./readme.typescript.md) - ## CSharp See configuration in [readme.csharp.md](./readme.csharp.md) @@ -70,3 +67,11 @@ See configuration in [readme.csharp.md](./readme.csharp.md) See configuration in [readme.go.md](./readme.java.md) +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + + +## Node.js + +See configuration in [readme.go.md](./readme.nodejs.md) diff --git a/specification/quantum/data-plane/readme.nodejs.md b/specification/quantum/data-plane/readme.nodejs.md new file mode 100644 index 000000000000..b76d396bb88e --- /dev/null +++ b/specification/quantum/data-plane/readme.nodejs.md @@ -0,0 +1,15 @@ +## Node.js + +These settings apply only when `--nodejs` is specified on the command line. +Please also specify `--node-sdks-folder=`. + +``` yaml $(nodejs) +nodejs: + azure-arm: true + package-name: azure-quantum + output-folder: $(node-sdks-folder)/lib/services/quantum + payload-flattening-threshold: 1 + generate-license-txt: true + generate-package-json: false + generate-readme-md: false +``` From d5eb1699430efde983727e51f156daf297352d89 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Sun, 20 Dec 2020 11:08:01 -0800 Subject: [PATCH 25/29] missing @ --- specification/quantum/data-plane/readme.typescript.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/quantum/data-plane/readme.typescript.md b/specification/quantum/data-plane/readme.typescript.md index db52f3e4a82d..8c3e92f6290a 100644 --- a/specification/quantum/data-plane/readme.typescript.md +++ b/specification/quantum/data-plane/readme.typescript.md @@ -7,7 +7,7 @@ Please also specify `--typescript-sdks-folder= Date: Wed, 23 Dec 2020 11:18:06 -0800 Subject: [PATCH 26/29] date-time --- .../preview/2019-11-04-preview/quantum.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index 78237817483d..b672cd3b00bf 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -5,7 +5,7 @@ "description": "Azure Quantum REST API client", "version": "2019-11-04-preview" }, - "host": "app-jobscheduler-prod.azurewebsites.net", + "host": "quantum.azure.com", "schemes": [ "https" ], @@ -352,21 +352,25 @@ "creationTime": { "type": "string", "readOnly": true, + "format": "date-time", "description": "The creation time of the job." }, "beginExecutionTime": { "type": "string", "readOnly": true, + "format": "date-time", "description": "The time when the job began execution." }, "endExecutionTime": { "type": "string", "readOnly": true, + "format": "date-time", "description": "The time when the job finished execution." }, "cancellationTime": { "type": "string", "readOnly": true, + "format": "date-time", "description": "The time when a job was successfully cancelled." }, "errorData": { From b0f67b9c19788c6616de5632eff1b0d1dbe717f1 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Wed, 23 Dec 2020 11:26:24 -0800 Subject: [PATCH 27/29] capital defs --- .../preview/2019-11-04-preview/quantum.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index b672cd3b00bf..dce1f2879066 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -35,7 +35,7 @@ "200": { "description": "The operation completed successfully.", "schema": { - "$ref": "#/definitions/jobDetailsList" + "$ref": "#/definitions/JobDetailsList" } } }, @@ -76,7 +76,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/jobDetails" + "$ref": "#/definitions/JobDetails" } }, "default": { @@ -109,7 +109,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/jobDetails" + "$ref": "#/definitions/JobDetails" } } ], @@ -122,13 +122,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/jobDetails" + "$ref": "#/definitions/JobDetails" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/jobDetails" + "$ref": "#/definitions/JobDetails" } }, "default": { @@ -198,7 +198,7 @@ "200": { "description": "The operation completed successfully.", "schema": { - "$ref": "#/definitions/providerStatusList" + "$ref": "#/definitions/ProviderStatusList" } }, "default": { @@ -233,7 +233,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/blobDetails" + "$ref": "#/definitions/BlobDetails" } } ], @@ -246,7 +246,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/sasUriResponse" + "$ref": "#/definitions/SasUriResponse" } }, "default": { @@ -260,14 +260,14 @@ } }, "definitions": { - "jobDetailsList": { + "JobDetailsList": { "description": "List of job details.", "properties": { "value": { "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/jobDetails" + "$ref": "#/definitions/JobDetails" } }, "count": { @@ -282,7 +282,7 @@ } } }, - "jobDetails": { + "JobDetails": { "description": "Job details.", "type": "object", "properties": { @@ -374,7 +374,7 @@ "description": "The time when a job was successfully cancelled." }, "errorData": { - "$ref": "#/definitions/errorData", + "$ref": "#/definitions/ErrorData", "readOnly": true, "description": "The error data for the job. This is expected only when Status 'Failed'." } @@ -386,7 +386,7 @@ "target" ] }, - "blobDetails": { + "BlobDetails": { "description": "Blob details.", "type": "object", "properties": { @@ -403,7 +403,7 @@ "containerName" ] }, - "sasUriResponse": { + "SasUriResponse": { "description": "Get SAS URL operation response.", "type": "object", "properties": { @@ -413,14 +413,14 @@ } } }, - "providerStatusList": { + "ProviderStatusList": { "description": "Providers status.", "properties": { "value": { "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/providerStatus" + "$ref": "#/definitions/ProviderStatus" } }, "nextLink": { @@ -430,7 +430,7 @@ } } }, - "providerStatus": { + "ProviderStatus": { "description": "Providers status.", "properties": { "id": { @@ -456,12 +456,12 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/targetStatus" + "$ref": "#/definitions/TargetStatus" } } } }, - "targetStatus": { + "TargetStatus": { "description": "Target status.", "properties": { "id": { @@ -501,11 +501,11 @@ "description": "Error information returned by the API", "properties": { "error": { - "$ref": "#/definitions/errorData" + "$ref": "#/definitions/ErrorData" } } }, - "errorData": { + "ErrorData": { "properties": { "code": { "type": "string", From d81dcf9257cf6d4c626a2edfc561fd0bda911c99 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Wed, 23 Dec 2020 12:37:46 -0800 Subject: [PATCH 28/29] op names --- .../preview/2019-11-04-preview/quantum.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json index dce1f2879066..8485cd7a5432 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/quantum.json @@ -88,7 +88,7 @@ } }, "put": { - "operationId": "Jobs_Put", + "operationId": "Jobs_Create", "description": "Create a job.", "parameters": [ { @@ -104,7 +104,7 @@ "$ref": "#/parameters/jobIdParameter" }, { - "name": "jobDefinition", + "name": "job", "description": "The complete metadata of the job to submit.", "in": "body", "required": true, @@ -140,7 +140,7 @@ } }, "delete": { - "operationId": "Jobs_Delete", + "operationId": "Jobs_Cancel", "description": "Cancel a job.", "parameters": [ { From ff95fe658225ef82bf846beb790a9cc71f6b0315 Mon Sep 17 00:00:00 2001 From: Andres Paz Date: Wed, 23 Dec 2020 12:44:20 -0800 Subject: [PATCH 29/29] fixing sample --- .../preview/2019-11-04-preview/examples/jobPut.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json index 27452ff46f95..210ad9795310 100644 --- a/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json +++ b/specification/quantum/data-plane/Microsoft.Quantum/preview/2019-11-04-preview/examples/jobPut.json @@ -4,7 +4,7 @@ "resourceGroupName": "quantumResourcegroup", "subscriptionId": "00000000-0000-0000-0000-000000000000", "workspaceName": "quantumworkspace1", - "jobDefinition": { + "job": { "name": "tabu-demo", "id": "a0f7adb6-0378-11eb-9463-2816a847b9a3", "containerUri": "https://storage.blob.core.windows.net/job-a0f7adb6-0378-11eb-9463-2816a847b9a3?sv=2019-02-02&sr=c&sig=mhbf4fluypvLtgXwN5a7iWMygL6b9ojM4EnCC%2F8BZBg%3D&se=2020-10-01T11%3A57%3A01Z&sp=rcw",