Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR] containerservice/resource-manager #4253

Merged
merged 11 commits into from
Mar 20, 2019
Merged
21 changes: 21 additions & 0 deletions azure-mgmt-containerservice/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,27 @@
Release History
===============

5.0.0 (2019-03-19)
++++++++++++++++++

**Features**

- Model ManagedClusterAgentPoolProfile has a new parameter min_count
- Model ManagedClusterAgentPoolProfile has a new parameter availability_zones
- Model ManagedClusterAgentPoolProfile has a new parameter type
- Model ManagedClusterAgentPoolProfile has a new parameter enable_auto_scaling
- Model ManagedClusterAgentPoolProfile has a new parameter max_count
- Model ManagedClusterAgentPoolProfile has a new parameter provisioning_state
- Model ManagedClusterAgentPoolProfile has a new parameter orchestrator_version
- Model ManagedCluster has a new parameter api_server_authorized_ip_ranges
- Model ManagedCluster has a new parameter enable_pod_security_policy
- Added operation group AgentPoolsOperations

**Breaking changes**

- Parameter count of model ManagedClusterAgentPoolProfile is now required
- Model ManagedClusterAgentPoolProfile no longer has parameter storage_profile

4.4.0 (2019-01-09)
++++++++++++++++++

Expand Down
1 change: 1 addition & 0 deletions azure-mgmt-containerservice/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
19 changes: 0 additions & 19 deletions azure-mgmt-containerservice/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.


Compatibility
=============

**IMPORTANT**: If you have an earlier version of the azure package
(version < 1.0), you should uninstall it before installing this package.

You can check the version using pip:

.. code:: shell

pip freeze

If you see azure==0.11.0 (or any version below 1.0), uninstall it first:

.. code:: shell

pip uninstall azure


Usage
=====

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,12 @@ class ContainerServiceClient(MultiApiClientMixin, SDKClient):
:type profile: dict[str, str]
"""

DEFAULT_API_VERSION = '2018-09-01'
DEFAULT_API_VERSION = '2019-02-01'
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
'open_shift_managed_clusters': '2018-09-30-preview',
'container_services': '2017-07-01',
'managed_clusters': '2018-03-31',
'operations': '2018-03-31',
None: DEFAULT_API_VERSION
}},
_PROFILE_TAG + " latest"
Expand Down Expand Up @@ -108,6 +106,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2018-03-31: :mod:`v2018_03_31.models<azure.mgmt.containerservice.v2018_03_31.models>`
* 2018-08-01-preview: :mod:`v2018_08_01_preview.models<azure.mgmt.containerservice.v2018_08_01_preview.models>`
* 2018-09-30-preview: :mod:`v2018_09_30_preview.models<azure.mgmt.containerservice.v2018_09_30_preview.models>`
* 2019-02-01: :mod:`v2019_02_01.models<azure.mgmt.containerservice.v2019_02_01.models>`
"""
if api_version == '2017-07-01':
from .v2017_07_01 import models
Expand All @@ -121,8 +120,24 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2018-09-30-preview':
from .v2018_09_30_preview import models
return models
elif api_version == '2019-02-01':
from .v2019_02_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

@property
def agent_pools(self):
"""Instance depends on the API version:

* 2019-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_02_01.operations.AgentPoolsOperations>`
"""
api_version = self._get_api_version('agent_pools')
if api_version == '2019-02-01':
from .v2019_02_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)))

@property
def container_services(self):
"""Instance depends on the API version:
Expand All @@ -142,12 +157,15 @@ def managed_clusters(self):

* 2018-03-31: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2018_03_31.operations.ManagedClustersOperations>`
* 2018-08-01-preview: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2018_08_01_preview.operations.ManagedClustersOperations>`
* 2019-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_02_01.operations.ManagedClustersOperations>`
"""
api_version = self._get_api_version('managed_clusters')
if api_version == '2018-03-31':
from .v2018_03_31.operations import ManagedClustersOperations as OperationClass
elif api_version == '2018-08-01-preview':
from .v2018_08_01_preview.operations import ManagedClustersOperations as OperationClass
elif api_version == '2019-02-01':
from .v2019_02_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)))
Expand All @@ -171,12 +189,15 @@ def operations(self):

* 2018-03-31: :class:`Operations<azure.mgmt.containerservice.v2018_03_31.operations.Operations>`
* 2018-08-01-preview: :class:`Operations<azure.mgmt.containerservice.v2018_08_01_preview.operations.Operations>`
* 2019-02-01: :class:`Operations<azure.mgmt.containerservice.v2019_02_01.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2018-03-31':
from .v2018_03_31.operations import Operations as OperationClass
elif api_version == '2018-08-01-preview':
from .v2018_08_01_preview.operations import Operations as OperationClass
elif api_version == '2019-02-01':
from .v2019_02_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)))
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class ManagedClusterAgentPoolProfile(Model):
"""

_validation = {
'name': {'required': True},
'name': {'required': True, 'pattern': r'^[a-z][a-z0-9]{0,11}$'},
'count': {'maximum': 100, 'minimum': 1},
'vm_size': {'required': True},
'storage_profile': {'readonly': True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class ManagedClusterAgentPoolProfile(Model):
"""

_validation = {
'name': {'required': True},
'name': {'required': True, 'pattern': r'^[a-z][a-z0-9]{0,11}$'},
'count': {'maximum': 100, 'minimum': 1},
'vm_size': {'required': True},
'storage_profile': {'readonly': True},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 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 .container_service_client import ContainerServiceClient
from .version import VERSION

__all__ = ['ContainerServiceClient']

__version__ = VERSION

Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# 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.service_client import SDKClient
from msrest import Serializer, Deserializer
from msrestazure import AzureConfiguration
from .version import VERSION
from .operations.operations import Operations
from .operations.managed_clusters_operations import ManagedClustersOperations
from .operations.agent_pools_operations import AgentPoolsOperations
from . import models


class ContainerServiceClientConfiguration(AzureConfiguration):
"""Configuration for ContainerServiceClient
Note that all parameters used to create this instance are saved as instance
attributes.

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param subscription_id: Subscription credentials which uniquely identify
Microsoft Azure subscription. The subscription ID forms part of the URI
for every service call.
:type subscription_id: str
:param str base_url: Service URL
"""

def __init__(
self, credentials, subscription_id, base_url=None):

if credentials is None:
raise ValueError("Parameter 'credentials' must not be None.")
if subscription_id is None:
raise ValueError("Parameter 'subscription_id' must not be None.")
if not base_url:
base_url = 'https://management.azure.com'

super(ContainerServiceClientConfiguration, self).__init__(base_url)

self.add_user_agent('azure-mgmt-containerservice/{}'.format(VERSION))
self.add_user_agent('Azure-SDK-For-Python')

self.credentials = credentials
self.subscription_id = subscription_id


class ContainerServiceClient(SDKClient):
"""The Container Service Client.

:ivar config: Configuration for client.
:vartype config: ContainerServiceClientConfiguration

:ivar operations: Operations operations
:vartype operations: azure.mgmt.containerservice.v2019_02_01.operations.Operations
:ivar managed_clusters: ManagedClusters operations
:vartype managed_clusters: azure.mgmt.containerservice.v2019_02_01.operations.ManagedClustersOperations
:ivar agent_pools: AgentPools operations
:vartype agent_pools: azure.mgmt.containerservice.v2019_02_01.operations.AgentPoolsOperations

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param subscription_id: Subscription credentials which uniquely identify
Microsoft Azure subscription. The subscription ID forms part of the URI
for every service call.
:type subscription_id: str
:param str base_url: Service URL
"""

def __init__(
self, credentials, subscription_id, base_url=None):

self.config = ContainerServiceClientConfiguration(credentials, subscription_id, base_url)
super(ContainerServiceClient, self).__init__(self.config.credentials, self.config)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
self.api_version = '2019-02-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

self.operations = Operations(
self._client, self.config, self._serialize, self._deserialize)
self.managed_clusters = ManagedClustersOperations(
self._client, self.config, self._serialize, self._deserialize)
self.agent_pools = AgentPoolsOperations(
self._client, self.config, self._serialize, self._deserialize)
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
# 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.
# --------------------------------------------------------------------------

try:
from .operation_value_py3 import OperationValue
from .resource_py3 import Resource
from .sub_resource_py3 import SubResource
from .tags_object_py3 import TagsObject
from .managed_cluster_service_principal_profile_py3 import ManagedClusterServicePrincipalProfile
from .container_service_master_profile_py3 import ContainerServiceMasterProfile
from .managed_cluster_agent_pool_profile_properties_py3 import ManagedClusterAgentPoolProfileProperties
from .managed_cluster_agent_pool_profile_py3 import ManagedClusterAgentPoolProfile
from .agent_pool_py3 import AgentPool
from .container_service_windows_profile_py3 import ContainerServiceWindowsProfile
from .container_service_ssh_public_key_py3 import ContainerServiceSshPublicKey
from .container_service_ssh_configuration_py3 import ContainerServiceSshConfiguration
from .container_service_linux_profile_py3 import ContainerServiceLinuxProfile
from .container_service_network_profile_py3 import ContainerServiceNetworkProfile
from .container_service_vm_diagnostics_py3 import ContainerServiceVMDiagnostics
from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile
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
from .managed_cluster_pool_upgrade_profile_py3 import ManagedClusterPoolUpgradeProfile
from .managed_cluster_upgrade_profile_py3 import ManagedClusterUpgradeProfile
from .credential_result_py3 import CredentialResult
from .credential_results_py3 import CredentialResults
except (SyntaxError, ImportError):
from .operation_value import OperationValue
from .resource import Resource
from .sub_resource import SubResource
from .tags_object import TagsObject
from .managed_cluster_service_principal_profile import ManagedClusterServicePrincipalProfile
from .container_service_master_profile import ContainerServiceMasterProfile
from .managed_cluster_agent_pool_profile_properties import ManagedClusterAgentPoolProfileProperties
from .managed_cluster_agent_pool_profile import ManagedClusterAgentPoolProfile
from .agent_pool import AgentPool
from .container_service_windows_profile import ContainerServiceWindowsProfile
from .container_service_ssh_public_key import ContainerServiceSshPublicKey
from .container_service_ssh_configuration import ContainerServiceSshConfiguration
from .container_service_linux_profile import ContainerServiceLinuxProfile
from .container_service_network_profile import ContainerServiceNetworkProfile
from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics
from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
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
from .managed_cluster_pool_upgrade_profile import ManagedClusterPoolUpgradeProfile
from .managed_cluster_upgrade_profile import ManagedClusterUpgradeProfile
from .credential_result import CredentialResult
from .credential_results import CredentialResults
from .operation_value_paged import OperationValuePaged
from .managed_cluster_paged import ManagedClusterPaged
from .agent_pool_paged import AgentPoolPaged
from .container_service_client_enums import (
ContainerServiceStorageProfileTypes,
ContainerServiceVMSizeTypes,
OSType,
AgentPoolType,
NetworkPlugin,
NetworkPolicy,
)

__all__ = [
'OperationValue',
'Resource',
'SubResource',
'TagsObject',
'ManagedClusterServicePrincipalProfile',
'ContainerServiceMasterProfile',
'ManagedClusterAgentPoolProfileProperties',
'ManagedClusterAgentPoolProfile',
'AgentPool',
'ContainerServiceWindowsProfile',
'ContainerServiceSshPublicKey',
'ContainerServiceSshConfiguration',
'ContainerServiceLinuxProfile',
'ContainerServiceNetworkProfile',
'ContainerServiceVMDiagnostics',
'ContainerServiceDiagnosticsProfile',
'ManagedClusterAddonProfile',
'ManagedClusterAADProfile',
'ManagedCluster',
'OrchestratorProfile',
'ManagedClusterAccessProfile',
'ManagedClusterPoolUpgradeProfile',
'ManagedClusterUpgradeProfile',
'CredentialResult',
'CredentialResults',
'OperationValuePaged',
'ManagedClusterPaged',
'AgentPoolPaged',
'ContainerServiceStorageProfileTypes',
'ContainerServiceVMSizeTypes',
'OSType',
'AgentPoolType',
'NetworkPlugin',
'NetworkPolicy',
]
Loading