Update from master

Author: SDK Automation

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/_compute_management_client.py

@@ -5,5 +5,6 @@
 # license information.
 # --------------------------------------------------------------------------
 from .v2019_04_01.models import *
-from .v2019_11_01.models import *
 from .v2019_12_01.models import *
+from .v2020_05_01.models import *
+from .v2020_06_01.models import *

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/aio/_compute_management_client_async.py

@@ -85,7 +85,6 @@ async def create_or_update(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
         body_content_kwargs['content'] = body_content
@@ -111,7 +110,7 @@ async def delete(
         resource_group_name: str,
         availability_set_name: str,
         **kwargs
-    ) -> "models.OperationStatusResponse":
+    ) -> Optional["models.OperationStatusResponse"]:
         """Delete an availability set.
 
         :param resource_group_name: The name of the resource group.
@@ -123,7 +122,7 @@ async def delete(
         :rtype: ~azure.mgmt.compute.v2015_06_15.models.OperationStatusResponse or None
         :raises: ~azure.core.exceptions.HttpResponseError
         """
-        cls = kwargs.pop('cls', None)  # type: ClsType["models.OperationStatusResponse"]
+        cls = kwargs.pop('cls', None)  # type: ClsType[Optional["models.OperationStatusResponse"]]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
         api_version = "2015-06-15"
@@ -145,7 +144,6 @@ async def delete(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.delete(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -203,7 +201,6 @@ async def get(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -240,6 +237,10 @@ def list(
         api_version = "2015-06-15"
 
         def prepare_request(next_link=None):
+            # Construct headers
+            header_parameters = {}  # type: Dict[str, Any]
+            header_parameters['Accept'] = 'application/json'
+
             if not next_link:
                 # Construct URL
                 url = self.list.metadata['url']  # type: ignore
@@ -252,15 +253,11 @@ def prepare_request(next_link=None):
                 query_parameters = {}  # type: Dict[str, Any]
                 query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):
@@ -311,6 +308,10 @@ def list_available_sizes(
         api_version = "2015-06-15"
 
         def prepare_request(next_link=None):
+            # Construct headers
+            header_parameters = {}  # type: Dict[str, Any]
+            header_parameters['Accept'] = 'application/json'
+
             if not next_link:
                 # Construct URL
                 url = self.list_available_sizes.metadata['url']  # type: ignore
@@ -324,15 +325,11 @@ def prepare_request(next_link=None):
                 query_parameters = {}  # type: Dict[str, Any]
                 query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/models.py

@@ -62,6 +62,10 @@ def list(
         api_version = "2015-06-15"
 
         def prepare_request(next_link=None):
+            # Construct headers
+            header_parameters = {}  # type: Dict[str, Any]
+            header_parameters['Accept'] = 'application/json'
+
             if not next_link:
                 # Construct URL
                 url = self.list.metadata['url']  # type: ignore
@@ -74,15 +78,11 @@ def prepare_request(next_link=None):
                 query_parameters = {}  # type: Dict[str, Any]
                 query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
+                request = self._client.get(url, query_parameters, header_parameters)
             else:
                 url = next_link
                 query_parameters = {}  # type: Dict[str, Any]
-            # Construct headers
-            header_parameters = {}  # type: Dict[str, Any]
-            header_parameters['Accept'] = 'application/json'
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters, header_parameters)
+                request = self._client.get(url, query_parameters, header_parameters)
             return request
 
         async def extract_data(pipeline_response):

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/aio/operations_async/_availability_sets_operations_async.py

@@ -87,7 +87,6 @@ async def get(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -143,7 +142,6 @@ async def list_types(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -218,7 +216,6 @@ async def list_versions(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/aio/operations_async/_usage_operations_async.py

@@ -75,7 +75,6 @@ async def _create_or_update_initial(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
         body_content_kwargs['content'] = body_content
@@ -88,7 +87,6 @@ async def _create_or_update_initial(
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
-        deserialized = None
         if response.status_code == 200:
             deserialized = self._deserialize('VirtualMachineExtension', pipeline_response)
 
@@ -108,7 +106,7 @@ async def begin_create_or_update(
         vm_extension_name: str,
         extension_parameters: "models.VirtualMachineExtension",
         **kwargs
-    ) -> "models.VirtualMachineExtension":
+    ) -> AsyncLROPoller["models.VirtualMachineExtension"]:
         """The operation to create or update the extension.
 
         :param resource_group_name: The name of the resource group.
@@ -127,8 +125,8 @@ async def begin_create_or_update(
          polling object for personal polling strategy
         :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
         :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
-        :return: VirtualMachineExtension, or the result of cls(response)
-        :rtype: ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineExtension
+        :return: An instance of AsyncLROPoller that returns either VirtualMachineExtension or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.compute.v2015_06_15.models.VirtualMachineExtension]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -205,7 +203,6 @@ async def _update_initial(
         header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         body_content_kwargs = {}  # type: Dict[str, Any]
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
         body_content_kwargs['content'] = body_content
@@ -233,7 +230,7 @@ async def begin_update(
         vm_extension_name: str,
         extension_parameters: "models.VirtualMachineExtensionUpdate",
         **kwargs
-    ) -> "models.VirtualMachineExtension":
+    ) -> AsyncLROPoller["models.VirtualMachineExtension"]:
         """The operation to update the extension.
 
         :param resource_group_name: The name of the resource group.
@@ -251,8 +248,8 @@ async def begin_update(
          polling object for personal polling strategy
         :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
         :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
-        :return: VirtualMachineExtension, or the result of cls(response)
-        :rtype: ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineExtension
+        :return: An instance of AsyncLROPoller that returns either VirtualMachineExtension or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.compute.v2015_06_15.models.VirtualMachineExtension]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -302,8 +299,8 @@ async def _delete_initial(
         vm_name: str,
         vm_extension_name: str,
         **kwargs
-    ) -> "models.OperationStatusResponse":
-        cls = kwargs.pop('cls', None)  # type: ClsType["models.OperationStatusResponse"]
+    ) -> Optional["models.OperationStatusResponse"]:
+        cls = kwargs.pop('cls', None)  # type: ClsType[Optional["models.OperationStatusResponse"]]
         error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
         error_map.update(kwargs.pop('error_map', {}))
         api_version = "2015-06-15"
@@ -326,7 +323,6 @@ async def _delete_initial(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.delete(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -351,7 +347,7 @@ async def begin_delete(
         vm_name: str,
         vm_extension_name: str,
         **kwargs
-    ) -> "models.OperationStatusResponse":
+    ) -> AsyncLROPoller["models.OperationStatusResponse"]:
         """The operation to delete the extension.
 
         :param resource_group_name: The name of the resource group.
@@ -366,8 +362,8 @@ async def begin_delete(
          polling object for personal polling strategy
         :paramtype polling: bool or ~azure.core.polling.AsyncPollingMethod
         :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
-        :return: OperationStatusResponse, or the result of cls(response)
-        :rtype: ~azure.mgmt.compute.v2015_06_15.models.OperationStatusResponse
+        :return: An instance of AsyncLROPoller that returns either OperationStatusResponse or the result of cls(response)
+        :rtype: ~azure.core.polling.AsyncLROPoller[~azure.mgmt.compute.v2015_06_15.models.OperationStatusResponse]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         polling = kwargs.pop('polling', True)  # type: Union[bool, AsyncPollingMethod]
@@ -458,7 +454,6 @@ async def get(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/aio/operations_async/_virtual_machine_extension_images_operations_async.py

@@ -91,7 +91,6 @@ async def get(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -171,7 +170,6 @@ async def list(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -227,7 +225,6 @@ async def list_offers(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -279,7 +276,6 @@ async def list_publishers(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response
@@ -339,7 +335,6 @@ async def list_skus(
         header_parameters = {}  # type: Dict[str, Any]
         header_parameters['Accept'] = 'application/json'
 
-        # Construct and send request
         request = self._client.get(url, query_parameters, header_parameters)
         pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
         response = pipeline_response.http_response