From eb471caa6a0bfeb8add47b8ac0748558e7d6c3f7 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 24 May 2019 14:03:02 -0700 Subject: [PATCH] [AutoPR] search/resource-manager (#4503) * Generated from 93a610bee8cf78c96ff98829a41aa72328208230 (#2897) Azure Search: Removing redundant commas * [AutoPR search/resource-manager] typo: search/resource-manager/Microsoft.Search (#3988) * Generated from 95144350accb257e537fb7af4cf472c7253670f0 typo: search/resource-manager/Microsoft.Search - programatically -> programmatically - Trim trailing space * Packaging update of azure-mgmt-search * Packaging update of azure-mgmt-search * updated versioning and changelog, pulled latest azure sdk tools * [AutoPR search/resource-manager] [WaitForARMFeedback] Add api get_services_by_subscription of Azure Search (#4276) * Generated from 52d399a338e4f89936972f21db87a8dbbce1e08d add api get_services_by_subscription Add path of API "get search services by subscription" (GET/SUBSCRIPTIONS/PROVIDERS/MICROSOFT.SEARCH/SEARCHSERVICES) in the spec of API version 2015-08-19 of Azure Search (Microsoft.Search). Along with a sample. * Packaging update of azure-mgmt-search * [AutoPR search/resource-manager] Azure Search: Resource Manager: Support 'None' Identity type (#4480) * Generated from f0fe70b51825fdec12d01df500646be7e4dcff54 Azure Search: Resource Manager: Support 'None' Identity type * Packaging update of azure-mgmt-search * Packaging update of azure-mgmt-search * Generated from d59344aa21135e602d2abb6a70e68394463c8f8c (#4575) Add L-Series SKU values to management plane * Packaging update of azure-mgmt-search * Move search to new path * Update path * changeLog --- azure-mgmt-search/build.json | 746 ------------------ azure-mgmt-search/dev_requirements.txt | 1 - .../search/azure-mgmt-search}/HISTORY.rst | 10 +- .../search/azure-mgmt-search}/MANIFEST.in | 1 + .../search/azure-mgmt-search}/README.rst | 19 - .../azure-mgmt-search}/azure/__init__.py | 0 .../azure-mgmt-search}/azure/mgmt/__init__.py | 0 .../azure/mgmt/search/__init__.py | 0 .../azure/mgmt/search/models/__init__.py | 5 + .../mgmt/search/models/admin_key_result.py | 0 .../search/models/admin_key_result_py3.py | 0 .../models/check_name_availability_input.py | 0 .../check_name_availability_input_py3.py | 0 .../models/check_name_availability_output.py | 0 .../check_name_availability_output_py3.py | 0 .../azure/mgmt/search/models/identity.py | 48 ++ .../azure/mgmt/search/models/identity_py3.py | 48 ++ .../azure/mgmt/search/models/operation.py | 0 .../mgmt/search/models/operation_display.py | 0 .../search/models/operation_display_py3.py | 0 .../mgmt/search/models/operation_paged.py | 0 .../azure/mgmt/search/models/operation_py3.py | 0 .../azure/mgmt/search/models/query_key.py | 0 .../mgmt/search/models/query_key_paged.py | 0 .../azure/mgmt/search/models/query_key_py3.py | 0 .../azure/mgmt/search/models/resource.py | 4 + .../azure/mgmt/search/models/resource_py3.py | 6 +- .../models/search_management_client_enums.py | 8 + .../search_management_request_options.py | 0 .../search_management_request_options_py3.py | 0 .../mgmt/search/models/search_service.py | 3 + .../search/models/search_service_paged.py | 0 .../mgmt/search/models/search_service_py3.py | 7 +- .../azure/mgmt/search/models/sku.py | 11 +- .../azure/mgmt/search/models/sku_py3.py | 11 +- .../azure/mgmt/search/operations/__init__.py | 0 .../operations/admin_keys_operations.py | 12 +- .../mgmt/search/operations/operations.py | 7 +- .../operations/query_keys_operations.py | 18 +- .../search/operations/services_operations.py | 110 ++- .../mgmt/search/search_management_client.py | 0 .../azure/mgmt/search/version.py | 2 +- .../azure-mgmt-search/dev_requirements.txt | 1 + .../azure-mgmt-search}/sdk_packaging.toml | 1 + .../search/azure-mgmt-search}/setup.cfg | 0 .../search/azure-mgmt-search}/setup.py | 1 + ...st_mgmt_search.test_search_admin_keys.yaml | 0 ...st_mgmt_search.test_search_query_keys.yaml | 0 ...test_mgmt_search.test_search_services.yaml | 0 .../tests/test_mgmt_search.py | 0 50 files changed, 262 insertions(+), 818 deletions(-) delete mode 100644 azure-mgmt-search/build.json delete mode 100644 azure-mgmt-search/dev_requirements.txt rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/HISTORY.rst (91%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/MANIFEST.in (66%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/README.rst (75%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/__init__.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/__init__.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/__init__.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/__init__.py (94%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/admin_key_result.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/admin_key_result_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/check_name_availability_input.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/check_name_availability_input_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/check_name_availability_output.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/check_name_availability_output_py3.py (100%) create mode 100644 sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity.py create mode 100644 sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/operation.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/operation_display.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/operation_display_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/operation_paged.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/operation_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/query_key.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/query_key_paged.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/query_key_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/resource.py (90%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/resource_py3.py (86%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_management_client_enums.py (86%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_management_request_options.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_management_request_options_py3.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_service.py (97%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_service_paged.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/search_service_py3.py (94%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/sku.py (71%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/models/sku_py3.py (71%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/operations/__init__.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/operations/admin_keys_operations.py (94%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/operations/operations.py (93%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/operations/query_keys_operations.py (94%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/operations/services_operations.py (84%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/search_management_client.py (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/azure/mgmt/search/version.py (96%) create mode 100644 sdk/search/azure-mgmt-search/dev_requirements.txt rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/sdk_packaging.toml (88%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/setup.cfg (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/setup.py (98%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/tests/recordings/test_mgmt_search.test_search_admin_keys.yaml (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/tests/recordings/test_mgmt_search.test_search_query_keys.yaml (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/tests/recordings/test_mgmt_search.test_search_services.yaml (100%) rename {azure-mgmt-search => sdk/search/azure-mgmt-search}/tests/test_mgmt_search.py (100%) diff --git a/azure-mgmt-search/build.json b/azure-mgmt-search/build.json deleted file mode 100644 index 881bbd415daa..000000000000 --- a/azure-mgmt-search/build.json +++ /dev/null @@ -1,746 +0,0 @@ -{ - "autorest": [ - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4228", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@types/commonmark": "^0.27.0", - "@types/js-yaml": "^3.10.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.53", - "@types/source-map": "^0.5.0", - "@types/yargs": "^8.0.2", - "@types/z-schema": "^3.16.31", - "dts-generator": "^2.1.0", - "mocha": "^4.0.1", - "mocha-typescript": "^1.1.7", - "shx": "0.2.2", - "static-link": "^0.2.3", - "vscode-jsonrpc": "^3.3.1" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "_shasum": "b3897b8615417aa07cf9113d4bd18862b32f82f8", - "_shrinkwrap": null, - "bin": { - "autorest-core": "./dist/app.js", - "autorest-language-service": "dist/language-service/language-service.js" - }, - "_id": "@microsoft.azure/autorest-core@2.0.4228", - "_from": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core", - "_where": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4228/node_modules/@microsoft.azure/autorest-core" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4229", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@types/commonmark": "^0.27.0", - "@types/js-yaml": "^3.10.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.53", - "@types/source-map": "^0.5.0", - "@types/yargs": "^8.0.2", - "@types/z-schema": "^3.16.31", - "dts-generator": "^2.1.0", - "mocha": "^4.0.1", - "mocha-typescript": "^1.1.7", - "shx": "0.2.2", - "static-link": "^0.2.3", - "vscode-jsonrpc": "^3.3.1" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "_shasum": "c19c0ee74fe38c5197be2e965cd729a633166ae0", - "_shrinkwrap": null, - "bin": { - "autorest-core": "./dist/app.js", - "autorest-language-service": "dist/language-service/language-service.js" - }, - "_id": "@microsoft.azure/autorest-core@2.0.4229", - "_from": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core", - "_where": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4229/node_modules/@microsoft.azure/autorest-core" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4230", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@types/commonmark": "^0.27.0", - "@types/js-yaml": "^3.10.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.53", - "@types/source-map": "0.5.0", - "@types/yargs": "^8.0.2", - "@types/z-schema": "^3.16.31", - "dts-generator": "^2.1.0", - "mocha": "^4.0.1", - "mocha-typescript": "^1.1.7", - "shx": "0.2.2", - "static-link": "^0.2.3", - "vscode-jsonrpc": "^3.3.1" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "_shasum": "3c9b387fbe18ce3a54b68bc0c24ddb0a4c850f25", - "_shrinkwrap": null, - "bin": { - "autorest-core": "./dist/app.js", - "autorest-language-service": "dist/language-service/language-service.js" - }, - "_id": "@microsoft.azure/autorest-core@2.0.4230", - "_from": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core", - "_where": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4230/node_modules/@microsoft.azure/autorest-core" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4231", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@types/commonmark": "^0.27.0", - "@types/js-yaml": "^3.10.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.53", - "@types/source-map": "0.5.0", - "@types/yargs": "^8.0.2", - "@types/z-schema": "^3.16.31", - "dts-generator": "^2.1.0", - "mocha": "^4.0.1", - "mocha-typescript": "^1.1.7", - "shx": "0.2.2", - "static-link": "^0.2.3", - "vscode-jsonrpc": "^3.3.1" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "_shasum": "fa1b2b50cdd91bec9f04542420c3056eda202b87", - "_shrinkwrap": null, - "bin": { - "autorest-core": "./dist/app.js", - "autorest-language-service": "dist/language-service/language-service.js" - }, - "_id": "@microsoft.azure/autorest-core@2.0.4231", - "_from": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core", - "_where": "/root/.autorest/@microsoft.azure_autorest-core@2.0.4231/node_modules/@microsoft.azure/autorest-core" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.modeler", - "version": "2.0.21", - "dependencies": { - "dotnet-2.0.0": "^1.3.2" - }, - "optionalDependencies": {}, - "devDependencies": { - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.1.1", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_shasum": "3ce7d3939124b31830be15e5de99b9b7768afb90", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.modeler@2.0.21", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler", - "_where": "/root/.autorest/@microsoft.azure_autorest.modeler@2.0.21/node_modules/@microsoft.azure/autorest.modeler" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.modeler", - "version": "2.3.38", - "dependencies": { - "dotnet-2.0.0": "^1.4.4" - }, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/autorest.testserver": "2.3.1", - "autorest": "^2.0.4201", - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.4.4", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "_shasum": "903bb77932e4ed1b8bc3b25cc39b167143494f6c", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.modeler@2.3.38", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler", - "_where": "/root/.autorest/@microsoft.azure_autorest.modeler@2.3.38/node_modules/@microsoft.azure/autorest.modeler" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.python", - "version": "2.1.34", - "dependencies": { - "dotnet-2.0.0": "^1.4.4" - }, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/autorest.testserver": "^2.3.13", - "autorest": "^2.0.4203", - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.4.4", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "_shasum": "b58d7e0542e081cf410fdbcdf8c14acf9cee16a7", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.python@2.1.34", - "_from": "file:/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "rawSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "saveSpec": "file:/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "fetchSpec": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python" - }, - "_spec": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python", - "_where": "/root/.autorest/@microsoft.azure_autorest.python@2.1.34/node_modules/@microsoft.azure/autorest.python" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/classic-openapi-validator", - "version": "1.0.9", - "dependencies": { - "dotnet-2.0.0": "^1.1.0" - }, - "optionalDependencies": {}, - "devDependencies": { - "dotnet-sdk-2.0.0": "^1.1.1" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "_shasum": "554be1db3e054b0a0e4e51c842ff5b7c6a60784c", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/classic-openapi-validator@1.0.9", - "_from": "file:/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "rawSpec": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "saveSpec": "file:/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "fetchSpec": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator" - }, - "_spec": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator", - "_where": "/root/.autorest/@microsoft.azure_classic-openapi-validator@1.0.9/node_modules/@microsoft.azure/classic-openapi-validator" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/openapi-validator", - "version": "1.0.2", - "dependencies": { - "fs": "^0.0.1-security", - "js-yaml": "^3.8.4", - "jsonpath": "^0.2.11", - "vscode-jsonrpc": "^3.2.0" - }, - "optionalDependencies": {}, - "devDependencies": { - "@types/js-yaml": "^3.5.30", - "@types/jsonpath": "^0.1.29", - "@types/node": "^7.0.18", - "gulp": "3.9.1", - "gulp-clean": "0.3.2", - "gulp-dotnet-cli": "0.4.0", - "gulp-mocha": "4.3.1", - "gulp-run": "1.7.1", - "mocha": "3.2.0", - "mocha-typescript": "1.0.22", - "typescript": "2.3.3" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "_shasum": "352190e6dbb4a1d16587b39e589b9615d6e4aaaf", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/openapi-validator@1.0.2", - "_from": "file:/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "_requested": { - "type": "directory", - "where": "/git-restapi", - "raw": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "rawSpec": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "saveSpec": "file:/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "fetchSpec": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator" - }, - "_spec": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator", - "_where": "/root/.autorest/@microsoft.azure_openapi-validator@1.0.2/node_modules/@microsoft.azure/openapi-validator" - }, - "extensionManager": { - "installationPath": "/root/.autorest", - "sharedLock": { - "name": "/root/.autorest", - "exclusiveLock": { - "name": "_root_.autorest.exclusive-lock", - "options": { - "port": 45234, - "host": "2130706813", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.exclusive-lock:45234" - }, - "busyLock": { - "name": "_root_.autorest.busy-lock", - "options": { - "port": 37199, - "host": "2130756895", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.busy-lock:37199" - }, - "personalLock": { - "name": "_root_.autorest.3265.555181728095.personal-lock", - "options": { - "port": 38712, - "host": "2130756016", - "exclusive": true - }, - "pipe": "/tmp/pipe__root_.autorest.3265.555181728095.personal-lock:38712" - }, - "file": "/tmp/_root_.autorest.lock" - }, - "dotnetPath": "/root/.dotnet" - }, - "installationPath": "/root/.autorest" - } - ], - "autorest_bootstrap": {} -} \ No newline at end of file diff --git a/azure-mgmt-search/dev_requirements.txt b/azure-mgmt-search/dev_requirements.txt deleted file mode 100644 index 331cfed8ea26..000000000000 --- a/azure-mgmt-search/dev_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e ../azure-sdk-tools diff --git a/azure-mgmt-search/HISTORY.rst b/sdk/search/azure-mgmt-search/HISTORY.rst similarity index 91% rename from azure-mgmt-search/HISTORY.rst rename to sdk/search/azure-mgmt-search/HISTORY.rst index c143af0d63ad..f604ac2f30c7 100644 --- a/azure-mgmt-search/HISTORY.rst +++ b/sdk/search/azure-mgmt-search/HISTORY.rst @@ -3,6 +3,14 @@ Release History =============== +2.1.0 (2019-05-24) +++++++++++++++++++ + +**Features** + +- Model SearchService has a new parameter identity +- Model Resource has a new parameter identity + 2.0.0 (2018-05-21) ++++++++++++++++++ @@ -24,7 +32,7 @@ This version uses a next-generation code generator that *might* introduce breaki - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same. - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used. - - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, + - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`. - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`, the response of the initial call will be returned without polling. diff --git a/azure-mgmt-search/MANIFEST.in b/sdk/search/azure-mgmt-search/MANIFEST.in similarity index 66% rename from azure-mgmt-search/MANIFEST.in rename to sdk/search/azure-mgmt-search/MANIFEST.in index 6ceb27f7a96e..e4884efef41b 100644 --- a/azure-mgmt-search/MANIFEST.in +++ b/sdk/search/azure-mgmt-search/MANIFEST.in @@ -1,3 +1,4 @@ +recursive-include tests *.py *.yaml include *.rst include azure/__init__.py include azure/mgmt/__init__.py diff --git a/azure-mgmt-search/README.rst b/sdk/search/azure-mgmt-search/README.rst similarity index 75% rename from azure-mgmt-search/README.rst rename to sdk/search/azure-mgmt-search/README.rst index 1f6d8c90ea81..c7efdc2de258 100644 --- a/azure-mgmt-search/README.rst +++ b/sdk/search/azure-mgmt-search/README.rst @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see For a more complete set of Azure libraries, see the `azure `__ bundle package. -Compatibility -============= - -**IMPORTANT**: If you have an earlier version of the azure package -(version < 1.0), you should uninstall it before installing this package. - -You can check the version using pip: - -.. code:: shell - - pip freeze - -If you see azure==0.11.0 (or any version below 1.0), uninstall it first: - -.. code:: shell - - pip uninstall azure - - Usage ===== diff --git a/azure-mgmt-search/azure/__init__.py b/sdk/search/azure-mgmt-search/azure/__init__.py similarity index 100% rename from azure-mgmt-search/azure/__init__.py rename to sdk/search/azure-mgmt-search/azure/__init__.py diff --git a/azure-mgmt-search/azure/mgmt/__init__.py b/sdk/search/azure-mgmt-search/azure/mgmt/__init__.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/__init__.py rename to sdk/search/azure-mgmt-search/azure/mgmt/__init__.py diff --git a/azure-mgmt-search/azure/mgmt/search/__init__.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/__init__.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/__init__.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/__init__.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/__init__.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py similarity index 94% rename from azure-mgmt-search/azure/mgmt/search/models/__init__.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py index 1fa43c85e74e..d09b7141363d 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/__init__.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/__init__.py @@ -16,6 +16,7 @@ from .query_key_py3 import QueryKey from .sku_py3 import Sku from .search_service_py3 import SearchService + from .identity_py3 import Identity from .resource_py3 import Resource from .operation_display_py3 import OperationDisplay from .operation_py3 import Operation @@ -27,6 +28,7 @@ from .query_key import QueryKey from .sku import Sku from .search_service import SearchService + from .identity import Identity from .resource import Resource from .operation_display import OperationDisplay from .operation import Operation @@ -40,6 +42,7 @@ HostingMode, SearchServiceStatus, ProvisioningState, + IdentityType, AdminKeyKind, ) @@ -50,6 +53,7 @@ 'QueryKey', 'Sku', 'SearchService', + 'Identity', 'Resource', 'OperationDisplay', 'Operation', @@ -62,5 +66,6 @@ 'HostingMode', 'SearchServiceStatus', 'ProvisioningState', + 'IdentityType', 'AdminKeyKind', ] diff --git a/azure-mgmt-search/azure/mgmt/search/models/admin_key_result.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/admin_key_result.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/admin_key_result.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/admin_key_result.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/admin_key_result_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/admin_key_result_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/admin_key_result_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/admin_key_result_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_input_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/check_name_availability_output_py3.py diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity.py new file mode 100644 index 000000000000..5d6912d964ce --- /dev/null +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Identity(Model): + """Identity for the resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar principal_id: The principal ID of resource identity. + :vartype principal_id: str + :ivar tenant_id: The tenant ID of resource. + :vartype tenant_id: str + :param type: Required. The identity type. Possible values include: 'None', + 'SystemAssigned' + :type type: str or ~azure.mgmt.search.models.IdentityType + """ + + _validation = { + 'principal_id': {'readonly': True}, + 'tenant_id': {'readonly': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'principal_id': {'key': 'principalId', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'IdentityType'}, + } + + def __init__(self, **kwargs): + super(Identity, self).__init__(**kwargs) + self.principal_id = None + self.tenant_id = None + self.type = kwargs.get('type', None) diff --git a/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py new file mode 100644 index 000000000000..61d3064568ae --- /dev/null +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Identity(Model): + """Identity for the resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar principal_id: The principal ID of resource identity. + :vartype principal_id: str + :ivar tenant_id: The tenant ID of resource. + :vartype tenant_id: str + :param type: Required. The identity type. Possible values include: 'None', + 'SystemAssigned' + :type type: str or ~azure.mgmt.search.models.IdentityType + """ + + _validation = { + 'principal_id': {'readonly': True}, + 'tenant_id': {'readonly': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'principal_id': {'key': 'principalId', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'IdentityType'}, + } + + def __init__(self, *, type, **kwargs) -> None: + super(Identity, self).__init__(**kwargs) + self.principal_id = None + self.tenant_id = None + self.type = type diff --git a/azure-mgmt-search/azure/mgmt/search/models/operation.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/operation.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/operation_display.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_display.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/operation_display.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_display.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/operation_display_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_display_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/operation_display_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_display_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/operation_paged.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_paged.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/operation_paged.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_paged.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/operation_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/operation_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/operation_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/query_key.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/query_key.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/query_key_paged.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key_paged.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/query_key_paged.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key_paged.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/query_key_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/query_key_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/query_key_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/resource.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource.py similarity index 90% rename from azure-mgmt-search/azure/mgmt/search/models/resource.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource.py index 718a54f2e59b..8dc5dd8833f9 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/resource.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource.py @@ -32,6 +32,8 @@ class Resource(Model): :type location: str :param tags: Tags to help categorize the resource in the Azure portal. :type tags: dict[str, str] + :param identity: The identity of the resource. + :type identity: ~azure.mgmt.search.models.Identity """ _validation = { @@ -46,6 +48,7 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'identity': {'key': 'identity', 'type': 'Identity'}, } def __init__(self, **kwargs): @@ -55,3 +58,4 @@ def __init__(self, **kwargs): self.type = None self.location = kwargs.get('location', None) self.tags = kwargs.get('tags', None) + self.identity = kwargs.get('identity', None) diff --git a/azure-mgmt-search/azure/mgmt/search/models/resource_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource_py3.py similarity index 86% rename from azure-mgmt-search/azure/mgmt/search/models/resource_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource_py3.py index 0f2e04e0d9cc..752e7a2cbbb9 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/resource_py3.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/resource_py3.py @@ -32,6 +32,8 @@ class Resource(Model): :type location: str :param tags: Tags to help categorize the resource in the Azure portal. :type tags: dict[str, str] + :param identity: The identity of the resource. + :type identity: ~azure.mgmt.search.models.Identity """ _validation = { @@ -46,12 +48,14 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'identity': {'key': 'identity', 'type': 'Identity'}, } - def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, identity=None, **kwargs) -> None: super(Resource, self).__init__(**kwargs) self.id = None self.name = None self.type = None self.location = location self.tags = tags + self.identity = identity diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py similarity index 86% rename from azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py index 8622b25c4ffb..cf76e9f19b0d 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py @@ -25,6 +25,8 @@ class SkuName(str, Enum): standard = "standard" standard2 = "standard2" standard3 = "standard3" + storage_optimized_l1 = "storage_optimized_l1" + storage_optimized_l2 = "storage_optimized_l2" class HostingMode(str, Enum): @@ -50,6 +52,12 @@ class ProvisioningState(str, Enum): failed = "failed" +class IdentityType(str, Enum): + + none = "None" + system_assigned = "SystemAssigned" + + class AdminKeyKind(str, Enum): primary = "primary" diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/search_management_request_options.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options_py3.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/search_management_request_options_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_management_request_options_py3.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_service.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service.py similarity index 97% rename from azure-mgmt-search/azure/mgmt/search/models/search_service.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service.py index 077847e78c05..6bd3de6791de 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/search_service.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service.py @@ -32,6 +32,8 @@ class SearchService(Resource): :type location: str :param tags: Tags to help categorize the resource in the Azure portal. :type tags: dict[str, str] + :param identity: The identity of the resource. + :type identity: ~azure.mgmt.search.models.Identity :param replica_count: The number of replicas in the Search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU. Default value: 1 . @@ -101,6 +103,7 @@ class SearchService(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'identity': {'key': 'identity', 'type': 'Identity'}, 'replica_count': {'key': 'properties.replicaCount', 'type': 'int'}, 'partition_count': {'key': 'properties.partitionCount', 'type': 'int'}, 'hosting_mode': {'key': 'properties.hostingMode', 'type': 'HostingMode'}, diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_service_paged.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service_paged.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/models/search_service_paged.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service_paged.py diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py similarity index 94% rename from azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py index a0e3dd69d375..823afff5b9a5 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/search_service_py3.py @@ -32,6 +32,8 @@ class SearchService(Resource): :type location: str :param tags: Tags to help categorize the resource in the Azure portal. :type tags: dict[str, str] + :param identity: The identity of the resource. + :type identity: ~azure.mgmt.search.models.Identity :param replica_count: The number of replicas in the Search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU. Default value: 1 . @@ -101,6 +103,7 @@ class SearchService(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'identity': {'key': 'identity', 'type': 'Identity'}, 'replica_count': {'key': 'properties.replicaCount', 'type': 'int'}, 'partition_count': {'key': 'properties.partitionCount', 'type': 'int'}, 'hosting_mode': {'key': 'properties.hostingMode', 'type': 'HostingMode'}, @@ -110,8 +113,8 @@ class SearchService(Resource): 'sku': {'key': 'sku', 'type': 'Sku'}, } - def __init__(self, *, location: str=None, tags=None, replica_count: int=1, partition_count: int=1, hosting_mode="default", sku=None, **kwargs) -> None: - super(SearchService, self).__init__(location=location, tags=tags, **kwargs) + def __init__(self, *, location: str=None, tags=None, identity=None, replica_count: int=1, partition_count: int=1, hosting_mode="default", sku=None, **kwargs) -> None: + super(SearchService, self).__init__(location=location, tags=tags, identity=identity, **kwargs) self.replica_count = replica_count self.partition_count = partition_count self.hosting_mode = hosting_mode diff --git a/azure-mgmt-search/azure/mgmt/search/models/sku.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku.py similarity index 71% rename from azure-mgmt-search/azure/mgmt/search/models/sku.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku.py index 66cdf99871d3..375894ee72ca 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/sku.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku.py @@ -20,10 +20,13 @@ class Sku(Model): Shared service. 'basic': Dedicated service with up to 3 replicas. 'standard': Dedicated service with up to 12 partitions and 12 replicas. 'standard2': Similar to standard, but with more capacity per search unit. - 'standard3': Offers maximum capacity per search unit with up to 12 - partitions and 12 replicas (or up to 3 partitions with more indexes if you - also set the hostingMode property to 'highDensity'). Possible values - include: 'free', 'basic', 'standard', 'standard2', 'standard3' + 'standard3': The largest Standard offering with up to 12 partitions and 12 + replicas (or up to 3 partitions with more indexes if you also set the + hostingMode property to 'highDensity'). 'storage_optimized_l1': Supports + 1TB per partition, up to 12 partitions. 'storage_optimized_l2': Supports + 2TB per partition, up to 12 partitions.'. Possible values include: 'free', + 'basic', 'standard', 'standard2', 'standard3', 'storage_optimized_l1', + 'storage_optimized_l2' :type name: str or ~azure.mgmt.search.models.SkuName """ diff --git a/azure-mgmt-search/azure/mgmt/search/models/sku_py3.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku_py3.py similarity index 71% rename from azure-mgmt-search/azure/mgmt/search/models/sku_py3.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku_py3.py index 4701cb2ad17b..aae43fc4e4b7 100644 --- a/azure-mgmt-search/azure/mgmt/search/models/sku_py3.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/models/sku_py3.py @@ -20,10 +20,13 @@ class Sku(Model): Shared service. 'basic': Dedicated service with up to 3 replicas. 'standard': Dedicated service with up to 12 partitions and 12 replicas. 'standard2': Similar to standard, but with more capacity per search unit. - 'standard3': Offers maximum capacity per search unit with up to 12 - partitions and 12 replicas (or up to 3 partitions with more indexes if you - also set the hostingMode property to 'highDensity'). Possible values - include: 'free', 'basic', 'standard', 'standard2', 'standard3' + 'standard3': The largest Standard offering with up to 12 partitions and 12 + replicas (or up to 3 partitions with more indexes if you also set the + hostingMode property to 'highDensity'). 'storage_optimized_l1': Supports + 1TB per partition, up to 12 partitions. 'storage_optimized_l2': Supports + 2TB per partition, up to 12 partitions.'. Possible values include: 'free', + 'basic', 'standard', 'standard2', 'standard3', 'storage_optimized_l1', + 'storage_optimized_l2' :type name: str or ~azure.mgmt.search.models.SkuName """ diff --git a/azure-mgmt-search/azure/mgmt/search/operations/__init__.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/__init__.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/operations/__init__.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/operations/__init__.py diff --git a/azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py similarity index 94% rename from azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py index da5e9acb21bc..7887d302f3d4 100644 --- a/azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/admin_keys_operations.py @@ -82,7 +82,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -93,8 +93,8 @@ def get( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -163,7 +163,7 @@ def regenerate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -174,8 +174,8 @@ def regenerate( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-search/azure/mgmt/search/operations/operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/operations.py similarity index 93% rename from azure-mgmt-search/azure/mgmt/search/operations/operations.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/operations/operations.py index 5a35bf95f5d8..c83587eafb24 100644 --- a/azure-mgmt-search/azure/mgmt/search/operations/operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/operations.py @@ -68,7 +68,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -77,9 +77,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py similarity index 94% rename from azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py index e0ce209493e1..8fb9e29e0309 100644 --- a/azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/query_keys_operations.py @@ -85,7 +85,7 @@ def create( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -96,8 +96,8 @@ def create( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -167,7 +167,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -178,9 +178,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -249,7 +248,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -260,8 +258,8 @@ def delete( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204, 404]: exp = CloudError(response) diff --git a/azure-mgmt-search/azure/mgmt/search/operations/services_operations.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/services_operations.py similarity index 84% rename from azure-mgmt-search/azure/mgmt/search/operations/services_operations.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/operations/services_operations.py index 9a372a7c9c16..c89b0d0e364d 100644 --- a/azure-mgmt-search/azure/mgmt/search/operations/services_operations.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/operations/services_operations.py @@ -61,6 +61,7 @@ def _create_or_update_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -75,9 +76,8 @@ def _create_or_update_initial( body_content = self._serialize.body(service, 'SearchService') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: exp = CloudError(response) @@ -210,6 +210,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -224,9 +225,8 @@ def update( body_content = self._serialize.body(service, 'SearchService') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -290,7 +290,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -301,8 +301,8 @@ def get( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -365,7 +365,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -376,8 +375,8 @@ def delete( header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204, 404]: exp = CloudError(response) @@ -436,7 +435,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -447,9 +446,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -469,6 +467,80 @@ def internal_paging(next_link=None, raw=False): return deserialized list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Search/searchServices'} + def list_by_subscription( + self, search_management_request_options=None, custom_headers=None, raw=False, **operation_config): + """Gets a list of all Search services in the given subscription. + + :param search_management_request_options: Additional parameters for + the operation + :type search_management_request_options: + ~azure.mgmt.search.models.SearchManagementRequestOptions + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of SearchService + :rtype: + ~azure.mgmt.search.models.SearchServicePaged[~azure.mgmt.search.models.SearchService] + :raises: :class:`CloudError` + """ + client_request_id = None + if search_management_request_options is not None: + client_request_id = search_management_request_options.client_request_id + + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_subscription.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + if client_request_id is not None: + header_parameters['x-ms-client-request-id'] = self._serialize.header("client_request_id", client_request_id, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.SearchServicePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.SearchServicePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Search/searchServices'} + def check_name_availability( self, name, search_management_request_options=None, custom_headers=None, raw=False, **operation_config): """Checks whether or not the given Search service name is available for @@ -512,6 +584,7 @@ def check_name_availability( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -526,9 +599,8 @@ def check_name_availability( body_content = self._serialize.body(check_name_availability_input, 'CheckNameAvailabilityInput') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-search/azure/mgmt/search/search_management_client.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/search_management_client.py similarity index 100% rename from azure-mgmt-search/azure/mgmt/search/search_management_client.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/search_management_client.py diff --git a/azure-mgmt-search/azure/mgmt/search/version.py b/sdk/search/azure-mgmt-search/azure/mgmt/search/version.py similarity index 96% rename from azure-mgmt-search/azure/mgmt/search/version.py rename to sdk/search/azure-mgmt-search/azure/mgmt/search/version.py index 53c4c7ea05e8..be75d8eae586 100644 --- a/azure-mgmt-search/azure/mgmt/search/version.py +++ b/sdk/search/azure-mgmt-search/azure/mgmt/search/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0" +VERSION = "2.1.0" diff --git a/sdk/search/azure-mgmt-search/dev_requirements.txt b/sdk/search/azure-mgmt-search/dev_requirements.txt new file mode 100644 index 000000000000..1f0e0d86b735 --- /dev/null +++ b/sdk/search/azure-mgmt-search/dev_requirements.txt @@ -0,0 +1 @@ +-e ../../../azure-sdk-tools diff --git a/azure-mgmt-search/sdk_packaging.toml b/sdk/search/azure-mgmt-search/sdk_packaging.toml similarity index 88% rename from azure-mgmt-search/sdk_packaging.toml rename to sdk/search/azure-mgmt-search/sdk_packaging.toml index da7f6badb68b..d7b1c8998bff 100644 --- a/azure-mgmt-search/sdk_packaging.toml +++ b/sdk/search/azure-mgmt-search/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "Search Management" package_doc_id = "search" is_stable = false is_arm = true +need_msrestazure = true diff --git a/azure-mgmt-search/setup.cfg b/sdk/search/azure-mgmt-search/setup.cfg similarity index 100% rename from azure-mgmt-search/setup.cfg rename to sdk/search/azure-mgmt-search/setup.cfg diff --git a/azure-mgmt-search/setup.py b/sdk/search/azure-mgmt-search/setup.py similarity index 98% rename from azure-mgmt-search/setup.py rename to sdk/search/azure-mgmt-search/setup.py index e429c58e6314..ef198eb843a2 100644 --- a/azure-mgmt-search/setup.py +++ b/sdk/search/azure-mgmt-search/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', diff --git a/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_admin_keys.yaml b/sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_admin_keys.yaml similarity index 100% rename from azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_admin_keys.yaml rename to sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_admin_keys.yaml diff --git a/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_query_keys.yaml b/sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_query_keys.yaml similarity index 100% rename from azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_query_keys.yaml rename to sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_query_keys.yaml diff --git a/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_services.yaml b/sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_services.yaml similarity index 100% rename from azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_services.yaml rename to sdk/search/azure-mgmt-search/tests/recordings/test_mgmt_search.test_search_services.yaml diff --git a/azure-mgmt-search/tests/test_mgmt_search.py b/sdk/search/azure-mgmt-search/tests/test_mgmt_search.py similarity index 100% rename from azure-mgmt-search/tests/test_mgmt_search.py rename to sdk/search/azure-mgmt-search/tests/test_mgmt_search.py