Generated from 65254e4f5268ef47c6b0a91715f4cd3215e6228d

fix description
AzureSDKAutomation · May 28, 2020 · ade4cf6 · ade4cf6
1 parent adf6471
commit ade4cf6
Show file tree

Hide file tree

Showing 24 changed files with 7,083 additions and 535 deletions.
diff --git a/...vice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py b/...vice/azure-mgmt-containerservice/azure/mgmt/containerservice/_container_service_client.py
@@ -46,7 +46,7 @@ class ContainerServiceClient(MultiApiClientMixin, SDKClient):
     :type profile: azure.profiles.KnownProfiles
     """
 
-    DEFAULT_API_VERSION = '2020-03-01'
+    DEFAULT_API_VERSION = '2020-04-01'
     _PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -90,6 +90,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2020-01-01: :mod:`v2020_01_01.models<azure.mgmt.containerservice.v2020_01_01.models>`
            * 2020-02-01: :mod:`v2020_02_01.models<azure.mgmt.containerservice.v2020_02_01.models>`
            * 2020-03-01: :mod:`v2020_03_01.models<azure.mgmt.containerservice.v2020_03_01.models>`
+           * 2020-04-01: :mod:`v2020_04_01.models<azure.mgmt.containerservice.v2020_04_01.models>`
         """
         if api_version == '2017-07-01':
             from .v2017_07_01 import models
@@ -139,6 +140,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2020-03-01':
             from .v2020_03_01 import models
             return models
+        elif api_version == '2020-04-01':
+            from .v2020_04_01 import models
+            return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
 
     @property
@@ -154,6 +158,7 @@ def agent_pools(self):
            * 2020-01-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_01_01.operations.AgentPoolsOperations>`
            * 2020-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_02_01.operations.AgentPoolsOperations>`
            * 2020-03-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_03_01.operations.AgentPoolsOperations>`
+           * 2020-04-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_04_01.operations.AgentPoolsOperations>`
         """
         api_version = self._get_api_version('agent_pools')
         if api_version == '2019-02-01':
@@ -174,6 +179,8 @@ def agent_pools(self):
             from .v2020_02_01.operations import AgentPoolsOperations as OperationClass
         elif api_version == '2020-03-01':
             from .v2020_03_01.operations import AgentPoolsOperations as OperationClass
+        elif api_version == '2020-04-01':
+            from .v2020_04_01.operations import AgentPoolsOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         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):
            * 2020-01-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_01_01.operations.ManagedClustersOperations>`
            * 2020-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_02_01.operations.ManagedClustersOperations>`
            * 2020-03-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_03_01.operations.ManagedClustersOperations>`
+           * 2020-04-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_04_01.operations.ManagedClustersOperations>`
         """
         api_version = self._get_api_version('managed_clusters')
         if api_version == '2018-03-31':
@@ -230,6 +238,8 @@ def managed_clusters(self):
             from .v2020_02_01.operations import ManagedClustersOperations as OperationClass
         elif api_version == '2020-03-01':
             from .v2020_03_01.operations import ManagedClustersOperations as OperationClass
+        elif api_version == '2020-04-01':
+            from .v2020_04_01.operations import ManagedClustersOperations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         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):
            * 2020-01-01: :class:`Operations<azure.mgmt.containerservice.v2020_01_01.operations.Operations>`
            * 2020-02-01: :class:`Operations<azure.mgmt.containerservice.v2020_02_01.operations.Operations>`
            * 2020-03-01: :class:`Operations<azure.mgmt.containerservice.v2020_03_01.operations.Operations>`
+           * 2020-04-01: :class:`Operations<azure.mgmt.containerservice.v2020_04_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2018-03-31':
@@ -295,6 +306,8 @@ def operations(self):
             from .v2020_02_01.operations import Operations as OperationClass
         elif api_version == '2020-03-01':
             from .v2020_03_01.operations import Operations as OperationClass
+        elif api_version == '2020-04-01':
+            from .v2020_04_01.operations import Operations as OperationClass
         else:
             raise NotImplementedError("APIVersion {} is not available".format(api_version))
         return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
diff --git a/sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/models.py b/sdk/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/models.py
@@ -6,4 +6,4 @@
 # --------------------------------------------------------------------------
 from .v2017_07_01.models import *
 from .v2019_04_30.models import *
-from .v2020_03_01.models import *
+from .v2020_04_01.models import *
diff --git a/...ice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01/models/_models.py b/...ice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_11_01/models/_models.py
@@ -53,34 +53,32 @@ class AgentPool(SubResource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    All required parameters must be populated in order to send to Azure.
-
     :ivar id: Resource ID.
     :vartype id: str
     :ivar name: The name of the resource that is unique within a resource
      group. This name can be used to access the resource.
     :vartype name: str
     :ivar type: Resource type
     :vartype type: str
-    :param count: Required. Number of agents (VMs) to host docker containers.
-     Allowed values must be in the range of 1 to 100 (inclusive). The default
-     value is 1. . Default value: 1 .
+    :param count: Number of agents (VMs) to host docker containers. Allowed
+     values must be in the range of 1 to 100 (inclusive). The default value is
+     1.
     :type count: int
-    :param vm_size: Required. Size of agent VMs. Possible values include:
-     'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
-     'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
-     'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
-     'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
-     'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
-     'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
-     'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
-     'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
-     'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
-     'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
-     'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
-     'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
-     'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
-     'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+    :param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
+     'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
      'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
      'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
      'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -180,8 +178,6 @@ class AgentPool(SubResource):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'count': {'required': True, 'maximum': 100, 'minimum': 1},
-        'vm_size': {'required': True},
         'provisioning_state': {'readonly': True},
     }
 
@@ -212,7 +208,7 @@ class AgentPool(SubResource):
 
     def __init__(self, **kwargs):
         super(AgentPool, self).__init__(**kwargs)
-        self.count = kwargs.get('count', 1)
+        self.count = kwargs.get('count', None)
         self.vm_size = kwargs.get('vm_size', None)
         self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None)
         self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None)
@@ -1154,27 +1150,25 @@ class ManagedClusterAgentPoolProfileProperties(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    All required parameters must be populated in order to send to Azure.
-
-    :param count: Required. Number of agents (VMs) to host docker containers.
-     Allowed values must be in the range of 1 to 100 (inclusive). The default
-     value is 1. . Default value: 1 .
+    :param count: Number of agents (VMs) to host docker containers. Allowed
+     values must be in the range of 1 to 100 (inclusive). The default value is
+     1.
     :type count: int
-    :param vm_size: Required. Size of agent VMs. Possible values include:
-     'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
-     'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
-     'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
-     'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
-     'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
-     'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
-     'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
-     'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
-     'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
-     'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
-     'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
-     'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
-     'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
-     'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+    :param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
+     'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
      'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
      'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
      'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -1271,8 +1265,6 @@ class ManagedClusterAgentPoolProfileProperties(Model):
     """
 
     _validation = {
-        'count': {'required': True, 'maximum': 100, 'minimum': 1},
-        'vm_size': {'required': True},
         'provisioning_state': {'readonly': True},
     }
 
@@ -1300,7 +1292,7 @@ class ManagedClusterAgentPoolProfileProperties(Model):
 
     def __init__(self, **kwargs):
         super(ManagedClusterAgentPoolProfileProperties, self).__init__(**kwargs)
-        self.count = kwargs.get('count', 1)
+        self.count = kwargs.get('count', None)
         self.vm_size = kwargs.get('vm_size', None)
         self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None)
         self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None)
@@ -1329,25 +1321,25 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param count: Required. Number of agents (VMs) to host docker containers.
-     Allowed values must be in the range of 1 to 100 (inclusive). The default
-     value is 1. . Default value: 1 .
+    :param count: Number of agents (VMs) to host docker containers. Allowed
+     values must be in the range of 1 to 100 (inclusive). The default value is
+     1.
     :type count: int
-    :param vm_size: Required. Size of agent VMs. Possible values include:
-     'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
-     'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
-     'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5',
-     'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2',
-     'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s',
-     'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11',
-     'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12',
-     'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13',
-     'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14',
-     'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
-     'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2',
-     'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3',
-     'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3',
-     'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
+    :param vm_size: Size of agent VMs. Possible values include: 'Standard_A1',
+     'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2',
+     'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4',
+     'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
+     'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2',
+     'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms',
+     'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2',
+     'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
+     'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2',
+     'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2',
+     'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3',
+     'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
+     'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3',
+     'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2',
+     'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
      'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3',
      'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3',
      'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1',
@@ -1447,8 +1439,6 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
     """
 
     _validation = {
-        'count': {'required': True, 'maximum': 100, 'minimum': 1},
-        'vm_size': {'required': True},
         'provisioning_state': {'readonly': True},
         'name': {'required': True, 'pattern': r'^[a-z][a-z0-9]{0,11}$'},
     }