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 #6756

Merged
merged 3 commits into from
Aug 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions sdk/containerservice/azure-mgmt-containerservice/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
Release History
===============

7.0.0 (2019-08-30)
++++++++++++++++++

**Features**

- Model ContainerServiceNetworkProfile has a new parameter load_balancer_profile
- Model ManagedCluster has a new parameter api_server_access_profile

**Breaking changes**

- Model ManagedCluster no longer has parameter api_server_authorized_ip_ranges

6.0.0 (2019-06-20)
++++++++++++++++++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure Container Service Management Client Library.
Azure Resource Manager (ARM) is the next generation of management APIs that
replace the old Azure Service Management (ASM).

This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
This package has been tested with Python 2.7, 3.5, 3.6 and 3.7.

For the older Azure Service Management (ASM) libraries, see
`azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ContainerServiceClient(MultiApiClientMixin, SDKClient):
:type profile: azure.profiles.KnownProfiles
"""

DEFAULT_API_VERSION = '2019-06-01'
DEFAULT_API_VERSION = '2019-08-01'
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
Expand Down Expand Up @@ -82,6 +82,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2019-04-01: :mod:`v2019_04_01.models<azure.mgmt.containerservice.v2019_04_01.models>`
* 2019-04-30: :mod:`v2019_04_30.models<azure.mgmt.containerservice.v2019_04_30.models>`
* 2019-06-01: :mod:`v2019_06_01.models<azure.mgmt.containerservice.v2019_06_01.models>`
* 2019-08-01: :mod:`v2019_08_01.models<azure.mgmt.containerservice.v2019_08_01.models>`
"""
if api_version == '2017-07-01':
from .v2017_07_01 import models
Expand All @@ -107,6 +108,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2019-06-01':
from .v2019_06_01 import models
return models
elif api_version == '2019-08-01':
from .v2019_08_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

@property
Expand All @@ -116,6 +120,7 @@ def agent_pools(self):
* 2019-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_02_01.operations.AgentPoolsOperations>`
* 2019-04-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_04_01.operations.AgentPoolsOperations>`
* 2019-06-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_06_01.operations.AgentPoolsOperations>`
* 2019-08-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2019_08_01.operations.AgentPoolsOperations>`
"""
api_version = self._get_api_version('agent_pools')
if api_version == '2019-02-01':
Expand All @@ -124,6 +129,8 @@ def agent_pools(self):
from .v2019_04_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2019-08-01':
from .v2019_08_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)))
Expand All @@ -150,6 +157,7 @@ def managed_clusters(self):
* 2019-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_02_01.operations.ManagedClustersOperations>`
* 2019-04-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_04_01.operations.ManagedClustersOperations>`
* 2019-06-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_06_01.operations.ManagedClustersOperations>`
* 2019-08-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2019_08_01.operations.ManagedClustersOperations>`
"""
api_version = self._get_api_version('managed_clusters')
if api_version == '2018-03-31':
Expand All @@ -162,6 +170,8 @@ def managed_clusters(self):
from .v2019_04_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2019-08-01':
from .v2019_08_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 Down Expand Up @@ -191,6 +201,7 @@ def operations(self):
* 2019-02-01: :class:`Operations<azure.mgmt.containerservice.v2019_02_01.operations.Operations>`
* 2019-04-01: :class:`Operations<azure.mgmt.containerservice.v2019_04_01.operations.Operations>`
* 2019-06-01: :class:`Operations<azure.mgmt.containerservice.v2019_06_01.operations.Operations>`
* 2019-08-01: :class:`Operations<azure.mgmt.containerservice.v2019_08_01.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2018-03-31':
Expand All @@ -203,6 +214,8 @@ def operations(self):
from .v2019_04_01.operations import Operations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import Operations as OperationClass
elif api_version == '2019-08-01':
from .v2019_08_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 @@ -6,4 +6,4 @@
# --------------------------------------------------------------------------
from .v2017_07_01.models import *
from .v2019_04_30.models import *
from .v2019_06_01.models import *
from .v2019_08_01.models import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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 ._configuration import ContainerServiceClientConfiguration
from ._container_service_client import ContainerServiceClient
__all__ = ['ContainerServiceClient', 'ContainerServiceClientConfiguration']

from .version import VERSION

__version__ = VERSION

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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 msrestazure import AzureConfiguration

from .version import VERSION


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)

# Starting Autorest.Python 4.0.64, make connection pool activated by default
self.keep_alive = True

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
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# 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 ._configuration import ContainerServiceClientConfiguration
from .operations import Operations
from .operations import ManagedClustersOperations
from .operations import AgentPoolsOperations
from . import models


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_08_01.operations.Operations
:ivar managed_clusters: ManagedClusters operations
:vartype managed_clusters: azure.mgmt.containerservice.v2019_08_01.operations.ManagedClustersOperations
:ivar agent_pools: AgentPools operations
:vartype agent_pools: azure.mgmt.containerservice.v2019_08_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-08-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,152 @@
# 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 ._models_py3 import AgentPool
from ._models_py3 import AgentPoolAvailableVersions
from ._models_py3 import AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem
from ._models_py3 import AgentPoolUpgradeProfile
from ._models_py3 import AgentPoolUpgradeProfilePropertiesUpgradesItem
from ._models_py3 import ContainerServiceDiagnosticsProfile
from ._models_py3 import ContainerServiceLinuxProfile
from ._models_py3 import ContainerServiceMasterProfile
from ._models_py3 import ContainerServiceNetworkProfile
from ._models_py3 import ContainerServiceSshConfiguration
from ._models_py3 import ContainerServiceSshPublicKey
from ._models_py3 import ContainerServiceVMDiagnostics
from ._models_py3 import CredentialResult
from ._models_py3 import CredentialResults
from ._models_py3 import ManagedCluster
from ._models_py3 import ManagedClusterAADProfile
from ._models_py3 import ManagedClusterAccessProfile
from ._models_py3 import ManagedClusterAddonProfile
from ._models_py3 import ManagedClusterAgentPoolProfile
from ._models_py3 import ManagedClusterAgentPoolProfileProperties
from ._models_py3 import ManagedClusterAPIServerAccessProfile
from ._models_py3 import ManagedClusterIdentity
from ._models_py3 import ManagedClusterLoadBalancerProfile
from ._models_py3 import ManagedClusterLoadBalancerProfileManagedOutboundIPs
from ._models_py3 import ManagedClusterLoadBalancerProfileOutboundIPPrefixes
from ._models_py3 import ManagedClusterLoadBalancerProfileOutboundIPs
from ._models_py3 import ManagedClusterPoolUpgradeProfile
from ._models_py3 import ManagedClusterPoolUpgradeProfileUpgradesItem
from ._models_py3 import ManagedClusterServicePrincipalProfile
from ._models_py3 import ManagedClusterUpgradeProfile
from ._models_py3 import ManagedClusterWindowsProfile
from ._models_py3 import OperationValue
from ._models_py3 import Resource
from ._models_py3 import ResourceReference
from ._models_py3 import SubResource
from ._models_py3 import TagsObject
except (SyntaxError, ImportError):
from ._models import AgentPool
from ._models import AgentPoolAvailableVersions
from ._models import AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem
from ._models import AgentPoolUpgradeProfile
from ._models import AgentPoolUpgradeProfilePropertiesUpgradesItem
from ._models import ContainerServiceDiagnosticsProfile
from ._models import ContainerServiceLinuxProfile
from ._models import ContainerServiceMasterProfile
from ._models import ContainerServiceNetworkProfile
from ._models import ContainerServiceSshConfiguration
from ._models import ContainerServiceSshPublicKey
from ._models import ContainerServiceVMDiagnostics
from ._models import CredentialResult
from ._models import CredentialResults
from ._models import ManagedCluster
from ._models import ManagedClusterAADProfile
from ._models import ManagedClusterAccessProfile
from ._models import ManagedClusterAddonProfile
from ._models import ManagedClusterAgentPoolProfile
from ._models import ManagedClusterAgentPoolProfileProperties
from ._models import ManagedClusterAPIServerAccessProfile
from ._models import ManagedClusterIdentity
from ._models import ManagedClusterLoadBalancerProfile
from ._models import ManagedClusterLoadBalancerProfileManagedOutboundIPs
from ._models import ManagedClusterLoadBalancerProfileOutboundIPPrefixes
from ._models import ManagedClusterLoadBalancerProfileOutboundIPs
from ._models import ManagedClusterPoolUpgradeProfile
from ._models import ManagedClusterPoolUpgradeProfileUpgradesItem
from ._models import ManagedClusterServicePrincipalProfile
from ._models import ManagedClusterUpgradeProfile
from ._models import ManagedClusterWindowsProfile
from ._models import OperationValue
from ._models import Resource
from ._models import ResourceReference
from ._models import SubResource
from ._models import TagsObject
from ._paged_models import AgentPoolPaged
from ._paged_models import ManagedClusterPaged
from ._paged_models import OperationValuePaged
from ._container_service_client_enums import (
ContainerServiceStorageProfileTypes,
ContainerServiceVMSizeTypes,
OSType,
AgentPoolType,
ScaleSetPriority,
ScaleSetEvictionPolicy,
NetworkPlugin,
NetworkPolicy,
LoadBalancerSku,
ResourceIdentityType,
)

__all__ = [
'AgentPool',
'AgentPoolAvailableVersions',
'AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem',
'AgentPoolUpgradeProfile',
'AgentPoolUpgradeProfilePropertiesUpgradesItem',
'ContainerServiceDiagnosticsProfile',
'ContainerServiceLinuxProfile',
'ContainerServiceMasterProfile',
'ContainerServiceNetworkProfile',
'ContainerServiceSshConfiguration',
'ContainerServiceSshPublicKey',
'ContainerServiceVMDiagnostics',
'CredentialResult',
'CredentialResults',
'ManagedCluster',
'ManagedClusterAADProfile',
'ManagedClusterAccessProfile',
'ManagedClusterAddonProfile',
'ManagedClusterAgentPoolProfile',
'ManagedClusterAgentPoolProfileProperties',
'ManagedClusterAPIServerAccessProfile',
'ManagedClusterIdentity',
'ManagedClusterLoadBalancerProfile',
'ManagedClusterLoadBalancerProfileManagedOutboundIPs',
'ManagedClusterLoadBalancerProfileOutboundIPPrefixes',
'ManagedClusterLoadBalancerProfileOutboundIPs',
'ManagedClusterPoolUpgradeProfile',
'ManagedClusterPoolUpgradeProfileUpgradesItem',
'ManagedClusterServicePrincipalProfile',
'ManagedClusterUpgradeProfile',
'ManagedClusterWindowsProfile',
'OperationValue',
'Resource',
'ResourceReference',
'SubResource',
'TagsObject',
'OperationValuePaged',
'ManagedClusterPaged',
'AgentPoolPaged',
'ContainerServiceStorageProfileTypes',
'ContainerServiceVMSizeTypes',
'OSType',
'AgentPoolType',
'ScaleSetPriority',
'ScaleSetEvictionPolicy',
'NetworkPlugin',
'NetworkPolicy',
'LoadBalancerSku',
'ResourceIdentityType',
]
Loading