CodeGen from PR 20873 in Azure/azure-rest-api-specs

add AVS 2022-05-01 API (Azure#20873)

* copy 2021-12-01

* replace api-version
and replace subscription-id in examples

* allow specifying a sku in Locations_CheckTrialAvailability

* add Clusters_ListZones

* add WorkloadNetworks_Get & WorkloadNetworks_List

* Arc Addons

* add readOnly nsxPublicIpQuotaRaised flag to PrivateCloudProperties

* add readonly autoDetectedKeyVersion to EncryptionKeyVaultProperties

* definition of WorkloadNetwork & WorkloadNetworkList

* add affinityStrength and azureHybridBenefitType to VmHostPlacementPolicyProperties

* add affinityStrength and azureHybridBenefitType to PlacementPolicyUpdateProperties

* add definitions for ClusterZone and ClusterZoneList

* add company and uri to ScriptPackageProperties

* add to readme

* add x-ms-identifiers

* suppress ParametersOrder

* fix Azure#20902. add Canceled to all provisioningState

* fix trial spelling

* add workloadNetworkName param to WorkloadNetworks_Get

* use v3/types in new operations
Clusters_ListZones, WorkloadNetworks_Get, WorkloadNetworks_List

* fix response type for WorkloadNetworks_List

* remove empty property bags

* add workloadNetworkName to WorkloadNetworks_Get example

* use suppressions

* restore AutoRest v2 Suppressions

* fix ConsistentPatchProperties by using PlacePolicy resource directly in PlacementPolicies_Update

* Revert "fix ConsistentPatchProperties by using PlacePolicy resource directly in PlacementPolicies_Update"

This reverts commit b88a2c064b31198844432c06142212ab8cd92d7d.

* suppress ConsistentPatchProperties

* suppress DefinitionsPropertiesNamesCamelCase & ArmResourcePropertiesBag

* suppress DeleteOperationAsyncResponseValidation

* add 202 responses to PrivateClouds_Update & Clusters_Update

* just warnings

* suppress PatchSkuProperty

* Revert "add 202 responses to PrivateClouds_Update & Clusters_Update"

This reverts commit 9d6abb129a92a5d018aef9997212ced1055d5352.

* suppress LroPatch202

* suppress UnSupportedPatchProperties `name` & `type`

* suppress XmsLongRunningOperationOptions

sdk/compute/azure-mgmt-avs/_meta.json

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.4.5",
+  "autorest": "3.9.2",
   "use": [
-    "@autorest/python@5.8.4",
-    "@autorest/modelerfour@4.19.2"
+    "@autorest/python@6.1.11",
+    "@autorest/modelerfour@4.24.3"
   ],
-  "commit": "69e98508ef71f09851b2a79971d2d8e12560adc5",
+  "commit": "9e9c5abf08db39d2c3130bc9c079a1f22ff03903",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/vmware/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5",
+  "autorest_command": "autorest specification/vmware/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.1.11 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
   "readme": "specification/vmware/resource-manager/readme.md"
 }

sdk/compute/azure-mgmt-avs/azure/mgmt/avs/__init__.py

@@ -10,10 +10,15 @@
 from ._version import VERSION
 
 __version__ = VERSION
-__all__ = ['AVSClient']
 
 try:
-    from ._patch import patch_sdk  # type: ignore
-    patch_sdk()
+    from ._patch import __all__ as _patch_all
+    from ._patch import *  # type: ignore # pylint: disable=unused-wildcard-import
 except ImportError:
-    pass
+    _patch_all = []
+from ._patch import patch_sdk as _patch_sdk
+
+__all__ = ["AVSClient"]
+__all__.extend([p for p in _patch_all if p not in __all__])
+
+_patch_sdk()

sdk/compute/azure-mgmt-avs/azure/mgmt/avs/_avs_client.py

@@ -6,39 +6,40 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from copy import deepcopy
+from typing import Any, TYPE_CHECKING
 
+from azure.core.rest import HttpRequest, HttpResponse
 from azure.mgmt.core import ARMPipelineClient
-from msrest import Deserializer, Serializer
+
+from . import models
+from ._configuration import AVSClientConfiguration
+from ._serialization import Deserializer, Serializer
+from .operations import (
+    AddonsOperations,
+    AuthorizationsOperations,
+    CloudLinksOperations,
+    ClustersOperations,
+    DatastoresOperations,
+    GlobalReachConnectionsOperations,
+    HcxEnterpriseSitesOperations,
+    LocationsOperations,
+    Operations,
+    PlacementPoliciesOperations,
+    PrivateCloudsOperations,
+    ScriptCmdletsOperations,
+    ScriptExecutionsOperations,
+    ScriptPackagesOperations,
+    VirtualMachinesOperations,
+    WorkloadNetworksOperations,
+)
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any, Optional
-
     from azure.core.credentials import TokenCredential
-    from azure.core.pipeline.transport import HttpRequest, HttpResponse
-
-from ._configuration import AVSClientConfiguration
-from .operations import Operations
-from .operations import LocationsOperations
-from .operations import PrivateCloudsOperations
-from .operations import ClustersOperations
-from .operations import DatastoresOperations
-from .operations import HcxEnterpriseSitesOperations
-from .operations import AuthorizationsOperations
-from .operations import GlobalReachConnectionsOperations
-from .operations import WorkloadNetworksOperations
-from .operations import CloudLinksOperations
-from .operations import AddonsOperations
-from .operations import VirtualMachinesOperations
-from .operations import PlacementPoliciesOperations
-from .operations import ScriptPackagesOperations
-from .operations import ScriptCmdletsOperations
-from .operations import ScriptExecutionsOperations
-from . import models
 
 
-class AVSClient(object):
+class AVSClient:  # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
     """Azure VMware Solution API.
 
     :ivar operations: Operations operations
@@ -73,82 +74,83 @@ class AVSClient(object):
     :vartype script_cmdlets: azure.mgmt.avs.operations.ScriptCmdletsOperations
     :ivar script_executions: ScriptExecutionsOperations operations
     :vartype script_executions: azure.mgmt.avs.operations.ScriptExecutionsOperations
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
-    :param str base_url: Service URL
-    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
+    :param base_url: Service URL. Default value is "https://management.azure.com".
+    :type base_url: str
+    :keyword api_version: Api Version. Default value is "2022-05-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
+    :keyword int polling_interval: Default waiting time between two polls for LRO operations if no
+     Retry-After header is present.
     """
 
     def __init__(
         self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        base_url=None,  # type: Optional[str]
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
-        if not base_url:
-            base_url = 'https://management.azure.com'
-        self._config = AVSClientConfiguration(credential, subscription_id, **kwargs)
+        credential: "TokenCredential",
+        subscription_id: str,
+        base_url: str = "https://management.azure.com",
+        **kwargs: Any
+    ) -> None:
+        self._config = AVSClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
         self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
-        self._serialize.client_side_validation = False
         self._deserialize = Deserializer(client_models)
-
-        self.operations = Operations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.locations = LocationsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.private_clouds = PrivateCloudsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.clusters = ClustersOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.datastores = DatastoresOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+        self._serialize.client_side_validation = False
+        self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
+        self.locations = LocationsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.private_clouds = PrivateCloudsOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.clusters = ClustersOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.datastores = DatastoresOperations(self._client, self._config, self._serialize, self._deserialize)
         self.hcx_enterprise_sites = HcxEnterpriseSitesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.authorizations = AuthorizationsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.authorizations = AuthorizationsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.global_reach_connections = GlobalReachConnectionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.workload_networks = WorkloadNetworksOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.cloud_links = CloudLinksOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.addons = AddonsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.cloud_links = CloudLinksOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.addons = AddonsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.virtual_machines = VirtualMachinesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
         self.placement_policies = PlacementPoliciesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.script_packages = ScriptPackagesOperations(
-            self._client, self._config, self._serialize, self._deserialize)
-        self.script_cmdlets = ScriptCmdletsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
+        self.script_packages = ScriptPackagesOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.script_cmdlets = ScriptCmdletsOperations(self._client, self._config, self._serialize, self._deserialize)
         self.script_executions = ScriptExecutionsOperations(
-            self._client, self._config, self._serialize, self._deserialize)
+            self._client, self._config, self._serialize, self._deserialize
+        )
 
-    def _send_request(self, http_request, **kwargs):
-        # type: (HttpRequest, Any) -> HttpResponse
+    def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
-        :param http_request: The network request you want to make. Required.
-        :type http_request: ~azure.core.pipeline.transport.HttpRequest
-        :keyword bool stream: Whether the response payload will be streamed. Defaults to True.
+        >>> from azure.core.rest import HttpRequest
+        >>> request = HttpRequest("GET", "https://www.example.org/")
+        <HttpRequest [GET], url: 'https://www.example.org/'>
+        >>> response = client._send_request(request)
+        <HttpResponse: 200 OK>
+
+        For more information on this code flow, see https://aka.ms/azsdk/dpcodegen/python/send_request
+
+        :param request: The network request you want to make. Required.
+        :type request: ~azure.core.rest.HttpRequest
+        :keyword bool stream: Whether the response payload will be streamed. Defaults to False.
         :return: The response of your network call. Does not do error handling on your response.
-        :rtype: ~azure.core.pipeline.transport.HttpResponse
+        :rtype: ~azure.core.rest.HttpResponse
         """
-        path_format_arguments = {
-            'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
-        }
-        http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
-        stream = kwargs.pop("stream", True)
-        pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
-        return pipeline_response.http_response
+
+        request_copy = deepcopy(request)
+        request_copy.url = self._client.format_url(request_copy.url)
+        return self._client.send_request(request_copy, **kwargs)
 
     def close(self):
         # type: () -> None

sdk/compute/azure-mgmt-avs/azure/mgmt/avs/_configuration.py

@@ -6,66 +6,64 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-from typing import TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
-from azure.mgmt.core.policies import ARMHttpLoggingPolicy
+from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
 
 from ._version import VERSION
 
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
-    from typing import Any
-
     from azure.core.credentials import TokenCredential
 
 
-class AVSClientConfiguration(Configuration):
+class AVSClientConfiguration(Configuration):  # pylint: disable=too-many-instance-attributes
     """Configuration for AVSClient.
 
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
-    :param credential: Credential needed for the client to connect to Azure.
+    :param credential: Credential needed for the client to connect to Azure. Required.
     :type credential: ~azure.core.credentials.TokenCredential
-    :param subscription_id: The ID of the target subscription.
+    :param subscription_id: The ID of the target subscription. Required.
     :type subscription_id: str
+    :keyword api_version: Api Version. Default value is "2022-05-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     """
 
-    def __init__(
-        self,
-        credential,  # type: "TokenCredential"
-        subscription_id,  # type: str
-        **kwargs  # type: Any
-    ):
-        # type: (...) -> None
+    def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
+        super(AVSClientConfiguration, self).__init__(**kwargs)
+        api_version = kwargs.pop("api_version", "2022-05-01")  # type: str
+
         if credential is None:
             raise ValueError("Parameter 'credential' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
-        super(AVSClientConfiguration, self).__init__(**kwargs)
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-12-01"
-        self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-avs/{}'.format(VERSION))
+        self.api_version = api_version
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
+        kwargs.setdefault("sdk_moniker", "mgmt-avs/{}".format(VERSION))
         self._configure(**kwargs)
 
     def _configure(
-        self,
-        **kwargs  # type: Any
+        self, **kwargs  # type: Any
     ):
         # type: (...) -> None
-        self.user_agent_policy = kwargs.get('user_agent_policy') or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get('headers_policy') or policies.HeadersPolicy(**kwargs)
-        self.proxy_policy = kwargs.get('proxy_policy') or policies.ProxyPolicy(**kwargs)
-        self.logging_policy = kwargs.get('logging_policy') or policies.NetworkTraceLoggingPolicy(**kwargs)
-        self.http_logging_policy = kwargs.get('http_logging_policy') or ARMHttpLoggingPolicy(**kwargs)
-        self.retry_policy = kwargs.get('retry_policy') or policies.RetryPolicy(**kwargs)
-        self.custom_hook_policy = kwargs.get('custom_hook_policy') or policies.CustomHookPolicy(**kwargs)
-        self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
-        self.authentication_policy = kwargs.get('authentication_policy')
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
+        self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
+        self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
+        self.authentication_policy = kwargs.get("authentication_policy")
         if self.credential and not self.authentication_policy:
-            self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
+            self.authentication_policy = ARMChallengeAuthenticationPolicy(
+                self.credential, *self.credential_scopes, **kwargs
+            )