[AutoPR botservice/resource-manager] BotService Preview: new API version for MsTeams and CheckNameavailability

azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py

@@ -82,7 +82,7 @@ def __init__(
         super(AzureBotService, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2017-12-01'
+        self.api_version = '2018-07-12'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties.py

@@ -17,16 +17,10 @@ class MsTeamsChannelProperties(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param enable_messaging: Enable messaging for Microsoft Teams channel
-    :type enable_messaging: bool
-    :param enable_media_cards: Enable media cards for Microsoft Teams channel
-    :type enable_media_cards: bool
-    :param enable_video: Enable video for Microsoft Teams channel
-    :type enable_video: bool
     :param enable_calling: Enable calling for Microsoft Teams channel
     :type enable_calling: bool
-    :param call_mode: Enable messaging for Microsoft Teams channel
-    :type call_mode: str
+    :param calling_web_hook: Webhook for Microsoft Teams channel calls
+    :type calling_web_hook: str
     :param is_enabled: Required. Whether this channel is enabled for the bot
     :type is_enabled: bool
     """
@@ -36,19 +30,13 @@ class MsTeamsChannelProperties(Model):
     }
 
     _attribute_map = {
-        'enable_messaging': {'key': 'enableMessaging', 'type': 'bool'},
-        'enable_media_cards': {'key': 'enableMediaCards', 'type': 'bool'},
-        'enable_video': {'key': 'enableVideo', 'type': 'bool'},
         'enable_calling': {'key': 'enableCalling', 'type': 'bool'},
-        'call_mode': {'key': 'callMode', 'type': 'str'},
+        'calling_web_hook': {'key': 'callingWebHook', 'type': 'str'},
         'is_enabled': {'key': 'isEnabled', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
         super(MsTeamsChannelProperties, self).__init__(**kwargs)
-        self.enable_messaging = kwargs.get('enable_messaging', None)
-        self.enable_media_cards = kwargs.get('enable_media_cards', None)
-        self.enable_video = kwargs.get('enable_video', None)
         self.enable_calling = kwargs.get('enable_calling', None)
-        self.call_mode = kwargs.get('call_mode', None)
+        self.calling_web_hook = kwargs.get('calling_web_hook', None)
         self.is_enabled = kwargs.get('is_enabled', None)

azure-mgmt-botservice/azure/mgmt/botservice/models/ms_teams_channel_properties_py3.py

@@ -17,16 +17,10 @@ class MsTeamsChannelProperties(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param enable_messaging: Enable messaging for Microsoft Teams channel
-    :type enable_messaging: bool
-    :param enable_media_cards: Enable media cards for Microsoft Teams channel
-    :type enable_media_cards: bool
-    :param enable_video: Enable video for Microsoft Teams channel
-    :type enable_video: bool
     :param enable_calling: Enable calling for Microsoft Teams channel
     :type enable_calling: bool
-    :param call_mode: Enable messaging for Microsoft Teams channel
-    :type call_mode: str
+    :param calling_web_hook: Webhook for Microsoft Teams channel calls
+    :type calling_web_hook: str
     :param is_enabled: Required. Whether this channel is enabled for the bot
     :type is_enabled: bool
     """
@@ -36,19 +30,13 @@ class MsTeamsChannelProperties(Model):
     }
 
     _attribute_map = {
-        'enable_messaging': {'key': 'enableMessaging', 'type': 'bool'},
-        'enable_media_cards': {'key': 'enableMediaCards', 'type': 'bool'},
-        'enable_video': {'key': 'enableVideo', 'type': 'bool'},
         'enable_calling': {'key': 'enableCalling', 'type': 'bool'},
-        'call_mode': {'key': 'callMode', 'type': 'str'},
+        'calling_web_hook': {'key': 'callingWebHook', 'type': 'str'},
         'is_enabled': {'key': 'isEnabled', 'type': 'bool'},
     }
 
-    def __init__(self, *, is_enabled: bool, enable_messaging: bool=None, enable_media_cards: bool=None, enable_video: bool=None, enable_calling: bool=None, call_mode: str=None, **kwargs) -> None:
+    def __init__(self, *, is_enabled: bool, enable_calling: bool=None, calling_web_hook: str=None, **kwargs) -> None:
         super(MsTeamsChannelProperties, self).__init__(**kwargs)
-        self.enable_messaging = enable_messaging
-        self.enable_media_cards = enable_media_cards
-        self.enable_video = enable_video
         self.enable_calling = enable_calling
-        self.call_mode = call_mode
+        self.calling_web_hook = calling_web_hook
         self.is_enabled = is_enabled

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: "2017-12-01".
+    :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".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2017-12-01"
+        self.api_version = "2018-07-12"
 
         self.config = config
 
@@ -64,7 +64,7 @@ def list_service_providers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -73,8 +73,8 @@ def list_service_providers(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorException(self._deserialize, response)
@@ -130,7 +130,7 @@ def list_with_secrets(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -139,8 +139,8 @@ def list_with_secrets(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorException(self._deserialize, response)
@@ -199,6 +199,7 @@ def create(
 
         # 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())
@@ -211,9 +212,8 @@ def create(
         body_content = self._serialize.body(parameters, 'ConnectionSetting')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             raise models.ErrorException(self._deserialize, response)
@@ -274,6 +274,7 @@ def update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
@@ -286,9 +287,8 @@ def update(
         body_content = self._serialize.body(parameters, 'ConnectionSetting')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             raise models.ErrorException(self._deserialize, response)
@@ -346,7 +346,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -355,8 +355,8 @@ def get(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorException(self._deserialize, response)
@@ -411,7 +411,6 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -420,8 +419,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             raise models.ErrorException(self._deserialize, response)
@@ -474,7 +473,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -483,9 +482,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 raise models.ErrorException(self._deserialize, response)