Skip to content

Commit 516aae3

Browse files
LianwMS00Kai0
LianwMS
and
00Kai0
authored
Release azure-mgmt-containerservice 9.1.0 (Azure#11876)
* Release azure-mgmt-containerservice 9.1.0 fix description * fix test (#2) Co-authored-by: Kerwin Sun <[email protected]>
1 parent 7b911bf commit 516aae3

28 files changed

+8427
-1774
lines changed

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

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

3+
## 9.1.0 (2020-06-03)
4+
5+
**Features**
6+
7+
- Model AgentPool has a new parameter node_image_version
8+
- Model AgentPool has a new parameter upgrade_settings
9+
- Model AgentPoolUpgradeProfile has a new parameter latest_node_image_version
10+
- Model ManagedClusterAgentPoolProfile has a new parameter node_image_version
11+
- Model ManagedClusterAgentPoolProfile has a new parameter upgrade_settings
12+
- Model ManagedClusterAgentPoolProfileProperties has a new parameter node_image_version
13+
- Model ManagedClusterAgentPoolProfileProperties has a new parameter upgrade_settings
14+
315
## 9.0.1 (2020-04-09)
416

517
**Bugfixes**

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

Lines changed: 14 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-03-01'
49+
DEFAULT_API_VERSION = '2020-04-01'
5050
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
5151
LATEST_PROFILE = ProfileDefinition({
5252
_PROFILE_TAG: {
@@ -90,6 +90,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
9090
* 2020-01-01: :mod:`v2020_01_01.models<azure.mgmt.containerservice.v2020_01_01.models>`
9191
* 2020-02-01: :mod:`v2020_02_01.models<azure.mgmt.containerservice.v2020_02_01.models>`
9292
* 2020-03-01: :mod:`v2020_03_01.models<azure.mgmt.containerservice.v2020_03_01.models>`
93+
* 2020-04-01: :mod:`v2020_04_01.models<azure.mgmt.containerservice.v2020_04_01.models>`
9394
"""
9495
if api_version == '2017-07-01':
9596
from .v2017_07_01 import models
@@ -139,6 +140,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
139140
elif api_version == '2020-03-01':
140141
from .v2020_03_01 import models
141142
return models
143+
elif api_version == '2020-04-01':
144+
from .v2020_04_01 import models
145+
return models
142146
raise NotImplementedError("APIVersion {} is not available".format(api_version))
143147

144148
@property
@@ -154,6 +158,7 @@ def agent_pools(self):
154158
* 2020-01-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_01_01.operations.AgentPoolsOperations>`
155159
* 2020-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_02_01.operations.AgentPoolsOperations>`
156160
* 2020-03-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_03_01.operations.AgentPoolsOperations>`
161+
* 2020-04-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_04_01.operations.AgentPoolsOperations>`
157162
"""
158163
api_version = self._get_api_version('agent_pools')
159164
if api_version == '2019-02-01':
@@ -174,6 +179,8 @@ def agent_pools(self):
174179
from .v2020_02_01.operations import AgentPoolsOperations as OperationClass
175180
elif api_version == '2020-03-01':
176181
from .v2020_03_01.operations import AgentPoolsOperations as OperationClass
182+
elif api_version == '2020-04-01':
183+
from .v2020_04_01.operations import AgentPoolsOperations as OperationClass
177184
else:
178185
raise NotImplementedError("APIVersion {} is not available".format(api_version))
179186
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -206,6 +213,7 @@ def managed_clusters(self):
206213
* 2020-01-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_01_01.operations.ManagedClustersOperations>`
207214
* 2020-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_02_01.operations.ManagedClustersOperations>`
208215
* 2020-03-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_03_01.operations.ManagedClustersOperations>`
216+
* 2020-04-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_04_01.operations.ManagedClustersOperations>`
209217
"""
210218
api_version = self._get_api_version('managed_clusters')
211219
if api_version == '2018-03-31':
@@ -230,6 +238,8 @@ def managed_clusters(self):
230238
from .v2020_02_01.operations import ManagedClustersOperations as OperationClass
231239
elif api_version == '2020-03-01':
232240
from .v2020_03_01.operations import ManagedClustersOperations as OperationClass
241+
elif api_version == '2020-04-01':
242+
from .v2020_04_01.operations import ManagedClustersOperations as OperationClass
233243
else:
234244
raise NotImplementedError("APIVersion {} is not available".format(api_version))
235245
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -271,6 +281,7 @@ def operations(self):
271281
* 2020-01-01: :class:`Operations<azure.mgmt.containerservice.v2020_01_01.operations.Operations>`
272282
* 2020-02-01: :class:`Operations<azure.mgmt.containerservice.v2020_02_01.operations.Operations>`
273283
* 2020-03-01: :class:`Operations<azure.mgmt.containerservice.v2020_03_01.operations.Operations>`
284+
* 2020-04-01: :class:`Operations<azure.mgmt.containerservice.v2020_04_01.operations.Operations>`
274285
"""
275286
api_version = self._get_api_version('operations')
276287
if api_version == '2018-03-31':
@@ -295,6 +306,8 @@ def operations(self):
295306
from .v2020_02_01.operations import Operations as OperationClass
296307
elif api_version == '2020-03-01':
297308
from .v2020_03_01.operations import Operations as OperationClass
309+
elif api_version == '2020-04-01':
310+
from .v2020_04_01.operations import Operations as OperationClass
298311
else:
299312
raise NotImplementedError("APIVersion {} is not available".format(api_version))
300313
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_03_01.models import *
9+
from .v2020_04_01.models import *

‎sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01/models/_models.py

Lines changed: 56 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -53,34 +53,32 @@ class AgentPool(SubResource):
5353
Variables are only populated by the server, and will be ignored when
5454
sending a request.
5555
56-
All required parameters must be populated in order to send to Azure.
57-
5856
:ivar id: Resource ID.
5957
:vartype id: str
6058
:ivar name: The name of the resource that is unique within a resource
6159
group. This name can be used to access the resource.
6260
:vartype name: str
6361
:ivar type: Resource type
6462
:vartype type: str
65-
:param count: Required. Number of agents (VMs) to host docker containers.
66-
Allowed values must be in the range of 1 to 100 (inclusive). The default
67-
value is 1. . Default value: 1 .
63+
:param count: Number of agents (VMs) to host docker containers. Allowed
64+
values must be in the range of 1 to 100 (inclusive). The default value is
65+
1.
6866
:type count: int
69-
:param vm_size: Required. Size of agent VMs. Possible values include:
70-
'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
71-
'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
72-
'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
73-
'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
74-
'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
75-
'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
76-
'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
77-
'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
78-
'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
79-
'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
80-
'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
81-
'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
82-
'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
83-
'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
67+
:param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
68+
'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
69+
'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
70+
'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
71+
'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
72+
'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
73+
'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
74+
'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
75+
'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
76+
'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
77+
'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
78+
'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
79+
'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
80+
'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
81+
'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
8482
'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
8583
'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
8684
'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -180,8 +178,6 @@ class AgentPool(SubResource):
180178
'id': {'readonly': True},
181179
'name': {'readonly': True},
182180
'type': {'readonly': True},
183-
'count': {'required': True, 'maximum': 100, 'minimum': 1},
184-
'vm_size': {'required': True},
185181
'provisioning_state': {'readonly': True},
186182
}
187183

@@ -212,7 +208,7 @@ class AgentPool(SubResource):
212208

213209
def __init__(self, **kwargs):
214210
super(AgentPool, self).__init__(**kwargs)
215-
self.count = kwargs.get('count', 1)
211+
self.count = kwargs.get('count', None)
216212
self.vm_size = kwargs.get('vm_size', None)
217213
self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None)
218214
self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None)
@@ -1154,27 +1150,25 @@ class ManagedClusterAgentPoolProfileProperties(Model):
11541150
Variables are only populated by the server, and will be ignored when
11551151
sending a request.
11561152
1157-
All required parameters must be populated in order to send to Azure.
1158-
1159-
:param count: Required. Number of agents (VMs) to host docker containers.
1160-
Allowed values must be in the range of 1 to 100 (inclusive). The default
1161-
value is 1. . Default value: 1 .
1153+
:param count: Number of agents (VMs) to host docker containers. Allowed
1154+
values must be in the range of 1 to 100 (inclusive). The default value is
1155+
1.
11621156
:type count: int
1163-
:param vm_size: Required. Size of agent VMs. Possible values include:
1164-
'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
1165-
'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
1166-
'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
1167-
'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
1168-
'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
1169-
'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
1170-
'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
1171-
'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
1172-
'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
1173-
'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
1174-
'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
1175-
'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
1176-
'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
1177-
'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
1157+
:param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
1158+
'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
1159+
'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
1160+
'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
1161+
'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
1162+
'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
1163+
'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
1164+
'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
1165+
'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
1166+
'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
1167+
'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
1168+
'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
1169+
'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
1170+
'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
1171+
'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
11781172
'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
11791173
'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
11801174
'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -1271,8 +1265,6 @@ class ManagedClusterAgentPoolProfileProperties(Model):
12711265
"""
12721266

12731267
_validation = {
1274-
'count': {'required': True, 'maximum': 100, 'minimum': 1},
1275-
'vm_size': {'required': True},
12761268
'provisioning_state': {'readonly': True},
12771269
}
12781270

@@ -1300,7 +1292,7 @@ class ManagedClusterAgentPoolProfileProperties(Model):
13001292

13011293
def __init__(self, **kwargs):
13021294
super(ManagedClusterAgentPoolProfileProperties, self).__init__(**kwargs)
1303-
self.count = kwargs.get('count', 1)
1295+
self.count = kwargs.get('count', None)
13041296
self.vm_size = kwargs.get('vm_size', None)
13051297
self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None)
13061298
self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None)
@@ -1329,25 +1321,25 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
13291321
13301322
All required parameters must be populated in order to send to Azure.
13311323
1332-
:param count: Required. Number of agents (VMs) to host docker containers.
1333-
Allowed values must be in the range of 1 to 100 (inclusive). The default
1334-
value is 1. . Default value: 1 .
1324+
:param count: Number of agents (VMs) to host docker containers. Allowed
1325+
values must be in the range of 1 to 100 (inclusive). The default value is
1326+
1.
13351327
:type count: int
1336-
:param vm_size: Required. Size of agent VMs. Possible values include:
1337-
'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
1338-
'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
1339-
'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
1340-
'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
1341-
'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
1342-
'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
1343-
'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
1344-
'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
1345-
'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
1346-
'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
1347-
'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
1348-
'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
1349-
'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
1350-
'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
1328+
:param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
1329+
'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
1330+
'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
1331+
'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
1332+
'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
1333+
'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
1334+
'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
1335+
'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
1336+
'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
1337+
'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
1338+
'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
1339+
'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
1340+
'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
1341+
'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
1342+
'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
13511343
'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
13521344
'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
13531345
'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -1447,8 +1439,6 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
14471439
"""
14481440

14491441
_validation = {
1450-
'count': {'required': True, 'maximum': 100, 'minimum': 1},
1451-
'vm_size': {'required': True},
14521442
'provisioning_state': {'readonly': True},
14531443
'name': {'required': True, 'pattern': r'^[a-z][a-z0-9]{0,11}$'},
14541444
}

0 commit comments

Comments
 (0)