Skip to content

Commit 3f6238b

Browse files
dw511214992SDK AutomationAutorestCI
authored
Release for azure mgmt containerservice (#10464)
* Generated from a090a070374d722f72e06ae29f00cb3a6c565817 add balance nodegroups flag (#8571) * bump version update CHANGELOG.md * Packaging update of azure-mgmt-containerservice Co-authored-by: SDK Automation <sdkautomation@microsoft.com> Co-authored-by: Azure SDK Bot <aspysdk2@microsoft.com>
1 parent b707c55 commit 3f6238b

29 files changed

+8602
-21
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Release History
22

3+
## 9.0.0 (2020-03-24)
4+
5+
**Features**
6+
7+
- Model ManagedClusterAgentPoolProfile has a new parameter mode
8+
- Model ManagedCluster has a new parameter sku
9+
- Model OpenShiftManagedCluster has a new parameter refresh_cluster
10+
- Model ManagedClusterAADProfile has a new parameter admin_group_object_ids
11+
- Model ManagedClusterAADProfile has a new parameter managed
12+
- Model ManagedClusterAgentPoolProfileProperties has a new parameter mode
13+
- Model OpenShiftManagedClusterMasterPoolProfile has a new parameter api_properties
14+
- Model ManagedClusterPropertiesAutoScalerProfile has a new parameter balance_similar_node_groups
15+
- Model NetworkProfile has a new parameter management_subnet_cidr
16+
- Model AgentPool has a new parameter mode
17+
18+
**Breaking changes**
19+
20+
- Model OpenShiftManagedClusterMasterPoolProfile no longer has parameter name
21+
- Model OpenShiftManagedClusterMasterPoolProfile no longer has parameter os_type
22+
- Model NetworkProfile no longer has parameter peer_vnet_id
23+
324
## 8.3.0 (2020-02-14)
425

526
**Features**
Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
1-
## Microsoft Azure SDK for Python
1+
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Container Service Management Client Library.
4-
5-
Azure Resource Manager (ARM) is the next generation of management APIs
6-
that replace the old Azure Service Management (ASM).
7-
84
This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
5+
For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
96

10-
For the older Azure Service Management (ASM) libraries, see
11-
[azure-servicemanagement-legacy](https://pypi.python.org/pypi/azure-servicemanagement-legacy)
12-
library.
13-
14-
For a more complete set of Azure libraries, see the
15-
[azure](https://pypi.python.org/pypi/azure) bundle package.
167

17-
## Usage
8+
# Usage
189

19-
For code examples, see [Container Service
20-
Management](https://docs.microsoft.com/python/api/overview/azure/containerservice)
10+
For code examples, see [Container Service Management](https://docs.microsoft.com/python/api/overview/azure/containerservice)
2111
on docs.microsoft.com.
2212

23-
## Provide Feedback
2413

25-
If you encounter any bugs or have suggestions, please file an issue in
26-
the [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
14+
# Provide Feedback
15+
16+
If you encounter any bugs or have suggestions, please file an issue in the
17+
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
2718
section of the project.
2819

29-
![image](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-containerservice%2FREADME.png)
20+
21+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-containerservice%2FREADME.png)

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

Lines changed: 21 additions & 1 deletion
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-02-01'
49+
DEFAULT_API_VERSION = '2020-03-01'
5050
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
5151
LATEST_PROFILE = ProfileDefinition({
5252
_PROFILE_TAG: {
@@ -85,9 +85,11 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8585
* 2019-08-01: :mod:`v2019_08_01.models<azure.mgmt.containerservice.v2019_08_01.models>`
8686
* 2019-09-30-preview: :mod:`v2019_09_30_preview.models<azure.mgmt.containerservice.v2019_09_30_preview.models>`
8787
* 2019-10-01: :mod:`v2019_10_01.models<azure.mgmt.containerservice.v2019_10_01.models>`
88+
* 2019-10-27-preview: :mod:`v2019_10_27_preview.models<azure.mgmt.containerservice.v2019_10_27_preview.models>`
8889
* 2019-11-01: :mod:`v2019_11_01.models<azure.mgmt.containerservice.v2019_11_01.models>`
8990
* 2020-01-01: :mod:`v2020_01_01.models<azure.mgmt.containerservice.v2020_01_01.models>`
9091
* 2020-02-01: :mod:`v2020_02_01.models<azure.mgmt.containerservice.v2020_02_01.models>`
92+
* 2020-03-01: :mod:`v2020_03_01.models<azure.mgmt.containerservice.v2020_03_01.models>`
9193
"""
9294
if api_version == '2017-07-01':
9395
from .v2017_07_01 import models
@@ -122,6 +124,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
122124
elif api_version == '2019-10-01':
123125
from .v2019_10_01 import models
124126
return models
127+
elif api_version == '2019-10-27-preview':
128+
from .v2019_10_27_preview import models
129+
return models
125130
elif api_version == '2019-11-01':
126131
from .v2019_11_01 import models
127132
return models
@@ -131,6 +136,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
131136
elif api_version == '2020-02-01':
132137
from .v2020_02_01 import models
133138
return models
139+
elif api_version == '2020-03-01':
140+
from .v2020_03_01 import models
141+
return models
134142
raise NotImplementedError("APIVersion {} is not available".format(api_version))
135143

136144
@property
@@ -145,6 +153,7 @@ def agent_pools(self):
145153
* 2019-11-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_11_01.operations.AgentPoolsOperations>`
146154
* 2020-01-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_01_01.operations.AgentPoolsOperations>`
147155
* 2020-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_02_01.operations.AgentPoolsOperations>`
156+
* 2020-03-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_03_01.operations.AgentPoolsOperations>`
148157
"""
149158
api_version = self._get_api_version('agent_pools')
150159
if api_version == '2019-02-01':
@@ -163,6 +172,8 @@ def agent_pools(self):
163172
from .v2020_01_01.operations import AgentPoolsOperations as OperationClass
164173
elif api_version == '2020-02-01':
165174
from .v2020_02_01.operations import AgentPoolsOperations as OperationClass
175+
elif api_version == '2020-03-01':
176+
from .v2020_03_01.operations import AgentPoolsOperations as OperationClass
166177
else:
167178
raise NotImplementedError("APIVersion {} is not available".format(api_version))
168179
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -194,6 +205,7 @@ def managed_clusters(self):
194205
* 2019-11-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_11_01.operations.ManagedClustersOperations>`
195206
* 2020-01-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_01_01.operations.ManagedClustersOperations>`
196207
* 2020-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_02_01.operations.ManagedClustersOperations>`
208+
* 2020-03-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_03_01.operations.ManagedClustersOperations>`
197209
"""
198210
api_version = self._get_api_version('managed_clusters')
199211
if api_version == '2018-03-31':
@@ -216,6 +228,8 @@ def managed_clusters(self):
216228
from .v2020_01_01.operations import ManagedClustersOperations as OperationClass
217229
elif api_version == '2020-02-01':
218230
from .v2020_02_01.operations import ManagedClustersOperations as OperationClass
231+
elif api_version == '2020-03-01':
232+
from .v2020_03_01.operations import ManagedClustersOperations as OperationClass
219233
else:
220234
raise NotImplementedError("APIVersion {} is not available".format(api_version))
221235
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -227,6 +241,7 @@ def open_shift_managed_clusters(self):
227241
* 2018-09-30-preview: :class:`OpenShiftManagedClustersOperations<azure.mgmt.containerservice.v2018_09_30_preview.operations.OpenShiftManagedClustersOperations>`
228242
* 2019-04-30: :class:`OpenShiftManagedClustersOperations<azure.mgmt.containerservice.v2019_04_30.operations.OpenShiftManagedClustersOperations>`
229243
* 2019-09-30-preview: :class:`OpenShiftManagedClustersOperations<azure.mgmt.containerservice.v2019_09_30_preview.operations.OpenShiftManagedClustersOperations>`
244+
* 2019-10-27-preview: :class:`OpenShiftManagedClustersOperations<azure.mgmt.containerservice.v2019_10_27_preview.operations.OpenShiftManagedClustersOperations>`
230245
"""
231246
api_version = self._get_api_version('open_shift_managed_clusters')
232247
if api_version == '2018-09-30-preview':
@@ -235,6 +250,8 @@ def open_shift_managed_clusters(self):
235250
from .v2019_04_30.operations import OpenShiftManagedClustersOperations as OperationClass
236251
elif api_version == '2019-09-30-preview':
237252
from .v2019_09_30_preview.operations import OpenShiftManagedClustersOperations as OperationClass
253+
elif api_version == '2019-10-27-preview':
254+
from .v2019_10_27_preview.operations import OpenShiftManagedClustersOperations as OperationClass
238255
else:
239256
raise NotImplementedError("APIVersion {} is not available".format(api_version))
240257
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -253,6 +270,7 @@ def operations(self):
253270
* 2019-11-01: :class:`Operations<azure.mgmt.containerservice.v2019_11_01.operations.Operations>`
254271
* 2020-01-01: :class:`Operations<azure.mgmt.containerservice.v2020_01_01.operations.Operations>`
255272
* 2020-02-01: :class:`Operations<azure.mgmt.containerservice.v2020_02_01.operations.Operations>`
273+
* 2020-03-01: :class:`Operations<azure.mgmt.containerservice.v2020_03_01.operations.Operations>`
256274
"""
257275
api_version = self._get_api_version('operations')
258276
if api_version == '2018-03-31':
@@ -275,6 +293,8 @@ def operations(self):
275293
from .v2020_01_01.operations import Operations as OperationClass
276294
elif api_version == '2020-02-01':
277295
from .v2020_02_01.operations import Operations as OperationClass
296+
elif api_version == '2020-03-01':
297+
from .v2020_03_01.operations import Operations as OperationClass
278298
else:
279299
raise NotImplementedError("APIVersion {} is not available".format(api_version))
280300
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

Lines changed: 1 addition & 1 deletion
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_02_01.models import *
9+
from .v2020_03_01.models import *
Lines changed: 19 additions & 0 deletions
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+
Lines changed: 50 additions & 0 deletions
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,51 @@
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 OpenShiftManagedClustersOperations
17+
from . import models
18+
19+
20+
class ContainerServiceClient(SDKClient):
21+
"""The Container Service Client.
22+
23+
:ivar config: Configuration for client.
24+
:vartype config: ContainerServiceClientConfiguration
25+
26+
:ivar open_shift_managed_clusters: OpenShiftManagedClusters operations
27+
:vartype open_shift_managed_clusters: azure.mgmt.containerservice.v2019_10_27_preview.operations.OpenShiftManagedClustersOperations
28+
29+
:param credentials: Credentials needed for the client to connect to Azure.
30+
:type credentials: :mod:`A msrestazure Credentials
31+
object<msrestazure.azure_active_directory>`
32+
:param subscription_id: Subscription credentials which uniquely identify
33+
Microsoft Azure subscription. The subscription ID forms part of the URI
34+
for every service call.
35+
:type subscription_id: str
36+
:param str base_url: Service URL
37+
"""
38+
39+
def __init__(
40+
self, credentials, subscription_id, base_url=None):
41+
42+
self.config = ContainerServiceClientConfiguration(credentials, subscription_id, base_url)
43+
super(ContainerServiceClient, self).__init__(self.config.credentials, self.config)
44+
45+
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
46+
self.api_version = '2019-10-27-preview'
47+
self._serialize = Serializer(client_models)
48+
self._deserialize = Deserializer(client_models)
49+
50+
self.open_shift_managed_clusters = OpenShiftManagedClustersOperations(
51+
self._client, self.config, self._serialize, self._deserialize)
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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+
try:
13+
from ._models_py3 import NetworkProfile
14+
from ._models_py3 import OpenShiftAPIProperties
15+
from ._models_py3 import OpenShiftManagedCluster
16+
from ._models_py3 import OpenShiftManagedClusterAADIdentityProvider
17+
from ._models_py3 import OpenShiftManagedClusterAgentPoolProfile
18+
from ._models_py3 import OpenShiftManagedClusterAuthProfile
19+
from ._models_py3 import OpenShiftManagedClusterBaseIdentityProvider
20+
from ._models_py3 import OpenShiftManagedClusterIdentityProvider
21+
from ._models_py3 import OpenShiftManagedClusterMasterPoolProfile
22+
from ._models_py3 import OpenShiftManagedClusterMonitorProfile
23+
from ._models_py3 import OpenShiftRouterProfile
24+
from ._models_py3 import PurchasePlan
25+
from ._models_py3 import Resource
26+
from ._models_py3 import TagsObject
27+
except (SyntaxError, ImportError):
28+
from ._models import NetworkProfile
29+
from ._models import OpenShiftAPIProperties
30+
from ._models import OpenShiftManagedCluster
31+
from ._models import OpenShiftManagedClusterAADIdentityProvider
32+
from ._models import OpenShiftManagedClusterAgentPoolProfile
33+
from ._models import OpenShiftManagedClusterAuthProfile
34+
from ._models import OpenShiftManagedClusterBaseIdentityProvider
35+
from ._models import OpenShiftManagedClusterIdentityProvider
36+
from ._models import OpenShiftManagedClusterMasterPoolProfile
37+
from ._models import OpenShiftManagedClusterMonitorProfile
38+
from ._models import OpenShiftRouterProfile
39+
from ._models import PurchasePlan
40+
from ._models import Resource
41+
from ._models import TagsObject
42+
from ._paged_models import OpenShiftManagedClusterPaged
43+
from ._container_service_client_enums import (
44+
OSType,
45+
OpenShiftContainerServiceVMSize,
46+
OpenShiftAgentPoolProfileRole,
47+
)
48+
49+
__all__ = [
50+
'NetworkProfile',
51+
'OpenShiftAPIProperties',
52+
'OpenShiftManagedCluster',
53+
'OpenShiftManagedClusterAADIdentityProvider',
54+
'OpenShiftManagedClusterAgentPoolProfile',
55+
'OpenShiftManagedClusterAuthProfile',
56+
'OpenShiftManagedClusterBaseIdentityProvider',
57+
'OpenShiftManagedClusterIdentityProvider',
58+
'OpenShiftManagedClusterMasterPoolProfile',
59+
'OpenShiftManagedClusterMonitorProfile',
60+
'OpenShiftRouterProfile',
61+
'PurchasePlan',
62+
'Resource',
63+
'TagsObject',
64+
'OpenShiftManagedClusterPaged',
65+
'OSType',
66+
'OpenShiftContainerServiceVMSize',
67+
'OpenShiftAgentPoolProfileRole',
68+
]

0 commit comments

Comments
 (0)