Skip to content

Commit c49bb3e

Browse files
SDKAutolevimmLi MaalexeldeibJunSun17
committed
CodeGen from PR 12771 in Azure/azure-rest-api-specs
Dev containerservice microsoft.container service 2021 02 01 (Azure#12771) * Adds base for updating Microsoft.ContainerService from version stable/2020-12-01 to version 2021-02-01 * Updates readme * Updates API version in new specs and examples * aks: generate 2021-02-01 sdk (Azure#12311) * aks: add `allowNetworkPluginKubenet` field to `ManagedClusterPodIdentityProfile` (Azure#12309) * aks: add `allowNetworkPluginKubenet` field to `ManagedClusterPodIdentityProfile` * aks: add pod identity example * AKS: add fqdnSubdomain for private cluster with custom private dns zone (Azure#12361) * add fqdnSubdomain for private cluster with custom private dns zone * add example ref * fix example Co-authored-by: Li Ma <[email protected]> * add new disk choice (Azure#12682) * AKS: Add Node Public IP Prefix support. (Azure#12673) * Add azure portal fqdn (Azure#12725) * add azure portal fqdn * add azure portal fqdn * fix prettier Co-authored-by: Super <[email protected]> Co-authored-by: Li Ma <[email protected]> Co-authored-by: Ace Eldeib <[email protected]> Co-authored-by: Jun Sun <[email protected]> Co-authored-by: tilnl <[email protected]>
1 parent 19efd8c commit c49bb3e

19 files changed

+10050
-2
lines changed

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

+61-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ContainerServiceClient(MultiApiClientMixin, SDKClient):
4646
:type profile: azure.profiles.KnownProfiles
4747
"""
4848

49-
DEFAULT_API_VERSION = '2020-11-01'
49+
DEFAULT_API_VERSION = '2021-02-01'
5050
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
5151
LATEST_PROFILE = ProfileDefinition({
5252
_PROFILE_TAG: {
@@ -95,6 +95,8 @@ def models(cls, api_version=DEFAULT_API_VERSION):
9595
* 2020-07-01: :mod:`v2020_07_01.models<azure.mgmt.containerservice.v2020_07_01.models>`
9696
* 2020-09-01: :mod:`v2020_09_01.models<azure.mgmt.containerservice.v2020_09_01.models>`
9797
* 2020-11-01: :mod:`v2020_11_01.models<azure.mgmt.containerservice.v2020_11_01.models>`
98+
* 2020-12-01: :mod:`v2020_12_01.models<azure.mgmt.containerservice.v2020_12_01.models>`
99+
* 2021-02-01: :mod:`v2021_02_01.models<azure.mgmt.containerservice.v2021_02_01.models>`
98100
"""
99101
if api_version == '2017-07-01':
100102
from .v2017_07_01 import models
@@ -159,6 +161,12 @@ def models(cls, api_version=DEFAULT_API_VERSION):
159161
elif api_version == '2020-11-01':
160162
from .v2020_11_01 import models
161163
return models
164+
elif api_version == '2020-12-01':
165+
from .v2020_12_01 import models
166+
return models
167+
elif api_version == '2021-02-01':
168+
from .v2021_02_01 import models
169+
return models
162170
raise NotImplementedError("APIVersion {} is not available".format(api_version))
163171

164172
@property
@@ -179,6 +187,8 @@ def agent_pools(self):
179187
* 2020-07-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_07_01.operations.AgentPoolsOperations>`
180188
* 2020-09-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_09_01.operations.AgentPoolsOperations>`
181189
* 2020-11-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_11_01.operations.AgentPoolsOperations>`
190+
* 2020-12-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_12_01.operations.AgentPoolsOperations>`
191+
* 2021-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_02_01.operations.AgentPoolsOperations>`
182192
"""
183193
api_version = self._get_api_version('agent_pools')
184194
if api_version == '2019-02-01':
@@ -209,6 +219,10 @@ def agent_pools(self):
209219
from .v2020_09_01.operations import AgentPoolsOperations as OperationClass
210220
elif api_version == '2020-11-01':
211221
from .v2020_11_01.operations import AgentPoolsOperations as OperationClass
222+
elif api_version == '2020-12-01':
223+
from .v2020_12_01.operations import AgentPoolsOperations as OperationClass
224+
elif api_version == '2021-02-01':
225+
from .v2021_02_01.operations import AgentPoolsOperations as OperationClass
212226
else:
213227
raise NotImplementedError("APIVersion {} is not available".format(api_version))
214228
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -226,6 +240,22 @@ def container_services(self):
226240
raise NotImplementedError("APIVersion {} is not available".format(api_version))
227241
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
228242

243+
@property
244+
def maintenance_configurations(self):
245+
"""Instance depends on the API version:
246+
247+
* 2020-12-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2020_12_01.operations.MaintenanceConfigurationsOperations>`
248+
* 2021-02-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_02_01.operations.MaintenanceConfigurationsOperations>`
249+
"""
250+
api_version = self._get_api_version('maintenance_configurations')
251+
if api_version == '2020-12-01':
252+
from .v2020_12_01.operations import MaintenanceConfigurationsOperations as OperationClass
253+
elif api_version == '2021-02-01':
254+
from .v2021_02_01.operations import MaintenanceConfigurationsOperations as OperationClass
255+
else:
256+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
257+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
258+
229259
@property
230260
def managed_clusters(self):
231261
"""Instance depends on the API version:
@@ -246,6 +276,8 @@ def managed_clusters(self):
246276
* 2020-07-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_07_01.operations.ManagedClustersOperations>`
247277
* 2020-09-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_09_01.operations.ManagedClustersOperations>`
248278
* 2020-11-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_11_01.operations.ManagedClustersOperations>`
279+
* 2020-12-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_12_01.operations.ManagedClustersOperations>`
280+
* 2021-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_02_01.operations.ManagedClustersOperations>`
249281
"""
250282
api_version = self._get_api_version('managed_clusters')
251283
if api_version == '2018-03-31':
@@ -280,6 +312,10 @@ def managed_clusters(self):
280312
from .v2020_09_01.operations import ManagedClustersOperations as OperationClass
281313
elif api_version == '2020-11-01':
282314
from .v2020_11_01.operations import ManagedClustersOperations as OperationClass
315+
elif api_version == '2020-12-01':
316+
from .v2020_12_01.operations import ManagedClustersOperations as OperationClass
317+
elif api_version == '2021-02-01':
318+
from .v2021_02_01.operations import ManagedClustersOperations as OperationClass
283319
else:
284320
raise NotImplementedError("APIVersion {} is not available".format(api_version))
285321
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -326,6 +362,8 @@ def operations(self):
326362
* 2020-07-01: :class:`Operations<azure.mgmt.containerservice.v2020_07_01.operations.Operations>`
327363
* 2020-09-01: :class:`Operations<azure.mgmt.containerservice.v2020_09_01.operations.Operations>`
328364
* 2020-11-01: :class:`Operations<azure.mgmt.containerservice.v2020_11_01.operations.Operations>`
365+
* 2020-12-01: :class:`Operations<azure.mgmt.containerservice.v2020_12_01.operations.Operations>`
366+
* 2021-02-01: :class:`Operations<azure.mgmt.containerservice.v2021_02_01.operations.Operations>`
329367
"""
330368
api_version = self._get_api_version('operations')
331369
if api_version == '2018-03-31':
@@ -360,6 +398,10 @@ def operations(self):
360398
from .v2020_09_01.operations import Operations as OperationClass
361399
elif api_version == '2020-11-01':
362400
from .v2020_11_01.operations import Operations as OperationClass
401+
elif api_version == '2020-12-01':
402+
from .v2020_12_01.operations import Operations as OperationClass
403+
elif api_version == '2021-02-01':
404+
from .v2021_02_01.operations import Operations as OperationClass
363405
else:
364406
raise NotImplementedError("APIVersion {} is not available".format(api_version))
365407
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -372,6 +414,8 @@ def private_endpoint_connections(self):
372414
* 2020-07-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_07_01.operations.PrivateEndpointConnectionsOperations>`
373415
* 2020-09-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_09_01.operations.PrivateEndpointConnectionsOperations>`
374416
* 2020-11-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateEndpointConnectionsOperations>`
417+
* 2020-12-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateEndpointConnectionsOperations>`
418+
* 2021-02-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateEndpointConnectionsOperations>`
375419
"""
376420
api_version = self._get_api_version('private_endpoint_connections')
377421
if api_version == '2020-06-01':
@@ -382,6 +426,10 @@ def private_endpoint_connections(self):
382426
from .v2020_09_01.operations import PrivateEndpointConnectionsOperations as OperationClass
383427
elif api_version == '2020-11-01':
384428
from .v2020_11_01.operations import PrivateEndpointConnectionsOperations as OperationClass
429+
elif api_version == '2020-12-01':
430+
from .v2020_12_01.operations import PrivateEndpointConnectionsOperations as OperationClass
431+
elif api_version == '2021-02-01':
432+
from .v2021_02_01.operations import PrivateEndpointConnectionsOperations as OperationClass
385433
else:
386434
raise NotImplementedError("APIVersion {} is not available".format(api_version))
387435
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -392,12 +440,18 @@ def private_link_resources(self):
392440
393441
* 2020-09-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_09_01.operations.PrivateLinkResourcesOperations>`
394442
* 2020-11-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateLinkResourcesOperations>`
443+
* 2020-12-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateLinkResourcesOperations>`
444+
* 2021-02-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateLinkResourcesOperations>`
395445
"""
396446
api_version = self._get_api_version('private_link_resources')
397447
if api_version == '2020-09-01':
398448
from .v2020_09_01.operations import PrivateLinkResourcesOperations as OperationClass
399449
elif api_version == '2020-11-01':
400450
from .v2020_11_01.operations import PrivateLinkResourcesOperations as OperationClass
451+
elif api_version == '2020-12-01':
452+
from .v2020_12_01.operations import PrivateLinkResourcesOperations as OperationClass
453+
elif api_version == '2021-02-01':
454+
from .v2021_02_01.operations import PrivateLinkResourcesOperations as OperationClass
401455
else:
402456
raise NotImplementedError("APIVersion {} is not available".format(api_version))
403457
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -408,12 +462,18 @@ def resolve_private_link_service_id(self):
408462
409463
* 2020-09-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_09_01.operations.ResolvePrivateLinkServiceIdOperations>`
410464
* 2020-11-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_11_01.operations.ResolvePrivateLinkServiceIdOperations>`
465+
* 2020-12-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_12_01.operations.ResolvePrivateLinkServiceIdOperations>`
466+
* 2021-02-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_02_01.operations.ResolvePrivateLinkServiceIdOperations>`
411467
"""
412468
api_version = self._get_api_version('resolve_private_link_service_id')
413469
if api_version == '2020-09-01':
414470
from .v2020_09_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
415471
elif api_version == '2020-11-01':
416472
from .v2020_11_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
473+
elif api_version == '2020-12-01':
474+
from .v2020_12_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
475+
elif api_version == '2021-02-01':
476+
from .v2021_02_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
417477
else:
418478
raise NotImplementedError("APIVersion {} is not available".format(api_version))
419479
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/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# --------------------------------------------------------------------------
77
from .v2017_07_01.models import *
88
from .v2019_04_30.models import *
9-
from .v2020_11_01.models import *
9+
from .v2021_02_01.models import *
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from ._configuration import ContainerServiceClientConfiguration
13+
from ._container_service_client import ContainerServiceClient
14+
__all__ = ['ContainerServiceClient', 'ContainerServiceClientConfiguration']
15+
16+
from .version import VERSION
17+
18+
__version__ = VERSION
19+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from msrestazure import AzureConfiguration
12+
13+
from .version import VERSION
14+
15+
16+
class ContainerServiceClientConfiguration(AzureConfiguration):
17+
"""Configuration for ContainerServiceClient
18+
Note that all parameters used to create this instance are saved as instance
19+
attributes.
20+
21+
:param credentials: Credentials needed for the client to connect to Azure.
22+
:type credentials: :mod:`A msrestazure Credentials
23+
object<msrestazure.azure_active_directory>`
24+
:param subscription_id: Subscription credentials which uniquely identify
25+
Microsoft Azure subscription. The subscription ID forms part of the URI
26+
for every service call.
27+
:type subscription_id: str
28+
:param str base_url: Service URL
29+
"""
30+
31+
def __init__(
32+
self, credentials, subscription_id, base_url=None):
33+
34+
if credentials is None:
35+
raise ValueError("Parameter 'credentials' must not be None.")
36+
if subscription_id is None:
37+
raise ValueError("Parameter 'subscription_id' must not be None.")
38+
if not base_url:
39+
base_url = 'https://management.azure.com'
40+
41+
super(ContainerServiceClientConfiguration, self).__init__(base_url)
42+
43+
# Starting Autorest.Python 4.0.64, make connection pool activated by default
44+
self.keep_alive = True
45+
46+
self.add_user_agent('azure-mgmt-containerservice/{}'.format(VERSION))
47+
self.add_user_agent('Azure-SDK-For-Python')
48+
49+
self.credentials = credentials
50+
self.subscription_id = subscription_id
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from msrest.service_client import SDKClient
13+
from msrest import Serializer, Deserializer
14+
15+
from ._configuration import ContainerServiceClientConfiguration
16+
from .operations import Operations
17+
from .operations import ManagedClustersOperations
18+
from .operations import MaintenanceConfigurationsOperations
19+
from .operations import AgentPoolsOperations
20+
from .operations import PrivateEndpointConnectionsOperations
21+
from .operations import PrivateLinkResourcesOperations
22+
from .operations import ResolvePrivateLinkServiceIdOperations
23+
from . import models
24+
25+
26+
class ContainerServiceClient(SDKClient):
27+
"""The Container Service Client.
28+
29+
:ivar config: Configuration for client.
30+
:vartype config: ContainerServiceClientConfiguration
31+
32+
:ivar operations: Operations operations
33+
:vartype operations: azure.mgmt.containerservice.v2021_02_01.operations.Operations
34+
:ivar managed_clusters: ManagedClusters operations
35+
:vartype managed_clusters: azure.mgmt.containerservice.v2021_02_01.operations.ManagedClustersOperations
36+
:ivar maintenance_configurations: MaintenanceConfigurations operations
37+
:vartype maintenance_configurations: azure.mgmt.containerservice.v2021_02_01.operations.MaintenanceConfigurationsOperations
38+
:ivar agent_pools: AgentPools operations
39+
:vartype agent_pools: azure.mgmt.containerservice.v2021_02_01.operations.AgentPoolsOperations
40+
:ivar private_endpoint_connections: PrivateEndpointConnections operations
41+
:vartype private_endpoint_connections: azure.mgmt.containerservice.v2021_02_01.operations.PrivateEndpointConnectionsOperations
42+
:ivar private_link_resources: PrivateLinkResources operations
43+
:vartype private_link_resources: azure.mgmt.containerservice.v2021_02_01.operations.PrivateLinkResourcesOperations
44+
:ivar resolve_private_link_service_id: ResolvePrivateLinkServiceId operations
45+
:vartype resolve_private_link_service_id: azure.mgmt.containerservice.v2021_02_01.operations.ResolvePrivateLinkServiceIdOperations
46+
47+
:param credentials: Credentials needed for the client to connect to Azure.
48+
:type credentials: :mod:`A msrestazure Credentials
49+
object<msrestazure.azure_active_directory>`
50+
:param subscription_id: Subscription credentials which uniquely identify
51+
Microsoft Azure subscription. The subscription ID forms part of the URI
52+
for every service call.
53+
:type subscription_id: str
54+
:param str base_url: Service URL
55+
"""
56+
57+
def __init__(
58+
self, credentials, subscription_id, base_url=None):
59+
60+
self.config = ContainerServiceClientConfiguration(credentials, subscription_id, base_url)
61+
super(ContainerServiceClient, self).__init__(self.config.credentials, self.config)
62+
63+
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
64+
self.api_version = '2021-02-01'
65+
self._serialize = Serializer(client_models)
66+
self._deserialize = Deserializer(client_models)
67+
68+
self.operations = Operations(
69+
self._client, self.config, self._serialize, self._deserialize)
70+
self.managed_clusters = ManagedClustersOperations(
71+
self._client, self.config, self._serialize, self._deserialize)
72+
self.maintenance_configurations = MaintenanceConfigurationsOperations(
73+
self._client, self.config, self._serialize, self._deserialize)
74+
self.agent_pools = AgentPoolsOperations(
75+
self._client, self.config, self._serialize, self._deserialize)
76+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
77+
self._client, self.config, self._serialize, self._deserialize)
78+
self.private_link_resources = PrivateLinkResourcesOperations(
79+
self._client, self.config, self._serialize, self._deserialize)
80+
self.resolve_private_link_service_id = ResolvePrivateLinkServiceIdOperations(
81+
self._client, self.config, self._serialize, self._deserialize)

0 commit comments

Comments
 (0)