[AutoPR containerservices/resource-manager] [AKS] add new 2018-03-31 API

azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py

@@ -9,12 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-import warnings
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
 from .operations.container_services_operations import ContainerServicesOperations
+from .operations.operations import Operations
 from .operations.managed_clusters_operations import ManagedClustersOperations
 from . import models
 
@@ -61,6 +61,8 @@ class ContainerServiceClient(SDKClient):
 
     :ivar container_services: ContainerServices operations
     :vartype container_services: azure.mgmt.containerservice.operations.ContainerServicesOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.containerservice.operations.Operations
     :ivar managed_clusters: ManagedClusters operations
     :vartype managed_clusters: azure.mgmt.containerservice.operations.ManagedClustersOperations
 
@@ -86,5 +88,7 @@ def __init__(
 
         self.container_services = ContainerServicesOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.operations = Operations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.managed_clusters = ManagedClustersOperations(
             self._client, self.config, self._serialize, self._deserialize)

azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py

@@ -24,6 +24,11 @@
     from .container_service_vm_diagnostics_py3 import ContainerServiceVMDiagnostics
     from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile
     from .container_service_py3 import ContainerService
+    from .compute_operation_value_py3 import ComputeOperationValue
+    from .managed_cluster_agent_pool_profile_py3 import ManagedClusterAgentPoolProfile
+    from .container_service_network_profile_py3 import ContainerServiceNetworkProfile
+    from .managed_cluster_addon_profile_py3 import ManagedClusterAddonProfile
+    from .managed_cluster_aad_profile_py3 import ManagedClusterAADProfile
     from .managed_cluster_py3 import ManagedCluster
     from .orchestrator_profile_py3 import OrchestratorProfile
     from .managed_cluster_access_profile_py3 import ManagedClusterAccessProfile
@@ -46,6 +51,11 @@
     from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics
     from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
     from .container_service import ContainerService
+    from .compute_operation_value import ComputeOperationValue
+    from .managed_cluster_agent_pool_profile import ManagedClusterAgentPoolProfile
+    from .container_service_network_profile import ContainerServiceNetworkProfile
+    from .managed_cluster_addon_profile import ManagedClusterAddonProfile
+    from .managed_cluster_aad_profile import ManagedClusterAADProfile
     from .managed_cluster import ManagedCluster
     from .orchestrator_profile import OrchestratorProfile
     from .managed_cluster_access_profile import ManagedClusterAccessProfile
@@ -54,12 +64,15 @@
     from .orchestrator_version_profile import OrchestratorVersionProfile
     from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult
 from .container_service_paged import ContainerServicePaged
+from .compute_operation_value_paged import ComputeOperationValuePaged
 from .managed_cluster_paged import ManagedClusterPaged
 from .container_service_client_enums import (
     ContainerServiceStorageProfileTypes,
     ContainerServiceVMSizeTypes,
     ContainerServiceOrchestratorTypes,
     OSType,
+    NetworkPlugin,
+    NetworkPolicy,
 )
 
 __all__ = [
@@ -77,6 +90,11 @@
     'ContainerServiceVMDiagnostics',
     'ContainerServiceDiagnosticsProfile',
     'ContainerService',
+    'ComputeOperationValue',
+    'ManagedClusterAgentPoolProfile',
+    'ContainerServiceNetworkProfile',
+    'ManagedClusterAddonProfile',
+    'ManagedClusterAADProfile',
     'ManagedCluster',
     'OrchestratorProfile',
     'ManagedClusterAccessProfile',
@@ -85,9 +103,12 @@
     'OrchestratorVersionProfile',
     'OrchestratorVersionProfileListResult',
     'ContainerServicePaged',
+    'ComputeOperationValuePaged',
     'ManagedClusterPaged',
     'ContainerServiceStorageProfileTypes',
     'ContainerServiceVMSizeTypes',
     'ContainerServiceOrchestratorTypes',
     'OSType',
+    'NetworkPlugin',
+    'NetworkPolicy',
 ]

azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py

@@ -0,0 +1,60 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None

azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py

@@ -0,0 +1,27 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.paging import Paged
+
+
+class ComputeOperationValuePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.containerservice.models.ComputeOperationValue>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)

azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py

@@ -0,0 +1,60 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py

@@ -99,8 +99,7 @@ class ContainerServiceAgentPoolProfile(Model):
     :type storage_profile: str or
      ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes
     :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet
-     identifier. If you specify either master VNet Subnet, or agent VNet
-     Subnet, you need to specify both. And they have to be in the same VNet.
+     identifier.
     :type vnet_subnet_id: str
     :param os_type: OsType to be used to specify os type. Choose from Linux
      and Windows. Default to Linux. Possible values include: 'Linux',

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py

@@ -99,8 +99,7 @@ class ContainerServiceAgentPoolProfile(Model):
     :type storage_profile: str or
      ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes
     :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet
-     identifier. If you specify either master VNet Subnet, or agent VNet
-     Subnet, you need to specify both. And they have to be in the same VNet.
+     identifier.
     :type vnet_subnet_id: str
     :param os_type: OsType to be used to specify os type. Choose from Linux
      and Windows. Default to Linux. Possible values include: 'Linux',

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py

@@ -209,3 +209,14 @@ class OSType(str, Enum):
 
     linux = "Linux"
     windows = "Windows"
+
+
+class NetworkPlugin(str, Enum):
+
+    azure = "azure"
+    kubenet = "kubenet"
+
+
+class NetworkPolicy(str, Enum):
+
+    calico = "calico"

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py

@@ -84,8 +84,7 @@ class ContainerServiceMasterProfile(Model):
      will apply the default osDisk size according to the vmSize specified.
     :type os_disk_size_gb: int
     :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet
-     identifier. If you specify either master VNet Subnet, or agent VNet
-     Subnet, you need to specify both. And they have to be in the same VNet.
+     identifier.
     :type vnet_subnet_id: str
     :param first_consecutive_static_ip: FirstConsecutiveStaticIP used to
      specify the first static ip of masters. Default value: "10.240.255.5" .

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py

@@ -84,8 +84,7 @@ class ContainerServiceMasterProfile(Model):
      will apply the default osDisk size according to the vmSize specified.
     :type os_disk_size_gb: int
     :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet
-     identifier. If you specify either master VNet Subnet, or agent VNet
-     Subnet, you need to specify both. And they have to be in the same VNet.
+     identifier.
     :type vnet_subnet_id: str
     :param first_consecutive_static_ip: FirstConsecutiveStaticIP used to
      specify the first static ip of masters. Default value: "10.240.255.5" .

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py

@@ -0,0 +1,67 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ContainerServiceNetworkProfile(Model):
+    """Profile of network configuration.
+
+    :param network_plugin: Network plugin used for building Kubernetes
+     network. Possible values include: 'azure', 'kubenet'. Default value:
+     "kubenet" .
+    :type network_plugin: str or
+     ~azure.mgmt.containerservice.models.NetworkPlugin
+    :param network_policy: Network policy used for building Kubernetes
+     network. Possible values include: 'calico'
+    :type network_policy: str or
+     ~azure.mgmt.containerservice.models.NetworkPolicy
+    :param pod_cidr: A CIDR notation IP range from which to assign pod IPs
+     when kubenet is used. Default value: "10.244.0.0/16" .
+    :type pod_cidr: str
+    :param service_cidr: A CIDR notation IP range from which to assign service
+     cluster IPs. It must not overlap with any Subnet IP ranges. Default value:
+     "10.0.0.0/16" .
+    :type service_cidr: str
+    :param dns_service_ip: An IP address assigned to the Kubernetes DNS
+     service. It must be within the Kubernetes service address range specified
+     in serviceCidr. Default value: "10.0.0.10" .
+    :type dns_service_ip: str
+    :param docker_bridge_cidr: A CIDR notation IP range assigned to the Docker
+     bridge network. It must not overlap with any Subnet IP ranges or the
+     Kubernetes service address range. Default value: "172.17.0.1/16" .
+    :type docker_bridge_cidr: str
+    """
+
+    _validation = {
+        'pod_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+        'service_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+        'dns_service_ip': {'pattern': r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'},
+        'docker_bridge_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+    }
+
+    _attribute_map = {
+        'network_plugin': {'key': 'networkPlugin', 'type': 'str'},
+        'network_policy': {'key': 'networkPolicy', 'type': 'str'},
+        'pod_cidr': {'key': 'podCidr', 'type': 'str'},
+        'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
+        'dns_service_ip': {'key': 'dnsServiceIP', 'type': 'str'},
+        'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerServiceNetworkProfile, self).__init__(**kwargs)
+        self.network_plugin = kwargs.get('network_plugin', "kubenet")
+        self.network_policy = kwargs.get('network_policy', None)
+        self.pod_cidr = kwargs.get('pod_cidr', "10.244.0.0/16")
+        self.service_cidr = kwargs.get('service_cidr', "10.0.0.0/16")
+        self.dns_service_ip = kwargs.get('dns_service_ip', "10.0.0.10")
+        self.docker_bridge_cidr = kwargs.get('docker_bridge_cidr', "172.17.0.1/16")