From b1c1057239fe37d0a6f986e7ef2a3aaf1479412c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 31 Aug 2018 14:06:15 -0700 Subject: [PATCH 1/8] Generated from d5c27e873505fb8804609201b23950ab97fe922d (#3248) increment python sdk version for the swagger --- .../operations/bot_services_operations.py | 101 ------------------ .../botservice/operations/bots_operations.py | 2 +- .../azure/mgmt/botservice/version.py | 3 +- 3 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_services_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_services_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_services_operations.py deleted file mode 100644 index 2902f7951ec6..000000000000 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_services_operations.py +++ /dev/null @@ -1,101 +0,0 @@ -# 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. -# -------------------------------------------------------------------------- - -import uuid -from msrest.pipeline import ClientRawResponse - -from .. import models - - -class BotServicesOperations(object): - """BotServicesOperations operations. - - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2017-12-01. Constant value: "2017-12-01". - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - self.api_version = "2017-12-01" - - self.config = config - - def list( - self, custom_headers=None, raw=False, **operation_config): - """Returns all the resources of a particular type belonging to a - subscription. - - :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 Bot - :rtype: - ~azure.mgmt.botservice.models.BotPaged[~azure.mgmt.botservice.models.Bot] - :raises: - :class:`ErrorException` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.BotService/botServices' - 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['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: - 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') - - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorException(self._deserialize, response) - - return response - - # Deserialize response - deserialized = models.BotPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.BotPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py index e3daba7bbe6e..824907e3caad 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py @@ -484,7 +484,7 @@ def get_check_name_availability( body_content = self._serialize.body(parameters, 'CheckNameAvailabilityRequestBody') # Construct and send request - request = self._client.get(url, query_parameters, header_parameters, body_content) + 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]: diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/version.py b/azure-mgmt-botservice/azure/mgmt/botservice/version.py index fb0159ed93d7..9bd1dfac7ecb 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/version.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/version.py @@ -9,4 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.1.0" +VERSION = "0.2.0" + From aa16e38dab2de3159f49b6ccf4d7ad4fca5f07ff Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 6 Sep 2018 13:36:12 -0700 Subject: [PATCH 2/8] [AutoPR botservice/resource-manager] add security fields to directline channel site for botservice (#3281) * Generated from ce0ac2b44c1e5b31b498d43341f9c3f2e7b7c66a add security fields to directline channel site * Generated from 409e6ef7de40c5c43a3e0b2d41750b42208c7192 improve documentation for trusted origins field * Generated from d79326c7ea2061fb0a549e536f4bb5525877cc52 actually fix the description --- .../mgmt/botservice/azure_bot_service.py | 5 + .../azure/mgmt/botservice/models/__init__.py | 21 + .../models/azure_bot_service_enums.py | 28 + .../botservice/models/direct_line_site.py | 16 +- .../botservice/models/direct_line_site_py3.py | 18 +- .../botservice/models/enterprise_channel.py | 64 +++ ...channel_check_name_availability_request.py | 30 + ...nel_check_name_availability_request_py3.py | 30 + ...hannel_check_name_availability_response.py | 34 ++ ...el_check_name_availability_response_py3.py | 34 ++ .../models/enterprise_channel_node.py | 62 ++ .../models/enterprise_channel_node_py3.py | 62 ++ .../models/enterprise_channel_paged.py | 27 + .../models/enterprise_channel_properties.py | 40 ++ .../enterprise_channel_properties_py3.py | 40 ++ .../models/enterprise_channel_py3.py | 64 +++ .../mgmt/botservice/operations/__init__.py | 2 + .../operations/bot_connection_operations.py | 2 +- .../botservice/operations/bots_operations.py | 2 +- .../operations/channels_operations.py | 2 +- .../enterprise_channels_operations.py | 535 ++++++++++++++++++ .../mgmt/botservice/operations/operations.py | 2 +- .../azure/mgmt/botservice/version.py | 2 +- 23 files changed, 1110 insertions(+), 12 deletions(-) create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py create mode 100644 azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py b/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py index 7264c073950a..e4ed47896874 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py @@ -17,6 +17,7 @@ from .operations.channels_operations import ChannelsOperations from .operations.operations import Operations from .operations.bot_connection_operations import BotConnectionOperations +from .operations.enterprise_channels_operations import EnterpriseChannelsOperations from . import models @@ -66,6 +67,8 @@ class AzureBotService(SDKClient): :vartype operations: azure.mgmt.botservice.operations.Operations :ivar bot_connection: BotConnection operations :vartype bot_connection: azure.mgmt.botservice.operations.BotConnectionOperations + :ivar enterprise_channels: EnterpriseChannels operations + :vartype enterprise_channels: azure.mgmt.botservice.operations.EnterpriseChannelsOperations :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials @@ -94,3 +97,5 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.bot_connection = BotConnectionOperations( self._client, self.config, self._serialize, self._deserialize) + self.enterprise_channels = EnterpriseChannelsOperations( + self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py index d1d07d8093e7..8091b3656229 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py @@ -53,6 +53,11 @@ from .operation_entity_py3 import OperationEntity from .check_name_availability_request_body_py3 import CheckNameAvailabilityRequestBody from .check_name_availability_response_body_py3 import CheckNameAvailabilityResponseBody + from .enterprise_channel_check_name_availability_request_py3 import EnterpriseChannelCheckNameAvailabilityRequest + from .enterprise_channel_check_name_availability_response_py3 import EnterpriseChannelCheckNameAvailabilityResponse + from .enterprise_channel_node_py3 import EnterpriseChannelNode + from .enterprise_channel_properties_py3 import EnterpriseChannelProperties + from .enterprise_channel_py3 import EnterpriseChannel except (SyntaxError, ImportError): from .sku import Sku from .resource import Resource @@ -97,14 +102,22 @@ from .operation_entity import OperationEntity from .check_name_availability_request_body import CheckNameAvailabilityRequestBody from .check_name_availability_response_body import CheckNameAvailabilityResponseBody + from .enterprise_channel_check_name_availability_request import EnterpriseChannelCheckNameAvailabilityRequest + from .enterprise_channel_check_name_availability_response import EnterpriseChannelCheckNameAvailabilityResponse + from .enterprise_channel_node import EnterpriseChannelNode + from .enterprise_channel_properties import EnterpriseChannelProperties + from .enterprise_channel import EnterpriseChannel from .bot_paged import BotPaged from .bot_channel_paged import BotChannelPaged from .operation_entity_paged import OperationEntityPaged from .connection_setting_paged import ConnectionSettingPaged +from .enterprise_channel_paged import EnterpriseChannelPaged from .azure_bot_service_enums import ( SkuName, SkuTier, Kind, + EnterpriseChannelState, + EnterpriseChannelNodeState, ChannelName, ) @@ -152,12 +165,20 @@ 'OperationEntity', 'CheckNameAvailabilityRequestBody', 'CheckNameAvailabilityResponseBody', + 'EnterpriseChannelCheckNameAvailabilityRequest', + 'EnterpriseChannelCheckNameAvailabilityResponse', + 'EnterpriseChannelNode', + 'EnterpriseChannelProperties', + 'EnterpriseChannel', 'BotPaged', 'BotChannelPaged', 'OperationEntityPaged', 'ConnectionSettingPaged', + 'EnterpriseChannelPaged', 'SkuName', 'SkuTier', 'Kind', + 'EnterpriseChannelState', + 'EnterpriseChannelNodeState', 'ChannelName', ] diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py index 5e38bd762700..4c195bfc0f8f 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py @@ -32,6 +32,34 @@ class Kind(str, Enum): function = "function" +class EnterpriseChannelState(str, Enum): + + creating = "Creating" + create_failed = "CreateFailed" + started = "Started" + starting = "Starting" + start_failed = "StartFailed" + stopped = "Stopped" + stopping = "Stopping" + stop_failed = "StopFailed" + deleting = "Deleting" + delete_failed = "DeleteFailed" + + +class EnterpriseChannelNodeState(str, Enum): + + creating = "Creating" + create_failed = "CreateFailed" + started = "Started" + starting = "Starting" + start_failed = "StartFailed" + stopped = "Stopped" + stopping = "Stopping" + stop_failed = "StopFailed" + deleting = "Deleting" + delete_failed = "DeleteFailed" + + class ChannelName(str, Enum): facebook_channel = "FacebookChannel" diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py index 402594c1d43c..2cf60241c4ce 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py @@ -31,14 +31,20 @@ class DirectLineSite(Model): Channel List API, otherwise empty. :vartype key2: str :param is_enabled: Required. Whether this site is enabled for DirectLine - channel + channel. :type is_enabled: bool :param is_v1_enabled: Required. Whether this site is enabled for Bot - Framework V1 protocol + Framework V1 protocol. :type is_v1_enabled: bool :param is_v3_enabled: Required. Whether this site is enabled for Bot - Framework V1 protocol + Framework V1 protocol. :type is_v3_enabled: bool + :param is_secure_site_enabled: Whether this site is enabled for + authentication with Bot Framework. + :type is_secure_site_enabled: bool + :param trusted_origins: List of Trusted Origin URLs for this site. This + field is applicable only if isSecureSiteEnabled is True. + :type trusted_origins: list[str] """ _validation = { @@ -59,6 +65,8 @@ class DirectLineSite(Model): 'is_enabled': {'key': 'isEnabled', 'type': 'bool'}, 'is_v1_enabled': {'key': 'isV1Enabled', 'type': 'bool'}, 'is_v3_enabled': {'key': 'isV3Enabled', 'type': 'bool'}, + 'is_secure_site_enabled': {'key': 'isSecureSiteEnabled', 'type': 'bool'}, + 'trusted_origins': {'key': 'trustedOrigins', 'type': '[str]'}, } def __init__(self, **kwargs): @@ -70,3 +78,5 @@ def __init__(self, **kwargs): self.is_enabled = kwargs.get('is_enabled', None) self.is_v1_enabled = kwargs.get('is_v1_enabled', None) self.is_v3_enabled = kwargs.get('is_v3_enabled', None) + self.is_secure_site_enabled = kwargs.get('is_secure_site_enabled', None) + self.trusted_origins = kwargs.get('trusted_origins', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py index d73e6d401e53..fc037c203af8 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py @@ -31,14 +31,20 @@ class DirectLineSite(Model): Channel List API, otherwise empty. :vartype key2: str :param is_enabled: Required. Whether this site is enabled for DirectLine - channel + channel. :type is_enabled: bool :param is_v1_enabled: Required. Whether this site is enabled for Bot - Framework V1 protocol + Framework V1 protocol. :type is_v1_enabled: bool :param is_v3_enabled: Required. Whether this site is enabled for Bot - Framework V1 protocol + Framework V1 protocol. :type is_v3_enabled: bool + :param is_secure_site_enabled: Whether this site is enabled for + authentication with Bot Framework. + :type is_secure_site_enabled: bool + :param trusted_origins: List of Trusted Origin URLs for this site. This + field is applicable only if isSecureSiteEnabled is True. + :type trusted_origins: list[str] """ _validation = { @@ -59,9 +65,11 @@ class DirectLineSite(Model): 'is_enabled': {'key': 'isEnabled', 'type': 'bool'}, 'is_v1_enabled': {'key': 'isV1Enabled', 'type': 'bool'}, 'is_v3_enabled': {'key': 'isV3Enabled', 'type': 'bool'}, + 'is_secure_site_enabled': {'key': 'isSecureSiteEnabled', 'type': 'bool'}, + 'trusted_origins': {'key': 'trustedOrigins', 'type': '[str]'}, } - def __init__(self, *, site_name: str, is_enabled: bool, is_v1_enabled: bool, is_v3_enabled: bool, **kwargs) -> None: + def __init__(self, *, site_name: str, is_enabled: bool, is_v1_enabled: bool, is_v3_enabled: bool, is_secure_site_enabled: bool=None, trusted_origins=None, **kwargs) -> None: super(DirectLineSite, self).__init__(**kwargs) self.site_id = None self.site_name = site_name @@ -70,3 +78,5 @@ def __init__(self, *, site_name: str, is_enabled: bool, is_v1_enabled: bool, is_ self.is_enabled = is_enabled self.is_v1_enabled = is_v1_enabled self.is_v3_enabled = is_v3_enabled + self.is_secure_site_enabled = is_secure_site_enabled + self.trusted_origins = trusted_origins diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py new file mode 100644 index 000000000000..82ace9ff145b --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py @@ -0,0 +1,64 @@ +# 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 .resource import Resource + + +class EnterpriseChannel(Resource): + """Enterprise Channel resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar id: Specifies the resource ID. + :vartype id: str + :ivar name: Specifies the name of the resource. + :vartype name: str + :param location: Specifies the location of the resource. + :type location: str + :ivar type: Specifies the type of the resource. + :vartype type: str + :param tags: Contains resource tags defined as key/value pairs. + :type tags: dict[str, str] + :param sku: Gets or sets the SKU of the resource. + :type sku: ~azure.mgmt.botservice.models.Sku + :param kind: Required. Gets or sets the Kind of the resource. Possible + values include: 'sdk', 'designer', 'bot', 'function' + :type kind: str or ~azure.mgmt.botservice.models.Kind + :param etag: Entity Tag + :type etag: str + :param properties: The set of properties specific to an Enterprise Channel + resource. + :type properties: + ~azure.mgmt.botservice.models.EnterpriseChannelProperties + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'EnterpriseChannelProperties'}, + } + + def __init__(self, **kwargs): + super(EnterpriseChannel, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py new file mode 100644 index 000000000000..01499b6d32b3 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py @@ -0,0 +1,30 @@ +# 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 EnterpriseChannelCheckNameAvailabilityRequest(Model): + """A request to Bot Service Management to check availability of an Enterprise + Channel name. + + :param name: The name of the Enterprise Channel for which availability + needs to be checked. + :type name: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(EnterpriseChannelCheckNameAvailabilityRequest, self).__init__(**kwargs) + self.name = kwargs.get('name', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py new file mode 100644 index 000000000000..996cf96c1ee9 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py @@ -0,0 +1,30 @@ +# 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 EnterpriseChannelCheckNameAvailabilityRequest(Model): + """A request to Bot Service Management to check availability of an Enterprise + Channel name. + + :param name: The name of the Enterprise Channel for which availability + needs to be checked. + :type name: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, **kwargs) -> None: + super(EnterpriseChannelCheckNameAvailabilityRequest, self).__init__(**kwargs) + self.name = name diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py new file mode 100644 index 000000000000..2c063c6f37fc --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py @@ -0,0 +1,34 @@ +# 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 EnterpriseChannelCheckNameAvailabilityResponse(Model): + """A request to Bot Service Management to check availability of an Enterprise + Channel name. + + :param valid: Indicates if the Enterprise Channel name is valid. + :type valid: bool + :param message: Additional information about why a bot name is not + available. + :type message: str + """ + + _attribute_map = { + 'valid': {'key': 'valid', 'type': 'bool'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(EnterpriseChannelCheckNameAvailabilityResponse, self).__init__(**kwargs) + self.valid = kwargs.get('valid', None) + self.message = kwargs.get('message', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py new file mode 100644 index 000000000000..d23be097c57c --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py @@ -0,0 +1,34 @@ +# 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 EnterpriseChannelCheckNameAvailabilityResponse(Model): + """A request to Bot Service Management to check availability of an Enterprise + Channel name. + + :param valid: Indicates if the Enterprise Channel name is valid. + :type valid: bool + :param message: Additional information about why a bot name is not + available. + :type message: str + """ + + _attribute_map = { + 'valid': {'key': 'valid', 'type': 'bool'}, + 'message': {'key': 'message', 'type': 'str'}, + } + + def __init__(self, *, valid: bool=None, message: str=None, **kwargs) -> None: + super(EnterpriseChannelCheckNameAvailabilityResponse, self).__init__(**kwargs) + self.valid = valid + self.message = message diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py new file mode 100644 index 000000000000..44b4bd2578b1 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py @@ -0,0 +1,62 @@ +# 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 EnterpriseChannelNode(Model): + """The properties specific to an Enterprise Channel Node. + + 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 id: Id of Enterprise Channel Node. This is generated by the Bot + Framework. + :vartype id: str + :param state: The current state of the Enterprise Channel Node. Possible + values include: 'Creating', 'CreateFailed', 'Started', 'Starting', + 'StartFailed', 'Stopped', 'Stopping', 'StopFailed', 'Deleting', + 'DeleteFailed' + :type state: str or + ~azure.mgmt.botservice.models.EnterpriseChannelNodeState + :param name: Required. The name of the Enterprise Channel Node. + :type name: str + :param azure_sku: Required. The sku of the Enterprise Channel Node. + :type azure_sku: str + :param azure_location: Required. The location of the Enterprise Channel + Node. + :type azure_location: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'required': True}, + 'azure_sku': {'required': True}, + 'azure_location': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'azure_sku': {'key': 'azureSku', 'type': 'str'}, + 'azure_location': {'key': 'azureLocation', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(EnterpriseChannelNode, self).__init__(**kwargs) + self.id = None + self.state = kwargs.get('state', None) + self.name = kwargs.get('name', None) + self.azure_sku = kwargs.get('azure_sku', None) + self.azure_location = kwargs.get('azure_location', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py new file mode 100644 index 000000000000..d43c220b0e04 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py @@ -0,0 +1,62 @@ +# 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 EnterpriseChannelNode(Model): + """The properties specific to an Enterprise Channel Node. + + 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 id: Id of Enterprise Channel Node. This is generated by the Bot + Framework. + :vartype id: str + :param state: The current state of the Enterprise Channel Node. Possible + values include: 'Creating', 'CreateFailed', 'Started', 'Starting', + 'StartFailed', 'Stopped', 'Stopping', 'StopFailed', 'Deleting', + 'DeleteFailed' + :type state: str or + ~azure.mgmt.botservice.models.EnterpriseChannelNodeState + :param name: Required. The name of the Enterprise Channel Node. + :type name: str + :param azure_sku: Required. The sku of the Enterprise Channel Node. + :type azure_sku: str + :param azure_location: Required. The location of the Enterprise Channel + Node. + :type azure_location: str + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'required': True}, + 'azure_sku': {'required': True}, + 'azure_location': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'azure_sku': {'key': 'azureSku', 'type': 'str'}, + 'azure_location': {'key': 'azureLocation', 'type': 'str'}, + } + + def __init__(self, *, name: str, azure_sku: str, azure_location: str, state=None, **kwargs) -> None: + super(EnterpriseChannelNode, self).__init__(**kwargs) + self.id = None + self.state = state + self.name = name + self.azure_sku = azure_sku + self.azure_location = azure_location diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py new file mode 100644 index 000000000000..b54c425b681b --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py @@ -0,0 +1,27 @@ +# 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.paging import Paged + + +class EnterpriseChannelPaged(Paged): + """ + A paging container for iterating over a list of :class:`EnterpriseChannel ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[EnterpriseChannel]'} + } + + def __init__(self, *args, **kwargs): + + super(EnterpriseChannelPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py new file mode 100644 index 000000000000..87802c47dac5 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py @@ -0,0 +1,40 @@ +# 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 EnterpriseChannelProperties(Model): + """The parameters to provide for the Enterprise Channel. + + All required parameters must be populated in order to send to Azure. + + :param state: The current state of the Enterprise Channel. Possible values + include: 'Creating', 'CreateFailed', 'Started', 'Starting', 'StartFailed', + 'Stopped', 'Stopping', 'StopFailed', 'Deleting', 'DeleteFailed' + :type state: str or ~azure.mgmt.botservice.models.EnterpriseChannelState + :param nodes: Required. The nodes associated with the Enterprise Channel. + :type nodes: list[~azure.mgmt.botservice.models.EnterpriseChannelNode] + """ + + _validation = { + 'nodes': {'required': True}, + } + + _attribute_map = { + 'state': {'key': 'state', 'type': 'str'}, + 'nodes': {'key': 'nodes', 'type': '[EnterpriseChannelNode]'}, + } + + def __init__(self, **kwargs): + super(EnterpriseChannelProperties, self).__init__(**kwargs) + self.state = kwargs.get('state', None) + self.nodes = kwargs.get('nodes', None) diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py new file mode 100644 index 000000000000..0093bc6b1d68 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py @@ -0,0 +1,40 @@ +# 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 EnterpriseChannelProperties(Model): + """The parameters to provide for the Enterprise Channel. + + All required parameters must be populated in order to send to Azure. + + :param state: The current state of the Enterprise Channel. Possible values + include: 'Creating', 'CreateFailed', 'Started', 'Starting', 'StartFailed', + 'Stopped', 'Stopping', 'StopFailed', 'Deleting', 'DeleteFailed' + :type state: str or ~azure.mgmt.botservice.models.EnterpriseChannelState + :param nodes: Required. The nodes associated with the Enterprise Channel. + :type nodes: list[~azure.mgmt.botservice.models.EnterpriseChannelNode] + """ + + _validation = { + 'nodes': {'required': True}, + } + + _attribute_map = { + 'state': {'key': 'state', 'type': 'str'}, + 'nodes': {'key': 'nodes', 'type': '[EnterpriseChannelNode]'}, + } + + def __init__(self, *, nodes, state=None, **kwargs) -> None: + super(EnterpriseChannelProperties, self).__init__(**kwargs) + self.state = state + self.nodes = nodes diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py new file mode 100644 index 000000000000..d1b884c6d999 --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py @@ -0,0 +1,64 @@ +# 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 .resource_py3 import Resource + + +class EnterpriseChannel(Resource): + """Enterprise Channel resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar id: Specifies the resource ID. + :vartype id: str + :ivar name: Specifies the name of the resource. + :vartype name: str + :param location: Specifies the location of the resource. + :type location: str + :ivar type: Specifies the type of the resource. + :vartype type: str + :param tags: Contains resource tags defined as key/value pairs. + :type tags: dict[str, str] + :param sku: Gets or sets the SKU of the resource. + :type sku: ~azure.mgmt.botservice.models.Sku + :param kind: Required. Gets or sets the Kind of the resource. Possible + values include: 'sdk', 'designer', 'bot', 'function' + :type kind: str or ~azure.mgmt.botservice.models.Kind + :param etag: Entity Tag + :type etag: str + :param properties: The set of properties specific to an Enterprise Channel + resource. + :type properties: + ~azure.mgmt.botservice.models.EnterpriseChannelProperties + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'sku': {'key': 'sku', 'type': 'Sku'}, + 'kind': {'key': 'kind', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'EnterpriseChannelProperties'}, + } + + def __init__(self, *, location: str=None, tags=None, sku=None, kind=None, etag: str=None, properties=None, **kwargs) -> None: + super(EnterpriseChannel, self).__init__(location=location, tags=tags, sku=sku, kind=kind, etag=etag, **kwargs) + self.properties = properties diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py index c52c36afa15f..42d85b8ebd4a 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py @@ -13,10 +13,12 @@ from .channels_operations import ChannelsOperations from .operations import Operations from .bot_connection_operations import BotConnectionOperations +from .enterprise_channels_operations import EnterpriseChannelsOperations __all__ = [ 'BotsOperations', 'ChannelsOperations', 'Operations', 'BotConnectionOperations', + 'EnterpriseChannelsOperations', ] diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py index b2c010012ba3..d532a6e8e937 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py @@ -22,7 +22,7 @@ class BotConnectionOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2017-12-01. Constant value: "2018-07-12". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-07-12". """ models = models diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py index 824907e3caad..e9041d0cb11a 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py @@ -22,7 +22,7 @@ class BotsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2017-12-01. Constant value: "2018-07-12". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-07-12". """ models = models diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py index 961b8d39f311..036204f3602b 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py @@ -22,7 +22,7 @@ class ChannelsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2017-12-01. Constant value: "2018-07-12". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-07-12". """ models = models diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py new file mode 100644 index 000000000000..9e7190a2a59a --- /dev/null +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py @@ -0,0 +1,535 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class EnterpriseChannelsOperations(object): + """EnterpriseChannelsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-07-12". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-07-12" + + self.config = config + + def check_name_availability( + self, name=None, custom_headers=None, raw=False, **operation_config): + """Check whether an Enterprise Channel name is available. + + :param name: The name of the Enterprise Channel for which availability + needs to be checked. + :type name: str + :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: EnterpriseChannelCheckNameAvailabilityResponse or + ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.botservice.models.EnterpriseChannelCheckNameAvailabilityResponse + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorException` + """ + parameters = models.EnterpriseChannelCheckNameAvailabilityRequest(name=name) + + # Construct URL + url = self.check_name_availability.metadata['url'] + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # 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()) + 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') + + # Construct body + body_content = self._serialize.body(parameters, 'EnterpriseChannelCheckNameAvailabilityRequest') + + # Construct and send request + 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]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('EnterpriseChannelCheckNameAvailabilityResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + check_name_availability.metadata = {'url': '/providers/Microsoft.BotService/checkEnterpriseChannelNameAvailability'} + + def list_by_resource_group( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """Returns all the resources of a particular type belonging to a resource + group. + + :param resource_group_name: The name of the Bot resource group in the + user subscription. + :type resource_group_name: str + :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 EnterpriseChannel + :rtype: + ~azure.mgmt.botservice.models.EnterpriseChannelPaged[~azure.mgmt.botservice.models.EnterpriseChannel] + :raises: + :class:`ErrorException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_resource_group.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + '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') + + # 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]: + raise models.ErrorException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.EnterpriseChannelPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.EnterpriseChannelPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/enterpriseChannels'} + + + def _create_initial( + self, resource_group_name, resource_name, parameters, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.create.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + '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') + + # 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()) + 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') + + # Construct body + body_content = self._serialize.body(parameters, 'EnterpriseChannel') + + # Construct and send request + 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]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('EnterpriseChannel', response) + if response.status_code == 201: + deserialized = self._deserialize('EnterpriseChannel', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def create( + self, resource_group_name, resource_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates an Enterprise Channel. + + :param resource_group_name: The name of the Bot resource group in the + user subscription. + :type resource_group_name: str + :param resource_name: The name of the Bot resource. + :type resource_name: str + :param parameters: The parameters to provide for the new Enterprise + Channel. + :type parameters: ~azure.mgmt.botservice.models.EnterpriseChannel + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns EnterpriseChannel or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.botservice.models.EnterpriseChannel] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.botservice.models.EnterpriseChannel]] + :raises: + :class:`ErrorException` + """ + raw_result = self._create_initial( + resource_group_name=resource_group_name, + resource_name=resource_name, + parameters=parameters, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('EnterpriseChannel', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/enterpriseChannels/{resourceName}'} + + + def _update_initial( + self, resource_group_name, resource_name, location=None, tags=None, sku=None, kind=None, etag=None, properties=None, custom_headers=None, raw=False, **operation_config): + parameters = models.EnterpriseChannel(location=location, tags=tags, sku=sku, kind=kind, etag=etag, properties=properties) + + # Construct URL + url = self.update.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + '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') + + # 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()) + 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') + + # Construct body + body_content = self._serialize.body(parameters, 'EnterpriseChannel') + + # Construct and send request + 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, 201]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('EnterpriseChannel', response) + if response.status_code == 201: + deserialized = self._deserialize('EnterpriseChannel', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def update( + self, resource_group_name, resource_name, location=None, tags=None, sku=None, kind=None, etag=None, properties=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Updates an Enterprise Channel. + + :param resource_group_name: The name of the Bot resource group in the + user subscription. + :type resource_group_name: str + :param resource_name: The name of the Bot resource. + :type resource_name: str + :param location: Specifies the location of the resource. + :type location: str + :param tags: Contains resource tags defined as key/value pairs. + :type tags: dict[str, str] + :param sku: Gets or sets the SKU of the resource. + :type sku: ~azure.mgmt.botservice.models.Sku + :param kind: Required. Gets or sets the Kind of the resource. Possible + values include: 'sdk', 'designer', 'bot', 'function' + :type kind: str or ~azure.mgmt.botservice.models.Kind + :param etag: Entity Tag + :type etag: str + :param properties: The set of properties specific to an Enterprise + Channel resource. + :type properties: + ~azure.mgmt.botservice.models.EnterpriseChannelProperties + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns EnterpriseChannel or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.botservice.models.EnterpriseChannel] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.botservice.models.EnterpriseChannel]] + :raises: + :class:`ErrorException` + """ + raw_result = self._update_initial( + resource_group_name=resource_group_name, + resource_name=resource_name, + location=location, + tags=tags, + sku=sku, + kind=kind, + etag=etag, + properties=properties, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('EnterpriseChannel', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/enterpriseChannels/{resourceName}'} + + + def _delete_initial( + self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + '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') + + # Construct headers + header_parameters = {} + 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') + + # Construct and send request + 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]: + raise models.ErrorException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def delete( + self, resource_group_name, resource_name, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes an Enterprise Channel from the resource group. + + :param resource_group_name: The name of the Bot resource group in the + user subscription. + :type resource_group_name: str + :param resource_name: The name of the Bot resource. + :type resource_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: + :class:`ErrorException` + """ + raw_result = self._delete_initial( + resource_group_name=resource_group_name, + resource_name=resource_name, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/enterpriseChannels/{resourceName}'} + + def get( + self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): + """Returns an Enterprise Channel specified by the parameters. + + :param resource_group_name: The name of the Bot resource group in the + user subscription. + :type resource_group_name: str + :param resource_name: The name of the Bot resource. + :type resource_name: str + :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: EnterpriseChannel or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.botservice.models.EnterpriseChannel or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorException` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=64, min_length=2, pattern=r'^[a-zA-Z0-9][a-zA-Z0-9_.-]*$'), + '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') + + # 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') + + # 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]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('EnterpriseChannel', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/enterpriseChannels/{resourceName}'} diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py b/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py index d0d7a9bd632f..8dc578d119eb 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py @@ -23,7 +23,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Current version is 2017-12-01. Constant value: "2018-07-12". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-07-12". """ models = models diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/version.py b/azure-mgmt-botservice/azure/mgmt/botservice/version.py index 9bd1dfac7ecb..3e682bbd5fb1 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/version.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "0.3.0" From e14b2b4e2e22ce70ef9d9a07a06e9409d69e8d84 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 26 Sep 2018 08:58:00 -0700 Subject: [PATCH 3/8] [AutoPR botservice/resource-manager] Add Bot Framework Enterprise Channel resources. (#3151) * Generated from 242277f723ec49847ee1666f113056dee3f117e6 Merge branch 'bfec' of https://github.com/NickEricson/azure-rest-api-specs into bfec * Generated from e4a6e8546af950eee5b39c834a8e5657be2ee56c Make state an Enum. * Generated from 825f509a6f45d6e548414c1d135e2e39ac71bc78 Fix some descriptions. * Generated from 4e4ecaf8cccc999c5e9ecf02fa8779615a7a6eb5 Change enum on channel and node so they don't create the same enum. * Generated from 4bfd8706e2e07906118b482136a2a9ae554d1433 Using full name for enum instead of shorter name. * Generated from 7ade32d7a13a019af2788298337810e27c96df3e Update py package-version to 0.3.0 From 2dedf9efec819dc619c768ac526f88a594d34a2d Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 30 Nov 2018 10:55:26 -0800 Subject: [PATCH 4/8] [AutoPR botservice/resource-manager] typo: Microsoft.BotService (#3906) * Generated from 77075e9baa504c1b4b206ee925823c3b7589cecf typo: Microsoft.BotService - Diplay -> Display * Packaging update of azure-mgmt-botservice --- azure-mgmt-botservice/MANIFEST.in | 4 +- azure-mgmt-botservice/azure/__init__.py | 2 +- azure-mgmt-botservice/azure/mgmt/__init__.py | 2 +- .../models/service_provider_properties.py | 8 +-- .../models/service_provider_properties_py3.py | 8 +-- azure-mgmt-botservice/azure_bdist_wheel.py | 54 ------------------- azure-mgmt-botservice/setup.cfg | 1 - azure-mgmt-botservice/setup.py | 17 +++--- 8 files changed, 22 insertions(+), 74 deletions(-) delete mode 100644 azure-mgmt-botservice/azure_bdist_wheel.py diff --git a/azure-mgmt-botservice/MANIFEST.in b/azure-mgmt-botservice/MANIFEST.in index 9ecaeb15de50..6ceb27f7a96e 100644 --- a/azure-mgmt-botservice/MANIFEST.in +++ b/azure-mgmt-botservice/MANIFEST.in @@ -1,2 +1,4 @@ include *.rst -include azure_bdist_wheel.py \ No newline at end of file +include azure/__init__.py +include azure/mgmt/__init__.py + diff --git a/azure-mgmt-botservice/azure/__init__.py b/azure-mgmt-botservice/azure/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-botservice/azure/__init__.py +++ b/azure-mgmt-botservice/azure/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-botservice/azure/mgmt/__init__.py b/azure-mgmt-botservice/azure/mgmt/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-botservice/azure/mgmt/__init__.py +++ b/azure-mgmt-botservice/azure/mgmt/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py index 4062224d5c7d..7a60abb7fb29 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py @@ -20,13 +20,13 @@ class ServiceProviderProperties(Model): :ivar id: Id for Service Provider :vartype id: str - :ivar display_name: Diplay Name of the Service Provider + :ivar display_name: Display Name of the Service Provider :vartype display_name: str - :ivar service_provider_name: Diplay Name of the Service Provider + :ivar service_provider_name: Display Name of the Service Provider :vartype service_provider_name: str - :ivar dev_portal_url: Diplay Name of the Service Provider + :ivar dev_portal_url: Display Name of the Service Provider :vartype dev_portal_url: str - :ivar icon_url: Diplay Name of the Service Provider + :ivar icon_url: Display Name of the Service Provider :vartype icon_url: str :param parameters: The list of parameters for the Service Provider :type parameters: diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py b/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py index 7272cb31422f..92cf605eb362 100644 --- a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py +++ b/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py @@ -20,13 +20,13 @@ class ServiceProviderProperties(Model): :ivar id: Id for Service Provider :vartype id: str - :ivar display_name: Diplay Name of the Service Provider + :ivar display_name: Display Name of the Service Provider :vartype display_name: str - :ivar service_provider_name: Diplay Name of the Service Provider + :ivar service_provider_name: Display Name of the Service Provider :vartype service_provider_name: str - :ivar dev_portal_url: Diplay Name of the Service Provider + :ivar dev_portal_url: Display Name of the Service Provider :vartype dev_portal_url: str - :ivar icon_url: Diplay Name of the Service Provider + :ivar icon_url: Display Name of the Service Provider :vartype icon_url: str :param parameters: The list of parameters for the Service Provider :type parameters: diff --git a/azure-mgmt-botservice/azure_bdist_wheel.py b/azure-mgmt-botservice/azure_bdist_wheel.py deleted file mode 100644 index 8a81d1b61775..000000000000 --- a/azure-mgmt-botservice/azure_bdist_wheel.py +++ /dev/null @@ -1,54 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -#-------------------------------------------------------------------------- - -from distutils import log as logger -import os.path - -from wheel.bdist_wheel import bdist_wheel -class azure_bdist_wheel(bdist_wheel): - """The purpose of this class is to build wheel a little differently than the sdist, - without requiring to build the wheel from the sdist (i.e. you can build the wheel - directly from source). - """ - - description = "Create an Azure wheel distribution" - - user_options = bdist_wheel.user_options + \ - [('azure-namespace-package=', None, - "Name of the deepest nspkg used")] - - def initialize_options(self): - bdist_wheel.initialize_options(self) - self.azure_namespace_package = None - - def finalize_options(self): - bdist_wheel.finalize_options(self) - if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): - raise ValueError("azure_namespace_package must finish by -nspkg") - - def run(self): - if not self.distribution.install_requires: - self.distribution.install_requires = [] - self.distribution.install_requires.append( - "{}>=2.0.0".format(self.azure_namespace_package)) - bdist_wheel.run(self) - - def write_record(self, bdist_dir, distinfo_dir): - if self.azure_namespace_package: - # Split and remove last part, assuming it's "nspkg" - subparts = self.azure_namespace_package.split('-')[0:-1] - folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] - for azure_sub_package in folder_with_init: - init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') - if os.path.isfile(init_file): - logger.info("manually remove {} while building the wheel".format(init_file)) - os.remove(init_file) - else: - raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) - bdist_wheel.write_record(self, bdist_dir, distinfo_dir) -cmdclass = { - 'bdist_wheel': azure_bdist_wheel, -} diff --git a/azure-mgmt-botservice/setup.cfg b/azure-mgmt-botservice/setup.cfg index 856f4164982c..3c6e79cf31da 100644 --- a/azure-mgmt-botservice/setup.cfg +++ b/azure-mgmt-botservice/setup.cfg @@ -1,3 +1,2 @@ [bdist_wheel] universal=1 -azure-namespace-package=azure-mgmt-nspkg \ No newline at end of file diff --git a/azure-mgmt-botservice/setup.py b/azure-mgmt-botservice/setup.py index 55d4f7b6312e..872ed3e7cb2b 100644 --- a/azure-mgmt-botservice/setup.py +++ b/azure-mgmt-botservice/setup.py @@ -10,12 +10,6 @@ import os.path from io import open from setuptools import find_packages, setup -try: - from azure_bdist_wheel import cmdclass -except ImportError: - from distutils import log as logger - logger.warn("Wheel is not available, disabling bdist_wheel hook") - cmdclass = {} # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-mgmt-botservice" @@ -76,11 +70,18 @@ 'License :: OSI Approved :: MIT License', ], zip_safe=False, - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=[ + 'tests', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + 'azure.mgmt', + ]), install_requires=[ 'msrest>=0.5.0', 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], - cmdclass=cmdclass + extras_require={ + ":python_version<'3.0'": ['azure-mgmt-nspkg'], + } ) From 5c15e10426ef1bebd1ae4986c4b1969b3d913838 Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Wed, 27 Feb 2019 00:15:41 +0000 Subject: [PATCH 5/8] Packaging update of azure-mgmt-botservice --- azure-mgmt-botservice/MANIFEST.in | 1 + azure-mgmt-botservice/README.rst | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/azure-mgmt-botservice/MANIFEST.in b/azure-mgmt-botservice/MANIFEST.in index ac87972df424..6ceb27f7a96e 100644 --- a/azure-mgmt-botservice/MANIFEST.in +++ b/azure-mgmt-botservice/MANIFEST.in @@ -1,3 +1,4 @@ include *.rst include azure/__init__.py include azure/mgmt/__init__.py + diff --git a/azure-mgmt-botservice/README.rst b/azure-mgmt-botservice/README.rst index cb807305b3e8..b79e23e244ad 100644 --- a/azure-mgmt-botservice/README.rst +++ b/azure-mgmt-botservice/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 ===== From 183dade370a051ba2fa21ef46b6547282a2d0786 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 21 May 2019 10:54:56 -0700 Subject: [PATCH 6/8] Move BotService to SDK folder --- azure-mgmt-botservice/dev_requirements.txt | 1 - .../botservice/azure-mgmt-botservice}/HISTORY.rst | 0 .../botservice/azure-mgmt-botservice}/MANIFEST.in | 0 .../botservice/azure-mgmt-botservice}/README.rst | 0 .../botservice/azure-mgmt-botservice}/azure/__init__.py | 0 .../botservice/azure-mgmt-botservice}/azure/mgmt/__init__.py | 0 .../azure-mgmt-botservice}/azure/mgmt/botservice/__init__.py | 0 .../azure/mgmt/botservice/azure_bot_service.py | 0 .../azure/mgmt/botservice/models/__init__.py | 0 .../azure/mgmt/botservice/models/azure_bot_service_enums.py | 0 .../azure-mgmt-botservice}/azure/mgmt/botservice/models/bot.py | 0 .../azure/mgmt/botservice/models/bot_channel.py | 0 .../azure/mgmt/botservice/models/bot_channel_paged.py | 0 .../azure/mgmt/botservice/models/bot_channel_py3.py | 0 .../azure/mgmt/botservice/models/bot_paged.py | 0 .../azure/mgmt/botservice/models/bot_properties.py | 0 .../azure/mgmt/botservice/models/bot_properties_py3.py | 0 .../azure/mgmt/botservice/models/bot_py3.py | 0 .../azure/mgmt/botservice/models/channel.py | 0 .../azure/mgmt/botservice/models/channel_py3.py | 0 .../botservice/models/check_name_availability_request_body.py | 0 .../models/check_name_availability_request_body_py3.py | 0 .../botservice/models/check_name_availability_response_body.py | 0 .../models/check_name_availability_response_body_py3.py | 0 .../azure/mgmt/botservice/models/connection_item_name.py | 0 .../azure/mgmt/botservice/models/connection_item_name_py3.py | 0 .../azure/mgmt/botservice/models/connection_setting.py | 0 .../azure/mgmt/botservice/models/connection_setting_paged.py | 0 .../azure/mgmt/botservice/models/connection_setting_parameter.py | 0 .../mgmt/botservice/models/connection_setting_parameter_py3.py | 0 .../mgmt/botservice/models/connection_setting_properties.py | 0 .../mgmt/botservice/models/connection_setting_properties_py3.py | 0 .../azure/mgmt/botservice/models/connection_setting_py3.py | 0 .../azure/mgmt/botservice/models/direct_line_channel.py | 0 .../mgmt/botservice/models/direct_line_channel_properties.py | 0 .../mgmt/botservice/models/direct_line_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/direct_line_channel_py3.py | 0 .../azure/mgmt/botservice/models/direct_line_site.py | 0 .../azure/mgmt/botservice/models/direct_line_site_py3.py | 0 .../azure/mgmt/botservice/models/email_channel.py | 0 .../azure/mgmt/botservice/models/email_channel_properties.py | 0 .../azure/mgmt/botservice/models/email_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/email_channel_py3.py | 0 .../azure/mgmt/botservice/models/enterprise_channel.py | 0 .../models/enterprise_channel_check_name_availability_request.py | 0 .../enterprise_channel_check_name_availability_request_py3.py | 0 .../enterprise_channel_check_name_availability_response.py | 0 .../enterprise_channel_check_name_availability_response_py3.py | 0 .../azure/mgmt/botservice/models/enterprise_channel_node.py | 0 .../azure/mgmt/botservice/models/enterprise_channel_node_py3.py | 0 .../azure/mgmt/botservice/models/enterprise_channel_paged.py | 0 .../mgmt/botservice/models/enterprise_channel_properties.py | 0 .../mgmt/botservice/models/enterprise_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/enterprise_channel_py3.py | 0 .../azure-mgmt-botservice}/azure/mgmt/botservice/models/error.py | 0 .../azure/mgmt/botservice/models/error_body.py | 0 .../azure/mgmt/botservice/models/error_body_py3.py | 0 .../azure/mgmt/botservice/models/error_py3.py | 0 .../azure/mgmt/botservice/models/facebook_channel.py | 0 .../azure/mgmt/botservice/models/facebook_channel_properties.py | 0 .../mgmt/botservice/models/facebook_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/facebook_channel_py3.py | 0 .../azure/mgmt/botservice/models/facebook_page.py | 0 .../azure/mgmt/botservice/models/facebook_page_py3.py | 0 .../azure/mgmt/botservice/models/kik_channel.py | 0 .../azure/mgmt/botservice/models/kik_channel_properties.py | 0 .../azure/mgmt/botservice/models/kik_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/kik_channel_py3.py | 0 .../azure/mgmt/botservice/models/ms_teams_channel.py | 0 .../azure/mgmt/botservice/models/ms_teams_channel_properties.py | 0 .../mgmt/botservice/models/ms_teams_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/ms_teams_channel_py3.py | 0 .../azure/mgmt/botservice/models/operation_display_info.py | 0 .../azure/mgmt/botservice/models/operation_display_info_py3.py | 0 .../azure/mgmt/botservice/models/operation_entity.py | 0 .../azure/mgmt/botservice/models/operation_entity_paged.py | 0 .../azure/mgmt/botservice/models/operation_entity_py3.py | 0 .../azure/mgmt/botservice/models/resource.py | 0 .../azure/mgmt/botservice/models/resource_py3.py | 0 .../azure/mgmt/botservice/models/service_provider.py | 0 .../azure/mgmt/botservice/models/service_provider_parameter.py | 0 .../mgmt/botservice/models/service_provider_parameter_py3.py | 0 .../azure/mgmt/botservice/models/service_provider_properties.py | 0 .../mgmt/botservice/models/service_provider_properties_py3.py | 0 .../azure/mgmt/botservice/models/service_provider_py3.py | 0 .../mgmt/botservice/models/service_provider_response_list.py | 0 .../mgmt/botservice/models/service_provider_response_list_py3.py | 0 .../azure-mgmt-botservice}/azure/mgmt/botservice/models/sku.py | 0 .../azure/mgmt/botservice/models/sku_py3.py | 0 .../azure/mgmt/botservice/models/skype_channel.py | 0 .../azure/mgmt/botservice/models/skype_channel_properties.py | 0 .../azure/mgmt/botservice/models/skype_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/skype_channel_py3.py | 0 .../azure/mgmt/botservice/models/slack_channel.py | 0 .../azure/mgmt/botservice/models/slack_channel_properties.py | 0 .../azure/mgmt/botservice/models/slack_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/slack_channel_py3.py | 0 .../azure/mgmt/botservice/models/sms_channel.py | 0 .../azure/mgmt/botservice/models/sms_channel_properties.py | 0 .../azure/mgmt/botservice/models/sms_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/sms_channel_py3.py | 0 .../azure/mgmt/botservice/models/telegram_channel.py | 0 .../azure/mgmt/botservice/models/telegram_channel_properties.py | 0 .../mgmt/botservice/models/telegram_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/telegram_channel_py3.py | 0 .../azure/mgmt/botservice/models/web_chat_channel.py | 0 .../azure/mgmt/botservice/models/web_chat_channel_properties.py | 0 .../mgmt/botservice/models/web_chat_channel_properties_py3.py | 0 .../azure/mgmt/botservice/models/web_chat_channel_py3.py | 0 .../azure/mgmt/botservice/models/web_chat_site.py | 0 .../azure/mgmt/botservice/models/web_chat_site_py3.py | 0 .../azure/mgmt/botservice/operations/__init__.py | 0 .../mgmt/botservice/operations/bot_connection_operations.py | 0 .../azure/mgmt/botservice/operations/bots_operations.py | 0 .../azure/mgmt/botservice/operations/channels_operations.py | 0 .../mgmt/botservice/operations/enterprise_channels_operations.py | 0 .../azure/mgmt/botservice/operations/operations.py | 0 .../azure-mgmt-botservice}/azure/mgmt/botservice/version.py | 0 sdk/botservice/azure-mgmt-botservice/dev_requirements.txt | 1 + .../botservice/azure-mgmt-botservice}/sdk_packaging.toml | 0 .../botservice/azure-mgmt-botservice}/setup.cfg | 0 .../botservice/azure-mgmt-botservice}/setup.py | 0 .../test_mgmt_botservice_channels.test_directline_channel.yaml | 0 .../test_mgmt_botservice_channels.test_email_channel.yaml | 0 .../test_mgmt_botservice_channels.test_msteams_channel.yaml | 0 .../test_mgmt_botservice_channels.test_skype_channel.yaml | 0 .../test_mgmt_botservice_channels.test_sms_channel.yaml | 0 .../test_mgmt_botservice_channels.test_telegram_channel.yaml | 0 ...mt_botservice_connections.test_bot_connection_operations.yaml | 0 ...service_connections.test_bot_connection_serviceproviders.yaml | 0 .../test_mgmt_botservice_crud.test_bot_operations.yaml | 0 .../tests/test_mgmt_botservice_channels.py | 0 .../tests/test_mgmt_botservice_connections.py | 0 .../azure-mgmt-botservice}/tests/test_mgmt_botservice_crud.py | 0 134 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 azure-mgmt-botservice/dev_requirements.txt rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/HISTORY.rst (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/MANIFEST.in (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/README.rst (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/__init__.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/__init__.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/__init__.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/azure_bot_service.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/__init__.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/azure_bot_service_enums.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_channel_paged.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_paged.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/bot_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/check_name_availability_request_body.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/check_name_availability_request_body_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/check_name_availability_response_body.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/check_name_availability_response_body_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_item_name.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_item_name_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_paged.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_parameter.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_parameter_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/connection_setting_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_site.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/direct_line_site_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/email_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/email_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/email_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/email_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_node.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_node_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_paged.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/enterprise_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/error.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/error_body.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/error_body_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/error_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_page.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/facebook_page_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/kik_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/kik_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/kik_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/kik_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/ms_teams_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/ms_teams_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/ms_teams_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/operation_display_info.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/operation_display_info_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/operation_entity.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/operation_entity_paged.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/operation_entity_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/resource.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/resource_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_parameter.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_parameter_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_response_list.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/service_provider_response_list_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sku.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sku_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/skype_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/skype_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/skype_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/skype_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/slack_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/slack_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/slack_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/slack_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sms_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sms_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sms_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/sms_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/telegram_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/telegram_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/telegram_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/telegram_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_channel.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_channel_properties.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_channel_properties_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_channel_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_site.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/models/web_chat_site_py3.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/__init__.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/bot_connection_operations.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/bots_operations.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/channels_operations.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/enterprise_channels_operations.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/operations/operations.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/azure/mgmt/botservice/version.py (100%) create mode 100644 sdk/botservice/azure-mgmt-botservice/dev_requirements.txt rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/sdk_packaging.toml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/setup.cfg (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/setup.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_directline_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_email_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_msteams_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_skype_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_sms_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_channels.test_telegram_channel.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_operations.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_serviceproviders.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/recordings/test_mgmt_botservice_crud.test_bot_operations.yaml (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/test_mgmt_botservice_channels.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/test_mgmt_botservice_connections.py (100%) rename {azure-mgmt-botservice => sdk/botservice/azure-mgmt-botservice}/tests/test_mgmt_botservice_crud.py (100%) diff --git a/azure-mgmt-botservice/dev_requirements.txt b/azure-mgmt-botservice/dev_requirements.txt deleted file mode 100644 index 331cfed8ea26..000000000000 --- a/azure-mgmt-botservice/dev_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e ../azure-sdk-tools diff --git a/azure-mgmt-botservice/HISTORY.rst b/sdk/botservice/azure-mgmt-botservice/HISTORY.rst similarity index 100% rename from azure-mgmt-botservice/HISTORY.rst rename to sdk/botservice/azure-mgmt-botservice/HISTORY.rst diff --git a/azure-mgmt-botservice/MANIFEST.in b/sdk/botservice/azure-mgmt-botservice/MANIFEST.in similarity index 100% rename from azure-mgmt-botservice/MANIFEST.in rename to sdk/botservice/azure-mgmt-botservice/MANIFEST.in diff --git a/azure-mgmt-botservice/README.rst b/sdk/botservice/azure-mgmt-botservice/README.rst similarity index 100% rename from azure-mgmt-botservice/README.rst rename to sdk/botservice/azure-mgmt-botservice/README.rst diff --git a/azure-mgmt-botservice/azure/__init__.py b/sdk/botservice/azure-mgmt-botservice/azure/__init__.py similarity index 100% rename from azure-mgmt-botservice/azure/__init__.py rename to sdk/botservice/azure-mgmt-botservice/azure/__init__.py diff --git a/azure-mgmt-botservice/azure/mgmt/__init__.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/__init__.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/__init__.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/__init__.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/__init__.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/__init__.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/__init__.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/__init__.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/__init__.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/azure_bot_service_enums.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_paged.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_paged.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_paged.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_paged.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_paged.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_paged.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_paged.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_paged.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/bot_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/bot_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_request_body_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/check_name_availability_response_body_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_item_name_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_paged.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_paged.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_paged.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_paged.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_parameter_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/connection_setting_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/direct_line_site_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/email_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_request_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_check_name_availability_response_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_node_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_paged.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/enterprise_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/error.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/error.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/error_body.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/error_body_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_body_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/error_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/error_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/error_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/facebook_page_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/kik_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_display_info_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_paged.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_paged.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_paged.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_paged.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/operation_entity_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/resource.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/resource.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/resource.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/resource.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/resource_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/resource_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/resource_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/resource_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_parameter_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/service_provider_response_list_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sku.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sku.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sku.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sku.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sku_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sku_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sku_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sku_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/skype_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/slack_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/sms_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/telegram_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_properties_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_channel_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site_py3.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site_py3.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site_py3.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/models/web_chat_site_py3.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/__init__.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/bot_connection_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/bots_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/channels_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/enterprise_channels_operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/operations/operations.py diff --git a/azure-mgmt-botservice/azure/mgmt/botservice/version.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py similarity index 100% rename from azure-mgmt-botservice/azure/mgmt/botservice/version.py rename to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py diff --git a/sdk/botservice/azure-mgmt-botservice/dev_requirements.txt b/sdk/botservice/azure-mgmt-botservice/dev_requirements.txt new file mode 100644 index 000000000000..1f0e0d86b735 --- /dev/null +++ b/sdk/botservice/azure-mgmt-botservice/dev_requirements.txt @@ -0,0 +1 @@ +-e ../../../azure-sdk-tools diff --git a/azure-mgmt-botservice/sdk_packaging.toml b/sdk/botservice/azure-mgmt-botservice/sdk_packaging.toml similarity index 100% rename from azure-mgmt-botservice/sdk_packaging.toml rename to sdk/botservice/azure-mgmt-botservice/sdk_packaging.toml diff --git a/azure-mgmt-botservice/setup.cfg b/sdk/botservice/azure-mgmt-botservice/setup.cfg similarity index 100% rename from azure-mgmt-botservice/setup.cfg rename to sdk/botservice/azure-mgmt-botservice/setup.cfg diff --git a/azure-mgmt-botservice/setup.py b/sdk/botservice/azure-mgmt-botservice/setup.py similarity index 100% rename from azure-mgmt-botservice/setup.py rename to sdk/botservice/azure-mgmt-botservice/setup.py diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_directline_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_directline_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_directline_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_directline_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_email_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_email_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_email_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_email_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_msteams_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_msteams_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_msteams_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_msteams_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_skype_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_skype_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_skype_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_skype_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_sms_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_sms_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_sms_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_sms_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_telegram_channel.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_telegram_channel.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_telegram_channel.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_channels.test_telegram_channel.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_operations.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_operations.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_operations.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_operations.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_serviceproviders.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_serviceproviders.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_serviceproviders.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_connections.test_bot_connection_serviceproviders.yaml diff --git a/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_crud.test_bot_operations.yaml b/sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_crud.test_bot_operations.yaml similarity index 100% rename from azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_crud.test_bot_operations.yaml rename to sdk/botservice/azure-mgmt-botservice/tests/recordings/test_mgmt_botservice_crud.test_bot_operations.yaml diff --git a/azure-mgmt-botservice/tests/test_mgmt_botservice_channels.py b/sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_channels.py similarity index 100% rename from azure-mgmt-botservice/tests/test_mgmt_botservice_channels.py rename to sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_channels.py diff --git a/azure-mgmt-botservice/tests/test_mgmt_botservice_connections.py b/sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_connections.py similarity index 100% rename from azure-mgmt-botservice/tests/test_mgmt_botservice_connections.py rename to sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_connections.py diff --git a/azure-mgmt-botservice/tests/test_mgmt_botservice_crud.py b/sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_crud.py similarity index 100% rename from azure-mgmt-botservice/tests/test_mgmt_botservice_crud.py rename to sdk/botservice/azure-mgmt-botservice/tests/test_mgmt_botservice_crud.py From 328219d584b24302de604781a6852ac88fde36d3 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 21 May 2019 18:00:40 +0000 Subject: [PATCH 7/8] Packaging update of azure-mgmt-botservice --- sdk/botservice/azure-mgmt-botservice/MANIFEST.in | 1 + sdk/botservice/azure-mgmt-botservice/setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/botservice/azure-mgmt-botservice/MANIFEST.in b/sdk/botservice/azure-mgmt-botservice/MANIFEST.in index 6ceb27f7a96e..e4884efef41b 100644 --- a/sdk/botservice/azure-mgmt-botservice/MANIFEST.in +++ b/sdk/botservice/azure-mgmt-botservice/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/sdk/botservice/azure-mgmt-botservice/setup.py b/sdk/botservice/azure-mgmt-botservice/setup.py index 872ed3e7cb2b..0a125353ea82 100644 --- a/sdk/botservice/azure-mgmt-botservice/setup.py +++ b/sdk/botservice/azure-mgmt-botservice/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', From 6167a832703f5cde7179450d27202455fe00352b Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 21 May 2019 11:01:25 -0700 Subject: [PATCH 8/8] Generated from 434b84450e2162b2f5b7e328846adf160fe6e3cc (#5378) BotService SDK folder --- .../azure-mgmt-botservice/azure/mgmt/botservice/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py index 3e682bbd5fb1..9bd1dfac7ecb 100644 --- a/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py +++ b/sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.3.0" +VERSION = "0.2.0"