Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR track2_azure-mgmt-containerservice] merge change from master for containerservice #5804

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[AutoPR track2_azure-mgmt-containerservice] merge change from master for containerservice #5804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions sdk/containerservice/azure-mgmt-containerservice/_meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"autorest": "3.0.6369",
"use": "@autorest/python@5.6.2",
"commit": "8c3c899722a412e9e61264459d6426e64925cd68",
"autorest": "3.4.2",
"use": [
"@autorest/python@5.8.0",
"@autorest/modelerfour@4.19.2"
],
"commit": "becebb4d06e71b420213158a761f5f258d7d2831",
"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",
"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.8.0 --use=@autorest/modelerfour@4.19.2 --version=3.4.2",
"readme": "specification/containerservice/resource-manager/readme.md"
}
28 changes: 27 additions & 1 deletion ...vice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from typing import Any, Optional

from azure.core.credentials import TokenCredential
from azure.core.pipeline.transport import HttpRequest, HttpResponse

class _SDKClient(object):
def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -55,7 +56,7 @@ class ContainerServiceClient(MultiApiClientMixin, _SDKClient):
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
"""

DEFAULT_API_VERSION = '2021-03-01'
DEFAULT_API_VERSION = '2021-05-01'
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
Expand Down Expand Up @@ -116,6 +117,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 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>`
* 2021-05-01: :mod:`v2021_05_01.models<azure.mgmt.containerservice.v2021_05_01.models>`
"""
if api_version == '2017-07-01':
from .v2017_07_01 import models
Expand Down Expand Up @@ -189,6 +191,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2021-03-01':
from .v2021_03_01 import models
return models
elif api_version == '2021-05-01':
from .v2021_05_01 import models
return models
raise ValueError("API version {} is not available".format(api_version))

@property
Expand All @@ -212,6 +217,7 @@ def agent_pools(self):
* 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>`
* 2021-05-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_05_01.operations.AgentPoolsOperations>`
"""
api_version = self._get_api_version('agent_pools')
if api_version == '2019-02-01':
Expand Down Expand Up @@ -248,6 +254,8 @@ def agent_pools(self):
from .v2021_02_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand All @@ -272,6 +280,7 @@ 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>`
* 2021-05-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_05_01.operations.MaintenanceConfigurationsOperations>`
"""
api_version = self._get_api_version('maintenance_configurations')
if api_version == '2020-12-01':
Expand All @@ -280,6 +289,8 @@ def maintenance_configurations(self):
from .v2021_02_01.operations import MaintenanceConfigurationsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import MaintenanceConfigurationsOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand Down Expand Up @@ -307,6 +318,7 @@ def managed_clusters(self):
* 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>`
* 2021-05-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_05_01.operations.ManagedClustersOperations>`
"""
api_version = self._get_api_version('managed_clusters')
if api_version == '2018-03-31':
Expand Down Expand Up @@ -347,6 +359,8 @@ def managed_clusters(self):
from .v2021_02_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand Down Expand Up @@ -396,6 +410,7 @@ def operations(self):
* 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>`
* 2021-05-01: :class:`Operations<azure.mgmt.containerservice.v2021_05_01.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2018-03-31':
Expand Down Expand Up @@ -436,6 +451,8 @@ def operations(self):
from .v2021_02_01.operations import Operations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import Operations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand All @@ -451,6 +468,7 @@ def private_endpoint_connections(self):
* 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>`
* 2021-05-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_05_01.operations.PrivateEndpointConnectionsOperations>`
"""
api_version = self._get_api_version('private_endpoint_connections')
if api_version == '2020-06-01':
Expand All @@ -467,6 +485,8 @@ def private_endpoint_connections(self):
from .v2021_02_01.operations import PrivateEndpointConnectionsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import PrivateEndpointConnectionsOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand All @@ -480,6 +500,7 @@ def private_link_resources(self):
* 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>`
* 2021-05-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_05_01.operations.PrivateLinkResourcesOperations>`
"""
api_version = self._get_api_version('private_link_resources')
if api_version == '2020-09-01':
Expand All @@ -492,6 +513,8 @@ def private_link_resources(self):
from .v2021_02_01.operations import PrivateLinkResourcesOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import PrivateLinkResourcesOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand All @@ -505,6 +528,7 @@ def resolve_private_link_service_id(self):
* 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>`
* 2021-05-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_05_01.operations.ResolvePrivateLinkServiceIdOperations>`
"""
api_version = self._get_api_version('resolve_private_link_service_id')
if api_version == '2020-09-01':
Expand All @@ -517,6 +541,8 @@ def resolve_private_link_service_id(self):
from .v2021_02_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
elif api_version == '2021-05-01':
from .v2021_05_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)))
Expand Down
Loading