[AutoPR] containerservices/resource-manager

azure-mgmt-containerservice/HISTORY.rst

@@ -3,6 +3,33 @@
 Release History
 ===============
 
+4.3.0 (2018-12-13)
+++++++++++++++++++
+
+**Features**
+
+- Support for Azure Profiles
+- OpenShift ManagedCluster (preview)
+
+This package also adds
+Preview version of ManagedCluster (AKS 2018-08-01-preview), this includes the following breaking changes and features, if you optin for this new API version:
+
+**Features**
+
+- Model ManagedClusterAgentPoolProfile has a new parameter type
+- Model ManagedClusterAgentPoolProfile has a new parameter max_count
+- Model ManagedClusterAgentPoolProfile has a new parameter enable_auto_scaling
+- Model ManagedClusterAgentPoolProfile has a new parameter min_count
+
+**Breaking changes**
+
+- Parameter count of model ManagedClusterAgentPoolProfile is now required
+- Model ManagedClusterAgentPoolProfile no longer has parameter storage_profile
+
+**Note**
+
+- azure-mgmt-nspkg is not installed anymore on Python 3 (PEP420-based namespace package)
+
 4.2.2 (2018-08-09)
 ++++++++++++++++++
 

azure-mgmt-containerservice/MANIFEST.in

@@ -1 +1,4 @@
 include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+

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

@@ -12,11 +12,10 @@
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
+
+from azure.profiles import KnownProfiles, ProfileDefinition
+from azure.profiles.multiapiclient import MultiApiClientMixin
 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
 
 
 class ContainerServiceClientConfiguration(AzureConfiguration):
@@ -53,42 +52,131 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ContainerServiceClient(SDKClient):
+class ContainerServiceClient(MultiApiClientMixin, SDKClient):
     """The Container Service Client.
 
     :ivar config: Configuration for client.
     :vartype config: ContainerServiceClientConfiguration
 
-    :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
-
     :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 api_version: API version to use if no profile is provided, or if
+     missing in profile.
     :param str base_url: Service URL
+    :param profile: A dict using operation group name to API version.
+    :type profile: dict[str, str]
     """
 
-    def __init__(
-            self, credentials, subscription_id, base_url=None):
-
+    DEFAULT_API_VERSION = '2018-09-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"
+    )
+
+    def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
         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._serialize = Serializer(client_models)
-        self._deserialize = Deserializer(client_models)
-
-        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)
+        super(ContainerServiceClient, self).__init__(
+            credentials,
+            self.config,
+            api_version=api_version,
+            profile=profile
+        )
+
+############ Generated from here ############
+
+    @classmethod
+    def _models_dict(cls, api_version):
+        return {k: v for k, v in cls.models(api_version).__dict__.items() if isinstance(v, type)}
+
+    @classmethod
+    def models(cls, api_version=DEFAULT_API_VERSION):
+        """Module depends on the API version:
+
+           * 2017-07-01: :mod:`v2017_07_01.models<azure.mgmt.containerservice.v2017_07_01.models>`
+           * 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>`
+        """
+        if api_version == '2017-07-01':
+            from .v2017_07_01 import models
+            return models
+        elif api_version == '2018-03-31':
+            from .v2018_03_31 import models
+            return models
+        elif api_version == '2018-08-01-preview':
+            from .v2018_08_01_preview import models
+            return models
+        elif api_version == '2018-09-30-preview':
+            from .v2018_09_30_preview import models
+            return models
+        raise NotImplementedError("APIVersion {} is not available".format(api_version))
+
+    @property
+    def container_services(self):
+        """Instance depends on the API version:
+
+           * 2017-07-01: :class:`ContainerServicesOperations<azure.mgmt.containerservice.v2017_07_01.operations.ContainerServicesOperations>`
+        """
+        api_version = self._get_api_version('container_services')
+        if api_version == '2017-07-01':
+            from .v2017_07_01.operations import ContainerServicesOperations 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 managed_clusters(self):
+        """Instance depends on the API version:
+
+           * 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>`
+        """
+        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
+        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 open_shift_managed_clusters(self):
+        """Instance depends on the API version:
+
+           * 2018-09-30-preview: :class:`OpenShiftManagedClustersOperations<azure.mgmt.containerservice.v2018_09_30_preview.operations.OpenShiftManagedClustersOperations>`
+        """
+        api_version = self._get_api_version('open_shift_managed_clusters')
+        if api_version == '2018-09-30-preview':
+            from .v2018_09_30_preview.operations import OpenShiftManagedClustersOperations 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 operations(self):
+        """Instance depends on the API version:
+
+           * 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>`
+        """
+        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
+        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)))

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

@@ -0,0 +1,15 @@
+# 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 .v2017_07_01.models import *
+from .v2018_03_31.models import *
+from .v2018_08_01_preview.models import *
+from .v2018_09_30_preview.models import *

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

@@ -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
+

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

@@ -0,0 +1,84 @@
+# 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.container_services_operations import ContainerServicesOperations
+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 container_services: ContainerServices operations
+    :vartype container_services: azure.mgmt.containerservice.v2017_07_01.operations.ContainerServicesOperations
+
+    :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._serialize = Serializer(client_models)
+        self._deserialize = Deserializer(client_models)
+
+        self.container_services = ContainerServicesOperations(
+            self._client, self.config, self._serialize, self._deserialize)