[AutoRelease] t2-containerservice-2021-04-07-68775(Do not merge) (#17865

)

* CodeGen from PR 13763 in Azure/azure-rest-api-specs
[aks] fix vm size model and osDiskType description  (#13763)

* fix: agent pool vm size should be string, not enum

* fix: osDiskType default description for >= 2020-11-01

* version,CHANGELOG

* test

Co-authored-by: SDKAuto <sdkautomation@microsoft.com>
Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>
Co-authored-by: zhangyan133 <77086185+zhangyan133@users.noreply.github.com>

sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Release History
 
+## 15.1.0 (2021-04-07)
+
+**Features**
+
+  - Model Components1Q1Og48SchemasManagedclusterAllof1 has a new parameter private_link_resources
+  - Model Components1Q1Og48SchemasManagedclusterAllof1 has a new parameter disable_local_accounts
+  - Model Components1Q1Og48SchemasManagedclusterAllof1 has a new parameter http_proxy_config
+  - Model ManagedClusterPodIdentity has a new parameter binding_selector
+  - Model ManagedClusterAgentPoolProfileProperties has a new parameter gpu_instance_profile
+  - Model ManagedClusterAgentPoolProfileProperties has a new parameter enable_fips
+  - Model ManagedClusterAgentPoolProfileProperties has a new parameter os_sku
+  - Model AgentPool has a new parameter gpu_instance_profile
+  - Model AgentPool has a new parameter enable_fips
+  - Model AgentPool has a new parameter os_sku
+  - Model ManagedCluster has a new parameter extended_location
+  - Model ManagedCluster has a new parameter private_link_resources
+  - Model ManagedCluster has a new parameter disable_local_accounts
+  - Model ManagedCluster has a new parameter http_proxy_config
+  - Model ManagedClusterAgentPoolProfile has a new parameter gpu_instance_profile
+  - Model ManagedClusterAgentPoolProfile has a new parameter enable_fips
+  - Model ManagedClusterAgentPoolProfile has a new parameter os_sku
+  - Model ManagedClusterWindowsProfile has a new parameter enable_csi_proxy
+  - Added operation ManagedClustersOperations.get_command_result
+  - Added operation ManagedClustersOperations.begin_run_command
+  - Added operation ManagedClustersOperations.get_os_options
+
 ## 15.0.0 (2021-03-03)
 
 **Features**

sdk/containerservice/azure-mgmt-containerservice/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/containerservice/azure-mgmt-containerservice/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "3.0.6369",
+  "use": "@autorest/python@5.6.2",
+  "commit": "8c3c899722a412e9e61264459d6426e64925cd68",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/containerservice/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.6.2 --version=3.0.6369",
+  "readme": "specification/containerservice/resource-manager/readme.md"
+}

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_configuration.py

@@ -8,14 +8,19 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-from typing import Any
+from typing import TYPE_CHECKING
 
 from azure.core.configuration import Configuration
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import 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 ContainerServiceClientConfiguration(Configuration):
     """Configuration for ContainerServiceClient.

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py

@@ -9,13 +9,21 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from azure.mgmt.core import ARMPipelineClient
-from msrest import Serializer, Deserializer
+from typing import TYPE_CHECKING
 
+from azure.mgmt.core import ARMPipelineClient
 from azure.profiles import KnownProfiles, ProfileDefinition
 from azure.profiles.multiapiclient import MultiApiClientMixin
+from msrest import Deserializer, Serializer
+
 from ._configuration import ContainerServiceClientConfiguration
 
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from typing import Any, Optional
+
+    from azure.core.credentials import TokenCredential
+
 class _SDKClient(object):
     def __init__(self, *args, **kwargs):
         """This is a fake class to support current implemetation of MultiApiClientMixin."
@@ -38,15 +46,16 @@ class ContainerServiceClient(MultiApiClientMixin, _SDKClient):
     :type credential: ~azure.core.credentials.TokenCredential
     :param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
     :type subscription_id: str
-    :param str api_version: API version to use if no profile is provided, or if
-     missing in profile.
-    :param str base_url: Service URL
+    :param api_version: API version to use if no profile is provided, or if missing in profile.
+    :type api_version: str
+    :param base_url: Service URL
+    :type base_url: str
     :param profile: A profile definition, from KnownProfiles to dict.
     :type profile: azure.profiles.KnownProfiles
     :keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
     """
 
-    DEFAULT_API_VERSION = '2021-02-01'
+    DEFAULT_API_VERSION = '2021-03-01'
     _PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -61,9 +70,9 @@ def __init__(
         self,
         credential,  # type: "TokenCredential"
         subscription_id,  # type: str
-        api_version=None,
-        base_url=None,
-        profile=KnownProfiles.default,
+        api_version=None, # type: Optional[str]
+        base_url=None,  # type: Optional[str]
+        profile=KnownProfiles.default, # type: KnownProfiles
         **kwargs  # type: Any
     ):
         if not base_url:
@@ -106,6 +115,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2020-11-01: :mod:`v2020_11_01.models<azure.mgmt.containerservice.v2020_11_01.models>`
            * 2020-12-01: :mod:`v2020_12_01.models<azure.mgmt.containerservice.v2020_12_01.models>`
            * 2021-02-01: :mod:`v2021_02_01.models<azure.mgmt.containerservice.v2021_02_01.models>`
+           * 2021-03-01: :mod:`v2021_03_01.models<azure.mgmt.containerservice.v2021_03_01.models>`
         """
         if api_version == '2017-07-01':
             from .v2017_07_01 import models
@@ -176,6 +186,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2021-02-01':
             from .v2021_02_01 import models
             return models
+        elif api_version == '2021-03-01':
+            from .v2021_03_01 import models
+            return models
         raise ValueError("API version {} is not available".format(api_version))
 
     @property
@@ -198,6 +211,7 @@ def agent_pools(self):
            * 2020-11-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_11_01.operations.AgentPoolsOperations>`
            * 2020-12-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_12_01.operations.AgentPoolsOperations>`
            * 2021-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_02_01.operations.AgentPoolsOperations>`
+           * 2021-03-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_03_01.operations.AgentPoolsOperations>`
         """
         api_version = self._get_api_version('agent_pools')
         if api_version == '2019-02-01':
@@ -232,6 +246,8 @@ def agent_pools(self):
             from .v2020_12_01.operations import AgentPoolsOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import AgentPoolsOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import AgentPoolsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'agent_pools'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -255,12 +271,15 @@ def maintenance_configurations(self):
 
            * 2020-12-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2020_12_01.operations.MaintenanceConfigurationsOperations>`
            * 2021-02-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_02_01.operations.MaintenanceConfigurationsOperations>`
+           * 2021-03-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_03_01.operations.MaintenanceConfigurationsOperations>`
         """
         api_version = self._get_api_version('maintenance_configurations')
         if api_version == '2020-12-01':
             from .v2020_12_01.operations import MaintenanceConfigurationsOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import MaintenanceConfigurationsOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import MaintenanceConfigurationsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'maintenance_configurations'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -287,6 +306,7 @@ def managed_clusters(self):
            * 2020-11-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_11_01.operations.ManagedClustersOperations>`
            * 2020-12-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_12_01.operations.ManagedClustersOperations>`
            * 2021-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_02_01.operations.ManagedClustersOperations>`
+           * 2021-03-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_03_01.operations.ManagedClustersOperations>`
         """
         api_version = self._get_api_version('managed_clusters')
         if api_version == '2018-03-31':
@@ -325,6 +345,8 @@ def managed_clusters(self):
             from .v2020_12_01.operations import ManagedClustersOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import ManagedClustersOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import ManagedClustersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'managed_clusters'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -373,6 +395,7 @@ def operations(self):
            * 2020-11-01: :class:`Operations<azure.mgmt.containerservice.v2020_11_01.operations.Operations>`
            * 2020-12-01: :class:`Operations<azure.mgmt.containerservice.v2020_12_01.operations.Operations>`
            * 2021-02-01: :class:`Operations<azure.mgmt.containerservice.v2021_02_01.operations.Operations>`
+           * 2021-03-01: :class:`Operations<azure.mgmt.containerservice.v2021_03_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2018-03-31':
@@ -411,6 +434,8 @@ def operations(self):
             from .v2020_12_01.operations import Operations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import Operations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import Operations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -425,6 +450,7 @@ def private_endpoint_connections(self):
            * 2020-11-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateEndpointConnectionsOperations>`
            * 2020-12-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateEndpointConnectionsOperations>`
            * 2021-02-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateEndpointConnectionsOperations>`
+           * 2021-03-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_03_01.operations.PrivateEndpointConnectionsOperations>`
         """
         api_version = self._get_api_version('private_endpoint_connections')
         if api_version == '2020-06-01':
@@ -439,6 +465,8 @@ def private_endpoint_connections(self):
             from .v2020_12_01.operations import PrivateEndpointConnectionsOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import PrivateEndpointConnectionsOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import PrivateEndpointConnectionsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_endpoint_connections'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -451,6 +479,7 @@ def private_link_resources(self):
            * 2020-11-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateLinkResourcesOperations>`
            * 2020-12-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateLinkResourcesOperations>`
            * 2021-02-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateLinkResourcesOperations>`
+           * 2021-03-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_03_01.operations.PrivateLinkResourcesOperations>`
         """
         api_version = self._get_api_version('private_link_resources')
         if api_version == '2020-09-01':
@@ -461,6 +490,8 @@ def private_link_resources(self):
             from .v2020_12_01.operations import PrivateLinkResourcesOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import PrivateLinkResourcesOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import PrivateLinkResourcesOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'private_link_resources'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -473,6 +504,7 @@ def resolve_private_link_service_id(self):
            * 2020-11-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_11_01.operations.ResolvePrivateLinkServiceIdOperations>`
            * 2020-12-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_12_01.operations.ResolvePrivateLinkServiceIdOperations>`
            * 2021-02-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_02_01.operations.ResolvePrivateLinkServiceIdOperations>`
+           * 2021-03-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_03_01.operations.ResolvePrivateLinkServiceIdOperations>`
         """
         api_version = self._get_api_version('resolve_private_link_service_id')
         if api_version == '2020-09-01':
@@ -483,6 +515,8 @@ def resolve_private_link_service_id(self):
             from .v2020_12_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
         elif api_version == '2021-02-01':
             from .v2021_02_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
+        elif api_version == '2021-03-01':
+            from .v2021_03_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'resolve_private_link_service_id'".format(api_version))
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/_version.py

@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "15.0.0"
+VERSION = "15.1.0"

sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/aio/_configuration.py

@@ -8,14 +8,17 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-from typing import Any
+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 .._version import VERSION
 
+if TYPE_CHECKING:
+    # pylint: disable=unused-import,ungrouped-imports
+    from azure.core.credentials_async import AsyncTokenCredential
 
 class ContainerServiceClientConfiguration(Configuration):
     """Configuration for ContainerServiceClient.
@@ -31,8 +34,8 @@ class ContainerServiceClientConfiguration(Configuration):
 
     def __init__(
         self,
-        credential,  # type: "AsyncTokenCredential"
-        subscription_id,  # type: str
+        credential: "AsyncTokenCredential",
+        subscription_id: str,
         **kwargs  # type: Any
     ) -> None:
         if credential is None: