From ce296258253a8eb25c98fbabc4d75066460b7d0a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 5 Jun 2018 15:17:56 -0700 Subject: [PATCH] azure-mgmt-containerservice 4.0.0 (#2186) * Generated from 8a259e0b55e6b455d866afb9d3dc1fa88e032193 (#2185) Sync up ACS VM sizes with AKS sizes * Generated from 63832619ea68b0f3b93c37f2ac2be54a5b3dba83 (#2195) [AKS] specify byte format for base64-encoded kubeconfig * Generated from 8906ba9709671ec120effb24013ed55425576606 (#2551) Sync ACS & AKS' VM sizes lists * [AutoPR containerservices/resource-manager] [AKS] add POST endpoint for fetching accessProfiles (#2583) * Generated from 3c1665f522ece941d8c827b3e8ee539c2cdaf846 [AKS] add POST endpoint for fetching accessProfiles * Generated from a86af5dd1b974ecc3b58e95efc228497137d79a3 Mark GET endpoint for accessProfiles as deprecated * Generated from 14544bfbd10b7319f64f1174b84801347ace5dc9 Bump package version * Generated from a69eb4b470374683c3bc4e86491aa60ae0a161ea Rename to GetAccessProfile * ACS auto packaging * azure-mgmt-containerservice 4.0.0 * [AutoPR containerservices/resource-manager] [AKS] add new 2018-03-31 API (#2631) * Generated from e365e10741ba688b8c3b39b67986e2b6e06e4ddc Rename to ManagedClusterAgentPoolProfile. Its fields have diverged from ContainerServiceAgentPoolProfile. * Generated from 3047e9e632f7c44d4a88f3c768fc1de4dd9f40ec Py version * Generated from d61dfda40f6a7498040fee441c1b23cb6a1bc01a Incorporated review comments * Generated from 33469ca0e594d658a51b73dcb5e7f9526c768024 (#2684) Rename to "Operation" from "ComputeOperation" * Generated from 75bc2c7e14e354c5d782f6e001cf865a8d55cfdb (#2682) [AKS] remove maxPods default --- azure-mgmt-containerservice/HISTORY.rst | 38 +++ azure-mgmt-containerservice/README.rst | 10 +- .../container_service_client.py | 11 +- .../mgmt/containerservice/models/__init__.py | 86 +++++-- .../models/container_service.py | 32 +-- .../container_service_agent_pool_profile.py | 80 +++--- ...ontainer_service_agent_pool_profile_py3.py | 141 +++++++++++ .../models/container_service_client_enums.py | 65 ++++- .../container_service_custom_profile.py | 10 +- .../container_service_custom_profile_py3.py | 34 +++ .../container_service_diagnostics_profile.py | 12 +- ...ntainer_service_diagnostics_profile_py3.py | 36 +++ .../models/container_service_linux_profile.py | 16 +- .../container_service_linux_profile_py3.py | 42 ++++ .../container_service_master_profile.py | 76 +++--- .../container_service_master_profile_py3.py | 128 ++++++++++ .../container_service_network_profile.py | 67 +++++ .../container_service_network_profile_py3.py | 67 +++++ .../container_service_orchestrator_profile.py | 16 +- ...tainer_service_orchestrator_profile_py3.py | 44 ++++ .../models/container_service_py3.py | 107 ++++++++ ...ainer_service_service_principal_profile.py | 14 +- ...r_service_service_principal_profile_py3.py | 47 ++++ .../container_service_ssh_configuration.py | 12 +- ...container_service_ssh_configuration_py3.py | 36 +++ .../container_service_ssh_public_key.py | 14 +- .../container_service_ssh_public_key_py3.py | 36 +++ .../container_service_vm_diagnostics.py | 11 +- .../container_service_vm_diagnostics_py3.py | 44 ++++ .../container_service_windows_profile.py | 16 +- .../container_service_windows_profile_py3.py | 41 +++ .../models/key_vault_secret_ref.py | 16 +- .../models/key_vault_secret_ref_py3.py | 43 ++++ .../models/managed_cluster.py | 50 ++-- .../models/managed_cluster_aad_profile.py | 49 ++++ .../models/managed_cluster_aad_profile_py3.py | 49 ++++ .../models/managed_cluster_access_profile.py | 14 +- .../managed_cluster_access_profile_py3.py | 55 ++++ .../models/managed_cluster_addon_profile.py | 38 +++ .../managed_cluster_addon_profile_py3.py | 38 +++ .../managed_cluster_agent_pool_profile.py | 145 +++++++++++ .../managed_cluster_agent_pool_profile_py3.py | 145 +++++++++++ .../managed_cluster_pool_upgrade_profile.py | 23 +- ...anaged_cluster_pool_upgrade_profile_py3.py | 51 ++++ .../models/managed_cluster_py3.py | 109 ++++++++ .../models/managed_cluster_upgrade_profile.py | 18 +- .../managed_cluster_upgrade_profile_py3.py | 61 +++++ .../models/operation_value.py | 60 +++++ .../models/operation_value_paged.py | 27 ++ .../models/operation_value_py3.py | 60 +++++ .../models/orchestrator_profile.py | 15 +- .../models/orchestrator_profile_py3.py | 40 +++ .../models/orchestrator_version_profile.py | 24 +- ...rchestrator_version_profile_list_result.py | 10 +- ...strator_version_profile_list_result_py3.py | 53 ++++ .../orchestrator_version_profile_py3.py | 52 ++++ .../mgmt/containerservice/models/resource.py | 12 +- .../containerservice/models/resource_py3.py | 56 +++++ .../containerservice/operations/__init__.py | 2 + .../container_services_operations.py | 115 ++++----- .../operations/managed_clusters_operations.py | 128 ++++------ .../containerservice/operations/operations.py | 99 ++++++++ .../azure/mgmt/containerservice/version.py | 2 +- azure-mgmt-containerservice/build.json | 235 ------------------ .../sdk_packaging.toml | 5 + azure-mgmt-containerservice/setup.py | 7 +- 66 files changed, 2671 insertions(+), 624 deletions(-) create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py delete mode 100644 azure-mgmt-containerservice/build.json create mode 100644 azure-mgmt-containerservice/sdk_packaging.toml diff --git a/azure-mgmt-containerservice/HISTORY.rst b/azure-mgmt-containerservice/HISTORY.rst index 4f2f9af4c99a..13f074e54861 100644 --- a/azure-mgmt-containerservice/HISTORY.rst +++ b/azure-mgmt-containerservice/HISTORY.rst @@ -3,6 +3,44 @@ Release History =============== +4.0.0 (2018-05-25) +++++++++++++++++++ + +**Features** + +- Added operation ManagedClustersOperations.get_access_profile +- Updated VM sizes +- Client class can be used as a context manager to keep the underlying HTTP session open for performance + +**General Breaking changes** + +This version uses a next-generation code generator that *might* introduce breaking changes. + +- Model signatures now use only keyword-argument syntax. All positional arguments must be re-written as keyword-arguments. + To keep auto-completion in most cases, models are now generated for Python 2 and Python 3. Python 3 uses the "*" syntax for keyword-only arguments. +- Enum types now use the "str" mixin (class AzureEnum(str, Enum)) to improve the behavior when unrecognized enum values are encountered. + While this is not a breaking change, the distinctions are important, and are documented here: + https://docs.python.org/3/library/enum.html#others + At a glance: + + - "is" should not be used at all. + - "format" will return the string value, where "%s" string formatting will return `NameOfEnum.stringvalue`. Format syntax should be prefered. + +- New Long Running Operation: + + - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same. + - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used. + - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, + without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`. + - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`, + the response of the initial call will be returned without polling. + - `polling` parameter accepts instances of subclasses of `msrest.polling.PollingMethod`. + - `add_done_callback` will no longer raise if called after polling is finished, but will instead execute the callback right away. + +**Bugfixes** + +- Compatibility of the sdist with wheel 0.31.0 + 3.0.1 (2018-01-25) ++++++++++++++++++ diff --git a/azure-mgmt-containerservice/README.rst b/azure-mgmt-containerservice/README.rst index bca5d290b793..4b0ff63c695d 100644 --- a/azure-mgmt-containerservice/README.rst +++ b/azure-mgmt-containerservice/README.rst @@ -1,12 +1,12 @@ Microsoft Azure SDK for Python ============================== -This is the Microsoft Azure Container Service Client Library. +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.3, 3.4, 3.5 and 3.6. +This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. For the older Azure Service Management (ASM) libraries, see `azure-servicemanagement-legacy `__ library. @@ -36,9 +36,9 @@ If you see azure==0.11.0 (or any version below 1.0), uninstall it first: Usage ===== -For code examples, see `Container Service -`__ -on readthedocs.org. +For code examples, see `Container Service Management +`__ +on docs.microsoft.com. Provide Feedback diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py index a1c73e58daf5..a5d7eb651da6 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py @@ -9,11 +9,12 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +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 @@ -52,7 +53,7 @@ def __init__( self.subscription_id = subscription_id -class ContainerServiceClient(object): +class ContainerServiceClient(SDKClient): """The Container Service Client. :ivar config: Configuration for client. @@ -60,6 +61,8 @@ class ContainerServiceClient(object): :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 @@ -77,7 +80,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ContainerServiceClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + 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) @@ -85,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) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py index 3006d62b21d8..e1ca23bdfc11 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py @@ -9,34 +9,70 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource -from .container_service_custom_profile import ContainerServiceCustomProfile -from .key_vault_secret_ref import KeyVaultSecretRef -from .container_service_service_principal_profile import ContainerServiceServicePrincipalProfile -from .container_service_orchestrator_profile import ContainerServiceOrchestratorProfile -from .container_service_master_profile import ContainerServiceMasterProfile -from .container_service_agent_pool_profile import ContainerServiceAgentPoolProfile -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_vm_diagnostics import ContainerServiceVMDiagnostics -from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile -from .container_service import ContainerService -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 .orchestrator_version_profile import OrchestratorVersionProfile -from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult +try: + from .resource_py3 import Resource + from .container_service_custom_profile_py3 import ContainerServiceCustomProfile + from .key_vault_secret_ref_py3 import KeyVaultSecretRef + from .container_service_service_principal_profile_py3 import ContainerServiceServicePrincipalProfile + from .container_service_orchestrator_profile_py3 import ContainerServiceOrchestratorProfile + from .container_service_master_profile_py3 import ContainerServiceMasterProfile + from .container_service_agent_pool_profile_py3 import ContainerServiceAgentPoolProfile + 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_vm_diagnostics_py3 import ContainerServiceVMDiagnostics + from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile + from .container_service_py3 import ContainerService + from .operation_value_py3 import OperationValue + 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 + from .managed_cluster_pool_upgrade_profile_py3 import ManagedClusterPoolUpgradeProfile + from .managed_cluster_upgrade_profile_py3 import ManagedClusterUpgradeProfile + from .orchestrator_version_profile_py3 import OrchestratorVersionProfile + from .orchestrator_version_profile_list_result_py3 import OrchestratorVersionProfileListResult +except (SyntaxError, ImportError): + from .resource import Resource + from .container_service_custom_profile import ContainerServiceCustomProfile + from .key_vault_secret_ref import KeyVaultSecretRef + from .container_service_service_principal_profile import ContainerServiceServicePrincipalProfile + from .container_service_orchestrator_profile import ContainerServiceOrchestratorProfile + from .container_service_master_profile import ContainerServiceMasterProfile + from .container_service_agent_pool_profile import ContainerServiceAgentPoolProfile + 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_vm_diagnostics import ContainerServiceVMDiagnostics + from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile + from .container_service import ContainerService + from .operation_value import OperationValue + 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 + from .managed_cluster_pool_upgrade_profile import ManagedClusterPoolUpgradeProfile + from .managed_cluster_upgrade_profile import ManagedClusterUpgradeProfile + from .orchestrator_version_profile import OrchestratorVersionProfile + from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult from .container_service_paged import ContainerServicePaged +from .operation_value_paged import OperationValuePaged from .managed_cluster_paged import ManagedClusterPaged from .container_service_client_enums import ( ContainerServiceStorageProfileTypes, ContainerServiceVMSizeTypes, ContainerServiceOrchestratorTypes, OSType, + NetworkPlugin, + NetworkPolicy, ) __all__ = [ @@ -54,6 +90,11 @@ 'ContainerServiceVMDiagnostics', 'ContainerServiceDiagnosticsProfile', 'ContainerService', + 'OperationValue', + 'ManagedClusterAgentPoolProfile', + 'ContainerServiceNetworkProfile', + 'ManagedClusterAddonProfile', + 'ManagedClusterAADProfile', 'ManagedCluster', 'OrchestratorProfile', 'ManagedClusterAccessProfile', @@ -62,9 +103,12 @@ 'OrchestratorVersionProfile', 'OrchestratorVersionProfileListResult', 'ContainerServicePaged', + 'OperationValuePaged', 'ManagedClusterPaged', 'ContainerServiceStorageProfileTypes', 'ContainerServiceVMSizeTypes', 'ContainerServiceOrchestratorTypes', 'OSType', + 'NetworkPlugin', + 'NetworkPolicy', ] diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service.py index 2f2591e396b1..ffc12f82ffbe 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service.py @@ -18,20 +18,22 @@ class ContainerService(Resource): 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: Resource name :vartype name: str :ivar type: Resource type :vartype type: str - :param location: Resource location + :param location: Required. Resource location :type location: str :param tags: Resource tags :type tags: dict[str, str] :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str - :param orchestrator_profile: Profile for the container service + :param orchestrator_profile: Required. Profile for the container service orchestrator. :type orchestrator_profile: ~azure.mgmt.containerservice.models.ContainerServiceOrchestratorProfile @@ -44,7 +46,7 @@ class ContainerService(Resource): secret or keyVaultSecretRef need to be specified. :type service_principal_profile: ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile - :param master_profile: Profile for the container service master. + :param master_profile: Required. Profile for the container service master. :type master_profile: ~azure.mgmt.containerservice.models.ContainerServiceMasterProfile :param agent_pool_profiles: Properties of the agent pool. @@ -54,8 +56,8 @@ class ContainerService(Resource): cluster. :type windows_profile: ~azure.mgmt.containerservice.models.ContainerServiceWindowsProfile - :param linux_profile: Profile for Linux VMs in the container service - cluster. + :param linux_profile: Required. Profile for Linux VMs in the container + service cluster. :type linux_profile: ~azure.mgmt.containerservice.models.ContainerServiceLinuxProfile :param diagnostics_profile: Profile for diagnostics in the container @@ -92,14 +94,14 @@ class ContainerService(Resource): 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'ContainerServiceDiagnosticsProfile'}, } - def __init__(self, location, orchestrator_profile, master_profile, linux_profile, tags=None, custom_profile=None, service_principal_profile=None, agent_pool_profiles=None, windows_profile=None, diagnostics_profile=None): - super(ContainerService, self).__init__(location=location, tags=tags) + def __init__(self, **kwargs): + super(ContainerService, self).__init__(**kwargs) self.provisioning_state = None - self.orchestrator_profile = orchestrator_profile - self.custom_profile = custom_profile - self.service_principal_profile = service_principal_profile - self.master_profile = master_profile - self.agent_pool_profiles = agent_pool_profiles - self.windows_profile = windows_profile - self.linux_profile = linux_profile - self.diagnostics_profile = diagnostics_profile + self.orchestrator_profile = kwargs.get('orchestrator_profile', None) + self.custom_profile = kwargs.get('custom_profile', None) + self.service_principal_profile = kwargs.get('service_principal_profile', None) + self.master_profile = kwargs.get('master_profile', None) + self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None) + self.windows_profile = kwargs.get('windows_profile', None) + self.linux_profile = kwargs.get('linux_profile', None) + self.diagnostics_profile = kwargs.get('diagnostics_profile', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py index 21c339c3d421..e0d5dd777aaa 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py @@ -18,51 +18,66 @@ class ContainerServiceAgentPoolProfile(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param name: Unique name of the agent pool profile in the context of the - subscription and resource group. + All required parameters must be populated in order to send to Azure. + + :param name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. :type name: str :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. . Default value: 1 . :type count: int - :param vm_size: Size of agent VMs. Possible values include: 'Standard_A0', + :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_D1', 'Standard_D11', + '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_D3_v2', - 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', + '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_D8_v3', - 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', - 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', - 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13_v2', - 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14_v2', + 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', + 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', - 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', - 'Standard_E4s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', - 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', - 'Standard_F16s', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', - 'Standard_F4', 'Standard_F4s', 'Standard_F8', 'Standard_F8s', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', - 'Standard_GS5', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', - 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128s', - 'Standard_M64ms', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', - 'Standard_NC6', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' :type vm_size: str or ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk @@ -84,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', @@ -113,15 +127,15 @@ class ContainerServiceAgentPoolProfile(Model): 'os_type': {'key': 'osType', 'type': 'str'}, } - def __init__(self, name, vm_size, count=1, os_disk_size_gb=None, dns_prefix=None, ports=None, storage_profile=None, vnet_subnet_id=None, os_type="Linux"): - super(ContainerServiceAgentPoolProfile, self).__init__() - self.name = name - self.count = count - self.vm_size = vm_size - self.os_disk_size_gb = os_disk_size_gb - self.dns_prefix = dns_prefix + def __init__(self, **kwargs): + super(ContainerServiceAgentPoolProfile, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.count = kwargs.get('count', 1) + self.vm_size = kwargs.get('vm_size', None) + self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None) + self.dns_prefix = kwargs.get('dns_prefix', None) self.fqdn = None - self.ports = ports - self.storage_profile = storage_profile - self.vnet_subnet_id = vnet_subnet_id - self.os_type = os_type + self.ports = kwargs.get('ports', None) + self.storage_profile = kwargs.get('storage_profile', None) + self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None) + self.os_type = kwargs.get('os_type', "Linux") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py new file mode 100644 index 000000000000..dcb5bd830a96 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py @@ -0,0 +1,141 @@ +# 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 ContainerServiceAgentPoolProfile(Model): + """Profile for the container service agent pool. + + 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 name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. + :type name: str + :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. . Default value: 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', + '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', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + will apply the default osDisk size according to the vmSize specified. + :type os_disk_size_gb: int + :param dns_prefix: DNS prefix to be used to create the FQDN for the agent + pool. + :type dns_prefix: str + :ivar fqdn: FDQN for the agent pool. + :vartype fqdn: str + :param ports: Ports number array used to expose on this agent pool. The + default opened ports are different based on your choice of orchestrator. + :type ports: list[int] + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet + 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', + 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + """ + + _validation = { + 'name': {'required': True}, + 'count': {'maximum': 100, 'minimum': 1}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + 'ports': {'key': 'ports', 'type': '[int]'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + } + + def __init__(self, *, name: str, vm_size, count: int=1, os_disk_size_gb: int=None, dns_prefix: str=None, ports=None, storage_profile=None, vnet_subnet_id: str=None, os_type="Linux", **kwargs) -> None: + super(ContainerServiceAgentPoolProfile, self).__init__(**kwargs) + self.name = name + self.count = count + self.vm_size = vm_size + self.os_disk_size_gb = os_disk_size_gb + self.dns_prefix = dns_prefix + self.fqdn = None + self.ports = ports + self.storage_profile = storage_profile + self.vnet_subnet_id = vnet_subnet_id + self.os_type = os_type diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py index 65ededb5f445..4fe56768c577 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py @@ -12,15 +12,14 @@ from enum import Enum -class ContainerServiceStorageProfileTypes(Enum): +class ContainerServiceStorageProfileTypes(str, Enum): storage_account = "StorageAccount" managed_disks = "ManagedDisks" -class ContainerServiceVMSizeTypes(Enum): +class ContainerServiceVMSizeTypes(str, Enum): - standard_a0 = "Standard_A0" standard_a1 = "Standard_A1" standard_a10 = "Standard_A10" standard_a11 = "Standard_A11" @@ -39,6 +38,10 @@ class ContainerServiceVMSizeTypes(Enum): standard_a8_v2 = "Standard_A8_v2" standard_a8m_v2 = "Standard_A8m_v2" standard_a9 = "Standard_A9" + standard_b2ms = "Standard_B2ms" + standard_b2s = "Standard_B2s" + standard_b4ms = "Standard_B4ms" + standard_b8ms = "Standard_B8ms" standard_d1 = "Standard_D1" standard_d11 = "Standard_D11" standard_d11_v2 = "Standard_D11_v2" @@ -62,6 +65,8 @@ class ContainerServiceVMSizeTypes(Enum): standard_d2_v3 = "Standard_D2_v3" standard_d2s_v3 = "Standard_D2s_v3" standard_d3 = "Standard_D3" + standard_d32_v3 = "Standard_D32_v3" + standard_d32s_v3 = "Standard_D32s_v3" standard_d3_v2 = "Standard_D3_v2" standard_d3_v2_promo = "Standard_D3_v2_Promo" standard_d4 = "Standard_D4" @@ -71,6 +76,8 @@ class ContainerServiceVMSizeTypes(Enum): standard_d4s_v3 = "Standard_D4s_v3" standard_d5_v2 = "Standard_D5_v2" standard_d5_v2_promo = "Standard_D5_v2_Promo" + standard_d64_v3 = "Standard_D64_v3" + standard_d64s_v3 = "Standard_D64s_v3" standard_d8_v3 = "Standard_D8_v3" standard_d8s_v3 = "Standard_D8s_v3" standard_ds1 = "Standard_DS1" @@ -81,9 +88,13 @@ class ContainerServiceVMSizeTypes(Enum): standard_ds12_v2 = "Standard_DS12_v2" standard_ds12_v2_promo = "Standard_DS12_v2_Promo" standard_ds13 = "Standard_DS13" + standard_ds13_2_v2 = "Standard_DS13-2_v2" + standard_ds13_4_v2 = "Standard_DS13-4_v2" standard_ds13_v2 = "Standard_DS13_v2" standard_ds13_v2_promo = "Standard_DS13_v2_Promo" standard_ds14 = "Standard_DS14" + standard_ds14_4_v2 = "Standard_DS14-4_v2" + standard_ds14_8_v2 = "Standard_DS14-8_v2" standard_ds14_v2 = "Standard_DS14_v2" standard_ds14_v2_promo = "Standard_DS14_v2_Promo" standard_ds15_v2 = "Standard_DS15_v2" @@ -103,10 +114,14 @@ class ContainerServiceVMSizeTypes(Enum): standard_e16s_v3 = "Standard_E16s_v3" standard_e2_v3 = "Standard_E2_v3" standard_e2s_v3 = "Standard_E2s_v3" + standard_e32_16s_v3 = "Standard_E32-16s_v3" + standard_e32_8s_v3 = "Standard_E32-8s_v3" standard_e32_v3 = "Standard_E32_v3" standard_e32s_v3 = "Standard_E32s_v3" standard_e4_v3 = "Standard_E4_v3" standard_e4s_v3 = "Standard_E4s_v3" + standard_e64_16s_v3 = "Standard_E64-16s_v3" + standard_e64_32s_v3 = "Standard_E64-32s_v3" standard_e64_v3 = "Standard_E64_v3" standard_e64s_v3 = "Standard_E64s_v3" standard_e8_v3 = "Standard_E8_v3" @@ -114,13 +129,20 @@ class ContainerServiceVMSizeTypes(Enum): standard_f1 = "Standard_F1" standard_f16 = "Standard_F16" standard_f16s = "Standard_F16s" + standard_f16s_v2 = "Standard_F16s_v2" standard_f1s = "Standard_F1s" standard_f2 = "Standard_F2" standard_f2s = "Standard_F2s" + standard_f2s_v2 = "Standard_F2s_v2" + standard_f32s_v2 = "Standard_F32s_v2" standard_f4 = "Standard_F4" standard_f4s = "Standard_F4s" + standard_f4s_v2 = "Standard_F4s_v2" + standard_f64s_v2 = "Standard_F64s_v2" + standard_f72s_v2 = "Standard_F72s_v2" standard_f8 = "Standard_F8" standard_f8s = "Standard_F8s" + standard_f8s_v2 = "Standard_F8s_v2" standard_g1 = "Standard_G1" standard_g2 = "Standard_G2" standard_g3 = "Standard_G3" @@ -130,7 +152,11 @@ class ContainerServiceVMSizeTypes(Enum): standard_gs2 = "Standard_GS2" standard_gs3 = "Standard_GS3" standard_gs4 = "Standard_GS4" + standard_gs4_4 = "Standard_GS4-4" + standard_gs4_8 = "Standard_GS4-8" standard_gs5 = "Standard_GS5" + standard_gs5_16 = "Standard_GS5-16" + standard_gs5_8 = "Standard_GS5-8" standard_h16 = "Standard_H16" standard_h16m = "Standard_H16m" standard_h16mr = "Standard_H16mr" @@ -141,18 +167,36 @@ class ContainerServiceVMSizeTypes(Enum): standard_l32s = "Standard_L32s" standard_l4s = "Standard_L4s" standard_l8s = "Standard_L8s" + standard_m128_32ms = "Standard_M128-32ms" + standard_m128_64ms = "Standard_M128-64ms" + standard_m128ms = "Standard_M128ms" standard_m128s = "Standard_M128s" + standard_m64_16ms = "Standard_M64-16ms" + standard_m64_32ms = "Standard_M64-32ms" standard_m64ms = "Standard_M64ms" + standard_m64s = "Standard_M64s" standard_nc12 = "Standard_NC12" + standard_nc12s_v2 = "Standard_NC12s_v2" + standard_nc12s_v3 = "Standard_NC12s_v3" standard_nc24 = "Standard_NC24" standard_nc24r = "Standard_NC24r" + standard_nc24rs_v2 = "Standard_NC24rs_v2" + standard_nc24rs_v3 = "Standard_NC24rs_v3" + standard_nc24s_v2 = "Standard_NC24s_v2" + standard_nc24s_v3 = "Standard_NC24s_v3" standard_nc6 = "Standard_NC6" + standard_nc6s_v2 = "Standard_NC6s_v2" + standard_nc6s_v3 = "Standard_NC6s_v3" + standard_nd12s = "Standard_ND12s" + standard_nd24rs = "Standard_ND24rs" + standard_nd24s = "Standard_ND24s" + standard_nd6s = "Standard_ND6s" standard_nv12 = "Standard_NV12" standard_nv24 = "Standard_NV24" standard_nv6 = "Standard_NV6" -class ContainerServiceOrchestratorTypes(Enum): +class ContainerServiceOrchestratorTypes(str, Enum): kubernetes = "Kubernetes" swarm = "Swarm" @@ -161,7 +205,18 @@ class ContainerServiceOrchestratorTypes(Enum): custom = "Custom" -class OSType(Enum): +class OSType(str, Enum): linux = "Linux" windows = "Windows" + + +class NetworkPlugin(str, Enum): + + azure = "azure" + kubenet = "kubenet" + + +class NetworkPolicy(str, Enum): + + calico = "calico" diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile.py index b487fb7875be..99a65ee25050 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile.py @@ -15,7 +15,9 @@ class ContainerServiceCustomProfile(Model): """Properties to configure a custom container service cluster. - :param orchestrator: The name of the custom orchestrator to use. + All required parameters must be populated in order to send to Azure. + + :param orchestrator: Required. The name of the custom orchestrator to use. :type orchestrator: str """ @@ -27,6 +29,6 @@ class ContainerServiceCustomProfile(Model): 'orchestrator': {'key': 'orchestrator', 'type': 'str'}, } - def __init__(self, orchestrator): - super(ContainerServiceCustomProfile, self).__init__() - self.orchestrator = orchestrator + def __init__(self, **kwargs): + super(ContainerServiceCustomProfile, self).__init__(**kwargs) + self.orchestrator = kwargs.get('orchestrator', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile_py3.py new file mode 100644 index 000000000000..de010d977de8 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_custom_profile_py3.py @@ -0,0 +1,34 @@ +# 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 ContainerServiceCustomProfile(Model): + """Properties to configure a custom container service cluster. + + All required parameters must be populated in order to send to Azure. + + :param orchestrator: Required. The name of the custom orchestrator to use. + :type orchestrator: str + """ + + _validation = { + 'orchestrator': {'required': True}, + } + + _attribute_map = { + 'orchestrator': {'key': 'orchestrator', 'type': 'str'}, + } + + def __init__(self, *, orchestrator: str, **kwargs) -> None: + super(ContainerServiceCustomProfile, self).__init__(**kwargs) + self.orchestrator = orchestrator diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile.py index b763f2d42a78..8cee39284dc2 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile.py @@ -15,8 +15,10 @@ class ContainerServiceDiagnosticsProfile(Model): """Profile for diagnostics on the container service cluster. - :param vm_diagnostics: Profile for diagnostics on the container service - VMs. + All required parameters must be populated in order to send to Azure. + + :param vm_diagnostics: Required. Profile for diagnostics on the container + service VMs. :type vm_diagnostics: ~azure.mgmt.containerservice.models.ContainerServiceVMDiagnostics """ @@ -29,6 +31,6 @@ class ContainerServiceDiagnosticsProfile(Model): 'vm_diagnostics': {'key': 'vmDiagnostics', 'type': 'ContainerServiceVMDiagnostics'}, } - def __init__(self, vm_diagnostics): - super(ContainerServiceDiagnosticsProfile, self).__init__() - self.vm_diagnostics = vm_diagnostics + def __init__(self, **kwargs): + super(ContainerServiceDiagnosticsProfile, self).__init__(**kwargs) + self.vm_diagnostics = kwargs.get('vm_diagnostics', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile_py3.py new file mode 100644 index 000000000000..e444694e8a95 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_diagnostics_profile_py3.py @@ -0,0 +1,36 @@ +# 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 ContainerServiceDiagnosticsProfile(Model): + """Profile for diagnostics on the container service cluster. + + All required parameters must be populated in order to send to Azure. + + :param vm_diagnostics: Required. Profile for diagnostics on the container + service VMs. + :type vm_diagnostics: + ~azure.mgmt.containerservice.models.ContainerServiceVMDiagnostics + """ + + _validation = { + 'vm_diagnostics': {'required': True}, + } + + _attribute_map = { + 'vm_diagnostics': {'key': 'vmDiagnostics', 'type': 'ContainerServiceVMDiagnostics'}, + } + + def __init__(self, *, vm_diagnostics, **kwargs) -> None: + super(ContainerServiceDiagnosticsProfile, self).__init__(**kwargs) + self.vm_diagnostics = vm_diagnostics diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile.py index 898923273aff..d9e79e2d2eeb 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile.py @@ -15,9 +15,13 @@ class ContainerServiceLinuxProfile(Model): """Profile for Linux VMs in the container service cluster. - :param admin_username: The administrator username to use for Linux VMs. + All required parameters must be populated in order to send to Azure. + + :param admin_username: Required. The administrator username to use for + Linux VMs. :type admin_username: str - :param ssh: SSH configuration for Linux-based VMs running on Azure. + :param ssh: Required. SSH configuration for Linux-based VMs running on + Azure. :type ssh: ~azure.mgmt.containerservice.models.ContainerServiceSshConfiguration """ @@ -32,7 +36,7 @@ class ContainerServiceLinuxProfile(Model): 'ssh': {'key': 'ssh', 'type': 'ContainerServiceSshConfiguration'}, } - def __init__(self, admin_username, ssh): - super(ContainerServiceLinuxProfile, self).__init__() - self.admin_username = admin_username - self.ssh = ssh + def __init__(self, **kwargs): + super(ContainerServiceLinuxProfile, self).__init__(**kwargs) + self.admin_username = kwargs.get('admin_username', None) + self.ssh = kwargs.get('ssh', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile_py3.py new file mode 100644 index 000000000000..824f20d0da8b --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_linux_profile_py3.py @@ -0,0 +1,42 @@ +# 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 ContainerServiceLinuxProfile(Model): + """Profile for Linux VMs in the container service cluster. + + All required parameters must be populated in order to send to Azure. + + :param admin_username: Required. The administrator username to use for + Linux VMs. + :type admin_username: str + :param ssh: Required. SSH configuration for Linux-based VMs running on + Azure. + :type ssh: + ~azure.mgmt.containerservice.models.ContainerServiceSshConfiguration + """ + + _validation = { + 'admin_username': {'required': True, 'pattern': r'^[a-z][a-z0-9_-]*$'}, + 'ssh': {'required': True}, + } + + _attribute_map = { + 'admin_username': {'key': 'adminUsername', 'type': 'str'}, + 'ssh': {'key': 'ssh', 'type': 'ContainerServiceSshConfiguration'}, + } + + def __init__(self, *, admin_username: str, ssh, **kwargs) -> None: + super(ContainerServiceLinuxProfile, self).__init__(**kwargs) + self.admin_username = admin_username + self.ssh = ssh diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py index 7fb728a9b270..07a8ce1266ea 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py @@ -18,50 +18,65 @@ class ContainerServiceMasterProfile(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: Number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1. Default value: 1 . :type count: int - :param dns_prefix: DNS prefix to be used to create the FQDN for the master - pool. + :param dns_prefix: Required. DNS prefix to be used to create the FQDN for + the master pool. :type dns_prefix: str - :param vm_size: Size of agent VMs. Possible values include: 'Standard_A0', + :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_D1', 'Standard_D11', + '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_D3_v2', - 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', + '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_D8_v3', - 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', - 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', - 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13_v2', - 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14_v2', + 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', + 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', - 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', - 'Standard_E4s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', - 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', - 'Standard_F16s', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', - 'Standard_F4', 'Standard_F4s', 'Standard_F8', 'Standard_F8s', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', - 'Standard_GS5', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', - 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128s', - 'Standard_M64ms', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', - 'Standard_NC6', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' :type vm_size: str or ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk @@ -69,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" . @@ -102,13 +116,13 @@ class ContainerServiceMasterProfile(Model): 'fqdn': {'key': 'fqdn', 'type': 'str'}, } - def __init__(self, dns_prefix, vm_size, count=1, os_disk_size_gb=None, vnet_subnet_id=None, first_consecutive_static_ip="10.240.255.5", storage_profile=None): - super(ContainerServiceMasterProfile, self).__init__() - self.count = count - self.dns_prefix = dns_prefix - self.vm_size = vm_size - self.os_disk_size_gb = os_disk_size_gb - self.vnet_subnet_id = vnet_subnet_id - self.first_consecutive_static_ip = first_consecutive_static_ip - self.storage_profile = storage_profile + def __init__(self, **kwargs): + super(ContainerServiceMasterProfile, self).__init__(**kwargs) + self.count = kwargs.get('count', 1) + self.dns_prefix = kwargs.get('dns_prefix', 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) + self.first_consecutive_static_ip = kwargs.get('first_consecutive_static_ip', "10.240.255.5") + self.storage_profile = kwargs.get('storage_profile', None) self.fqdn = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py new file mode 100644 index 000000000000..15457f5e44dc --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py @@ -0,0 +1,128 @@ +# 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 ContainerServiceMasterProfile(Model): + """Profile for the container service master. + + 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: Number of masters (VMs) in the container service cluster. + Allowed values are 1, 3, and 5. The default value is 1. Default value: 1 . + :type count: int + :param dns_prefix: Required. DNS prefix to be used to create the FQDN for + the master pool. + :type dns_prefix: str + :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', + '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', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + 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. + :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" . + :type first_consecutive_static_ip: str + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :ivar fqdn: FDQN for the master pool. + :vartype fqdn: str + """ + + _validation = { + 'dns_prefix': {'required': True}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'count': {'key': 'count', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'first_consecutive_static_ip': {'key': 'firstConsecutiveStaticIP', 'type': 'str'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + } + + def __init__(self, *, dns_prefix: str, vm_size, count: int=1, os_disk_size_gb: int=None, vnet_subnet_id: str=None, first_consecutive_static_ip: str="10.240.255.5", storage_profile=None, **kwargs) -> None: + super(ContainerServiceMasterProfile, self).__init__(**kwargs) + self.count = count + self.dns_prefix = dns_prefix + self.vm_size = vm_size + self.os_disk_size_gb = os_disk_size_gb + self.vnet_subnet_id = vnet_subnet_id + self.first_consecutive_static_ip = first_consecutive_static_ip + self.storage_profile = storage_profile + self.fqdn = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py new file mode 100644 index 000000000000..45d3bb48aec7 --- /dev/null +++ b/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") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py new file mode 100644 index 000000000000..ec728075a040 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.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, *, network_plugin="kubenet", network_policy=None, pod_cidr: str="10.244.0.0/16", service_cidr: str="10.0.0.0/16", dns_service_ip: str="10.0.0.10", docker_bridge_cidr: str="172.17.0.1/16", **kwargs) -> None: + super(ContainerServiceNetworkProfile, self).__init__(**kwargs) + self.network_plugin = network_plugin + self.network_policy = network_policy + self.pod_cidr = pod_cidr + self.service_cidr = service_cidr + self.dns_service_ip = dns_service_ip + self.docker_bridge_cidr = docker_bridge_cidr diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile.py index e79a5db11399..8f1edad11b9d 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile.py @@ -15,9 +15,11 @@ class ContainerServiceOrchestratorProfile(Model): """Profile for the container service orchestrator. - :param orchestrator_type: The orchestrator to use to manage container - service cluster resources. Valid values are Kubernetes, Swarm, DCOS, - DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. The orchestrator to use to manage + container service cluster resources. Valid values are Kubernetes, Swarm, + DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom' :type orchestrator_type: str or ~azure.mgmt.containerservice.models.ContainerServiceOrchestratorTypes @@ -36,7 +38,7 @@ class ContainerServiceOrchestratorProfile(Model): 'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'}, } - def __init__(self, orchestrator_type, orchestrator_version=None): - super(ContainerServiceOrchestratorProfile, self).__init__() - self.orchestrator_type = orchestrator_type - self.orchestrator_version = orchestrator_version + def __init__(self, **kwargs): + super(ContainerServiceOrchestratorProfile, self).__init__(**kwargs) + self.orchestrator_type = kwargs.get('orchestrator_type', None) + self.orchestrator_version = kwargs.get('orchestrator_version', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile_py3.py new file mode 100644 index 000000000000..54d8bc6aa86a --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_orchestrator_profile_py3.py @@ -0,0 +1,44 @@ +# 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 ContainerServiceOrchestratorProfile(Model): + """Profile for the container service orchestrator. + + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. The orchestrator to use to manage + container service cluster resources. Valid values are Kubernetes, Swarm, + DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', + 'DCOS', 'DockerCE', 'Custom' + :type orchestrator_type: str or + ~azure.mgmt.containerservice.models.ContainerServiceOrchestratorTypes + :param orchestrator_version: The version of the orchestrator to use. You + can specify the major.minor.patch part of the actual version.For example, + you can specify version as "1.6.11". + :type orchestrator_version: str + """ + + _validation = { + 'orchestrator_type': {'required': True}, + } + + _attribute_map = { + 'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'}, + 'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'}, + } + + def __init__(self, *, orchestrator_type, orchestrator_version: str=None, **kwargs) -> None: + super(ContainerServiceOrchestratorProfile, self).__init__(**kwargs) + self.orchestrator_type = orchestrator_type + self.orchestrator_version = orchestrator_version diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_py3.py new file mode 100644 index 000000000000..ddec4057c76f --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_py3.py @@ -0,0 +1,107 @@ +# 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 .resource_py3 import Resource + + +class ContainerService(Resource): + """Container service. + + 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: Resource name + :vartype name: str + :ivar type: Resource type + :vartype type: str + :param location: Required. Resource location + :type location: str + :param tags: Resource tags + :type tags: dict[str, str] + :ivar provisioning_state: The current deployment or provisioning state, + which only appears in the response. + :vartype provisioning_state: str + :param orchestrator_profile: Required. Profile for the container service + orchestrator. + :type orchestrator_profile: + ~azure.mgmt.containerservice.models.ContainerServiceOrchestratorProfile + :param custom_profile: Properties to configure a custom container service + cluster. + :type custom_profile: + ~azure.mgmt.containerservice.models.ContainerServiceCustomProfile + :param service_principal_profile: Information about a service principal + identity for the cluster to use for manipulating Azure APIs. Exact one of + secret or keyVaultSecretRef need to be specified. + :type service_principal_profile: + ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile + :param master_profile: Required. Profile for the container service master. + :type master_profile: + ~azure.mgmt.containerservice.models.ContainerServiceMasterProfile + :param agent_pool_profiles: Properties of the agent pool. + :type agent_pool_profiles: + list[~azure.mgmt.containerservice.models.ContainerServiceAgentPoolProfile] + :param windows_profile: Profile for Windows VMs in the container service + cluster. + :type windows_profile: + ~azure.mgmt.containerservice.models.ContainerServiceWindowsProfile + :param linux_profile: Required. Profile for Linux VMs in the container + service cluster. + :type linux_profile: + ~azure.mgmt.containerservice.models.ContainerServiceLinuxProfile + :param diagnostics_profile: Profile for diagnostics in the container + service cluster. + :type diagnostics_profile: + ~azure.mgmt.containerservice.models.ContainerServiceDiagnosticsProfile + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'location': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'orchestrator_profile': {'required': True}, + 'master_profile': {'required': True}, + 'linux_profile': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'orchestrator_profile': {'key': 'properties.orchestratorProfile', 'type': 'ContainerServiceOrchestratorProfile'}, + 'custom_profile': {'key': 'properties.customProfile', 'type': 'ContainerServiceCustomProfile'}, + 'service_principal_profile': {'key': 'properties.servicePrincipalProfile', 'type': 'ContainerServiceServicePrincipalProfile'}, + 'master_profile': {'key': 'properties.masterProfile', 'type': 'ContainerServiceMasterProfile'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ContainerServiceAgentPoolProfile]'}, + 'windows_profile': {'key': 'properties.windowsProfile', 'type': 'ContainerServiceWindowsProfile'}, + 'linux_profile': {'key': 'properties.linuxProfile', 'type': 'ContainerServiceLinuxProfile'}, + 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'ContainerServiceDiagnosticsProfile'}, + } + + def __init__(self, *, location: str, orchestrator_profile, master_profile, linux_profile, tags=None, custom_profile=None, service_principal_profile=None, agent_pool_profiles=None, windows_profile=None, diagnostics_profile=None, **kwargs) -> None: + super(ContainerService, self).__init__(location=location, tags=tags, **kwargs) + self.provisioning_state = None + self.orchestrator_profile = orchestrator_profile + self.custom_profile = custom_profile + self.service_principal_profile = service_principal_profile + self.master_profile = master_profile + self.agent_pool_profiles = agent_pool_profiles + self.windows_profile = windows_profile + self.linux_profile = linux_profile + self.diagnostics_profile = diagnostics_profile diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile.py index 38c0c60a18db..acef0ac89b5a 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile.py @@ -17,7 +17,9 @@ class ContainerServiceServicePrincipalProfile(Model): manipulating Azure APIs. Either secret or keyVaultSecretRef must be specified. - :param client_id: The ID for the service principal. + All required parameters must be populated in order to send to Azure. + + :param client_id: Required. The ID for the service principal. :type client_id: str :param secret: The secret password associated with the service principal in plain text. @@ -38,8 +40,8 @@ class ContainerServiceServicePrincipalProfile(Model): 'key_vault_secret_ref': {'key': 'keyVaultSecretRef', 'type': 'KeyVaultSecretRef'}, } - def __init__(self, client_id, secret=None, key_vault_secret_ref=None): - super(ContainerServiceServicePrincipalProfile, self).__init__() - self.client_id = client_id - self.secret = secret - self.key_vault_secret_ref = key_vault_secret_ref + def __init__(self, **kwargs): + super(ContainerServiceServicePrincipalProfile, self).__init__(**kwargs) + self.client_id = kwargs.get('client_id', None) + self.secret = kwargs.get('secret', None) + self.key_vault_secret_ref = kwargs.get('key_vault_secret_ref', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile_py3.py new file mode 100644 index 000000000000..f08ef052ac13 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_service_principal_profile_py3.py @@ -0,0 +1,47 @@ +# 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 ContainerServiceServicePrincipalProfile(Model): + """Information about a service principal identity for the cluster to use for + manipulating Azure APIs. Either secret or keyVaultSecretRef must be + specified. + + All required parameters must be populated in order to send to Azure. + + :param client_id: Required. The ID for the service principal. + :type client_id: str + :param secret: The secret password associated with the service principal + in plain text. + :type secret: str + :param key_vault_secret_ref: Reference to a secret stored in Azure Key + Vault. + :type key_vault_secret_ref: + ~azure.mgmt.containerservice.models.KeyVaultSecretRef + """ + + _validation = { + 'client_id': {'required': True}, + } + + _attribute_map = { + 'client_id': {'key': 'clientId', 'type': 'str'}, + 'secret': {'key': 'secret', 'type': 'str'}, + 'key_vault_secret_ref': {'key': 'keyVaultSecretRef', 'type': 'KeyVaultSecretRef'}, + } + + def __init__(self, *, client_id: str, secret: str=None, key_vault_secret_ref=None, **kwargs) -> None: + super(ContainerServiceServicePrincipalProfile, self).__init__(**kwargs) + self.client_id = client_id + self.secret = secret + self.key_vault_secret_ref = key_vault_secret_ref diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration.py index b4840c5d020d..cce2acd87900 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration.py @@ -15,8 +15,10 @@ class ContainerServiceSshConfiguration(Model): """SSH configuration for Linux-based VMs running on Azure. - :param public_keys: The list of SSH public keys used to authenticate with - Linux-based VMs. Only expect one key specified. + All required parameters must be populated in order to send to Azure. + + :param public_keys: Required. The list of SSH public keys used to + authenticate with Linux-based VMs. Only expect one key specified. :type public_keys: list[~azure.mgmt.containerservice.models.ContainerServiceSshPublicKey] """ @@ -29,6 +31,6 @@ class ContainerServiceSshConfiguration(Model): 'public_keys': {'key': 'publicKeys', 'type': '[ContainerServiceSshPublicKey]'}, } - def __init__(self, public_keys): - super(ContainerServiceSshConfiguration, self).__init__() - self.public_keys = public_keys + def __init__(self, **kwargs): + super(ContainerServiceSshConfiguration, self).__init__(**kwargs) + self.public_keys = kwargs.get('public_keys', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration_py3.py new file mode 100644 index 000000000000..f11d2b896abf --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_configuration_py3.py @@ -0,0 +1,36 @@ +# 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 ContainerServiceSshConfiguration(Model): + """SSH configuration for Linux-based VMs running on Azure. + + All required parameters must be populated in order to send to Azure. + + :param public_keys: Required. The list of SSH public keys used to + authenticate with Linux-based VMs. Only expect one key specified. + :type public_keys: + list[~azure.mgmt.containerservice.models.ContainerServiceSshPublicKey] + """ + + _validation = { + 'public_keys': {'required': True}, + } + + _attribute_map = { + 'public_keys': {'key': 'publicKeys', 'type': '[ContainerServiceSshPublicKey]'}, + } + + def __init__(self, *, public_keys, **kwargs) -> None: + super(ContainerServiceSshConfiguration, self).__init__(**kwargs) + self.public_keys = public_keys diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key.py index 68595fb1f6fc..da7609ba2226 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key.py @@ -15,9 +15,11 @@ class ContainerServiceSshPublicKey(Model): """Contains information about SSH certificate public key data. - :param key_data: Certificate public key used to authenticate with VMs - through SSH. The certificate must be in PEM format with or without - headers. + All required parameters must be populated in order to send to Azure. + + :param key_data: Required. Certificate public key used to authenticate + with VMs through SSH. The certificate must be in PEM format with or + without headers. :type key_data: str """ @@ -29,6 +31,6 @@ class ContainerServiceSshPublicKey(Model): 'key_data': {'key': 'keyData', 'type': 'str'}, } - def __init__(self, key_data): - super(ContainerServiceSshPublicKey, self).__init__() - self.key_data = key_data + def __init__(self, **kwargs): + super(ContainerServiceSshPublicKey, self).__init__(**kwargs) + self.key_data = kwargs.get('key_data', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key_py3.py new file mode 100644 index 000000000000..8e8c10544ef4 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_ssh_public_key_py3.py @@ -0,0 +1,36 @@ +# 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 ContainerServiceSshPublicKey(Model): + """Contains information about SSH certificate public key data. + + All required parameters must be populated in order to send to Azure. + + :param key_data: Required. Certificate public key used to authenticate + with VMs through SSH. The certificate must be in PEM format with or + without headers. + :type key_data: str + """ + + _validation = { + 'key_data': {'required': True}, + } + + _attribute_map = { + 'key_data': {'key': 'keyData', 'type': 'str'}, + } + + def __init__(self, *, key_data: str, **kwargs) -> None: + super(ContainerServiceSshPublicKey, self).__init__(**kwargs) + self.key_data = key_data diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics.py index 1571d9a71f3a..f1804c66b683 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics.py @@ -18,7 +18,10 @@ class ContainerServiceVMDiagnostics(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param enabled: Whether the VM diagnostic agent is provisioned on the VM. + All required parameters must be populated in order to send to Azure. + + :param enabled: Required. Whether the VM diagnostic agent is provisioned + on the VM. :type enabled: bool :ivar storage_uri: The URI of the storage account where diagnostics are stored. @@ -35,7 +38,7 @@ class ContainerServiceVMDiagnostics(Model): 'storage_uri': {'key': 'storageUri', 'type': 'str'}, } - def __init__(self, enabled): - super(ContainerServiceVMDiagnostics, self).__init__() - self.enabled = enabled + def __init__(self, **kwargs): + super(ContainerServiceVMDiagnostics, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) self.storage_uri = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics_py3.py new file mode 100644 index 000000000000..a716fc269548 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_vm_diagnostics_py3.py @@ -0,0 +1,44 @@ +# 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 ContainerServiceVMDiagnostics(Model): + """Profile for diagnostics on the container service VMs. + + 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 enabled: Required. Whether the VM diagnostic agent is provisioned + on the VM. + :type enabled: bool + :ivar storage_uri: The URI of the storage account where diagnostics are + stored. + :vartype storage_uri: str + """ + + _validation = { + 'enabled': {'required': True}, + 'storage_uri': {'readonly': True}, + } + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + 'storage_uri': {'key': 'storageUri', 'type': 'str'}, + } + + def __init__(self, *, enabled: bool, **kwargs) -> None: + super(ContainerServiceVMDiagnostics, self).__init__(**kwargs) + self.enabled = enabled + self.storage_uri = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile.py index 24b4fe49d2b1..463253c6d6a9 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile.py @@ -15,9 +15,13 @@ class ContainerServiceWindowsProfile(Model): """Profile for Windows VMs in the container service cluster. - :param admin_username: The administrator username to use for Windows VMs. + All required parameters must be populated in order to send to Azure. + + :param admin_username: Required. The administrator username to use for + Windows VMs. :type admin_username: str - :param admin_password: The administrator password to use for Windows VMs. + :param admin_password: Required. The administrator password to use for + Windows VMs. :type admin_password: str """ @@ -31,7 +35,7 @@ class ContainerServiceWindowsProfile(Model): 'admin_password': {'key': 'adminPassword', 'type': 'str'}, } - def __init__(self, admin_username, admin_password): - super(ContainerServiceWindowsProfile, self).__init__() - self.admin_username = admin_username - self.admin_password = admin_password + def __init__(self, **kwargs): + super(ContainerServiceWindowsProfile, self).__init__(**kwargs) + self.admin_username = kwargs.get('admin_username', None) + self.admin_password = kwargs.get('admin_password', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile_py3.py new file mode 100644 index 000000000000..667c96367aa9 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_windows_profile_py3.py @@ -0,0 +1,41 @@ +# 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 ContainerServiceWindowsProfile(Model): + """Profile for Windows VMs in the container service cluster. + + All required parameters must be populated in order to send to Azure. + + :param admin_username: Required. The administrator username to use for + Windows VMs. + :type admin_username: str + :param admin_password: Required. The administrator password to use for + Windows VMs. + :type admin_password: str + """ + + _validation = { + 'admin_username': {'required': True, 'pattern': r'^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$'}, + 'admin_password': {'required': True, 'pattern': r'^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\^&\*\(\)])[a-zA-Z\d!@#$%\^&\*\(\)]{12,123}$'}, + } + + _attribute_map = { + 'admin_username': {'key': 'adminUsername', 'type': 'str'}, + 'admin_password': {'key': 'adminPassword', 'type': 'str'}, + } + + def __init__(self, *, admin_username: str, admin_password: str, **kwargs) -> None: + super(ContainerServiceWindowsProfile, self).__init__(**kwargs) + self.admin_username = admin_username + self.admin_password = admin_password diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref.py index 273fcb22e925..5e3c44cac596 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref.py @@ -15,9 +15,11 @@ class KeyVaultSecretRef(Model): """Reference to a secret stored in Azure Key Vault. - :param vault_id: Key vault identifier. + All required parameters must be populated in order to send to Azure. + + :param vault_id: Required. Key vault identifier. :type vault_id: str - :param secret_name: The secret name. + :param secret_name: Required. The secret name. :type secret_name: str :param version: The secret version. :type version: str @@ -34,8 +36,8 @@ class KeyVaultSecretRef(Model): 'version': {'key': 'version', 'type': 'str'}, } - def __init__(self, vault_id, secret_name, version=None): - super(KeyVaultSecretRef, self).__init__() - self.vault_id = vault_id - self.secret_name = secret_name - self.version = version + def __init__(self, **kwargs): + super(KeyVaultSecretRef, self).__init__(**kwargs) + self.vault_id = kwargs.get('vault_id', None) + self.secret_name = kwargs.get('secret_name', None) + self.version = kwargs.get('version', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref_py3.py new file mode 100644 index 000000000000..be0824abfa9a --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/key_vault_secret_ref_py3.py @@ -0,0 +1,43 @@ +# 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 KeyVaultSecretRef(Model): + """Reference to a secret stored in Azure Key Vault. + + All required parameters must be populated in order to send to Azure. + + :param vault_id: Required. Key vault identifier. + :type vault_id: str + :param secret_name: Required. The secret name. + :type secret_name: str + :param version: The secret version. + :type version: str + """ + + _validation = { + 'vault_id': {'required': True}, + 'secret_name': {'required': True}, + } + + _attribute_map = { + 'vault_id': {'key': 'vaultID', 'type': 'str'}, + 'secret_name': {'key': 'secretName', 'type': 'str'}, + 'version': {'key': 'version', 'type': 'str'}, + } + + def __init__(self, *, vault_id: str, secret_name: str, version: str=None, **kwargs) -> None: + super(KeyVaultSecretRef, self).__init__(**kwargs) + self.vault_id = vault_id + self.secret_name = secret_name + self.version = version diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py index fd9be4d2ba10..3dbfcf996b0e 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py @@ -18,29 +18,31 @@ class ManagedCluster(Resource): 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: Resource name :vartype name: str :ivar type: Resource type :vartype type: str - :param location: Resource location + :param location: Required. Resource location :type location: str :param tags: Resource tags :type tags: dict[str, str] :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str + :param kubernetes_version: Version of Kubernetes specified when creating + the managed cluster. + :type kubernetes_version: str :param dns_prefix: DNS prefix specified when creating the managed cluster. :type dns_prefix: str :ivar fqdn: FDQN for the master pool. :vartype fqdn: str - :param kubernetes_version: Version of Kubernetes specified when creating - the managed cluster. - :type kubernetes_version: str :param agent_pool_profiles: Properties of the agent pool. :type agent_pool_profiles: - list[~azure.mgmt.containerservice.models.ContainerServiceAgentPoolProfile] + list[~azure.mgmt.containerservice.models.ManagedClusterAgentPoolProfile] :param linux_profile: Profile for Linux VMs in the container service cluster. :type linux_profile: @@ -50,6 +52,18 @@ class ManagedCluster(Resource): or keyVaultSecretRef must be specified. :type service_principal_profile: ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile + :param addon_profiles: Profile of managed cluster add-on. + :type addon_profiles: dict[str, + ~azure.mgmt.containerservice.models.ManagedClusterAddonProfile] + :param enable_rbac: Whether to enable Kubernetes Role-Based Access + Control. + :type enable_rbac: bool + :param network_profile: Profile of network configuration. + :type network_profile: + ~azure.mgmt.containerservice.models.ContainerServiceNetworkProfile + :param aad_profile: Profile of Azure Active Directory configuration. + :type aad_profile: + ~azure.mgmt.containerservice.models.ManagedClusterAADProfile """ _validation = { @@ -68,20 +82,28 @@ class ManagedCluster(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, 'dns_prefix': {'key': 'properties.dnsPrefix', 'type': 'str'}, 'fqdn': {'key': 'properties.fqdn', 'type': 'str'}, - 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, - 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ContainerServiceAgentPoolProfile]'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterAgentPoolProfile]'}, 'linux_profile': {'key': 'properties.linuxProfile', 'type': 'ContainerServiceLinuxProfile'}, 'service_principal_profile': {'key': 'properties.servicePrincipalProfile', 'type': 'ContainerServiceServicePrincipalProfile'}, + 'addon_profiles': {'key': 'properties.addonProfiles', 'type': '{ManagedClusterAddonProfile}'}, + 'enable_rbac': {'key': 'properties.enableRBAC', 'type': 'bool'}, + 'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerServiceNetworkProfile'}, + 'aad_profile': {'key': 'properties.aadProfile', 'type': 'ManagedClusterAADProfile'}, } - def __init__(self, location, tags=None, dns_prefix=None, kubernetes_version=None, agent_pool_profiles=None, linux_profile=None, service_principal_profile=None): - super(ManagedCluster, self).__init__(location=location, tags=tags) + def __init__(self, **kwargs): + super(ManagedCluster, self).__init__(**kwargs) self.provisioning_state = None - self.dns_prefix = dns_prefix + self.kubernetes_version = kwargs.get('kubernetes_version', None) + self.dns_prefix = kwargs.get('dns_prefix', None) self.fqdn = None - self.kubernetes_version = kubernetes_version - self.agent_pool_profiles = agent_pool_profiles - self.linux_profile = linux_profile - self.service_principal_profile = service_principal_profile + self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None) + self.linux_profile = kwargs.get('linux_profile', None) + self.service_principal_profile = kwargs.get('service_principal_profile', None) + self.addon_profiles = kwargs.get('addon_profiles', None) + self.enable_rbac = kwargs.get('enable_rbac', None) + self.network_profile = kwargs.get('network_profile', None) + self.aad_profile = kwargs.get('aad_profile', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py new file mode 100644 index 000000000000..50e3acd14b60 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py @@ -0,0 +1,49 @@ +# 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 ManagedClusterAADProfile(Model): + """AADProfile specifies attributes for Azure Active Directory integration. + + All required parameters must be populated in order to send to Azure. + + :param client_app_id: Required. The client AAD application ID. + :type client_app_id: str + :param server_app_id: Required. The server AAD application ID. + :type server_app_id: str + :param server_app_secret: Required. The server AAD application secret. + :type server_app_secret: str + :param tenant_id: The AAD tenant ID to use for authentication. If not + specified, will use the tenant of the deployment subscription. + :type tenant_id: str + """ + + _validation = { + 'client_app_id': {'required': True}, + 'server_app_id': {'required': True}, + 'server_app_secret': {'required': True}, + } + + _attribute_map = { + 'client_app_id': {'key': 'clientAppID', 'type': 'str'}, + 'server_app_id': {'key': 'serverAppID', 'type': 'str'}, + 'server_app_secret': {'key': 'serverAppSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantID', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAADProfile, self).__init__(**kwargs) + self.client_app_id = kwargs.get('client_app_id', None) + self.server_app_id = kwargs.get('server_app_id', None) + self.server_app_secret = kwargs.get('server_app_secret', None) + self.tenant_id = kwargs.get('tenant_id', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py new file mode 100644 index 000000000000..6db15c1dd6c2 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py @@ -0,0 +1,49 @@ +# 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 ManagedClusterAADProfile(Model): + """AADProfile specifies attributes for Azure Active Directory integration. + + All required parameters must be populated in order to send to Azure. + + :param client_app_id: Required. The client AAD application ID. + :type client_app_id: str + :param server_app_id: Required. The server AAD application ID. + :type server_app_id: str + :param server_app_secret: Required. The server AAD application secret. + :type server_app_secret: str + :param tenant_id: The AAD tenant ID to use for authentication. If not + specified, will use the tenant of the deployment subscription. + :type tenant_id: str + """ + + _validation = { + 'client_app_id': {'required': True}, + 'server_app_id': {'required': True}, + 'server_app_secret': {'required': True}, + } + + _attribute_map = { + 'client_app_id': {'key': 'clientAppID', 'type': 'str'}, + 'server_app_id': {'key': 'serverAppID', 'type': 'str'}, + 'server_app_secret': {'key': 'serverAppSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantID', 'type': 'str'}, + } + + def __init__(self, *, client_app_id: str, server_app_id: str, server_app_secret: str, tenant_id: str=None, **kwargs) -> None: + super(ManagedClusterAADProfile, self).__init__(**kwargs) + self.client_app_id = client_app_id + self.server_app_id = server_app_id + self.server_app_secret = server_app_secret + self.tenant_id = tenant_id diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile.py index 9af40f21fe47..6dc2a4ec23be 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile.py @@ -18,18 +18,20 @@ class ManagedClusterAccessProfile(Resource): 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: Resource name :vartype name: str :ivar type: Resource type :vartype type: str - :param location: Resource location + :param location: Required. Resource location :type location: str :param tags: Resource tags :type tags: dict[str, str] :param kube_config: Base64-encoded Kubernetes configuration file. - :type kube_config: str + :type kube_config: bytearray """ _validation = { @@ -45,9 +47,9 @@ class ManagedClusterAccessProfile(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'kube_config': {'key': 'properties.kubeConfig', 'type': 'str'}, + 'kube_config': {'key': 'properties.kubeConfig', 'type': 'bytearray'}, } - def __init__(self, location, tags=None, kube_config=None): - super(ManagedClusterAccessProfile, self).__init__(location=location, tags=tags) - self.kube_config = kube_config + def __init__(self, **kwargs): + super(ManagedClusterAccessProfile, self).__init__(**kwargs) + self.kube_config = kwargs.get('kube_config', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile_py3.py new file mode 100644 index 000000000000..0d3fb998e970 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_access_profile_py3.py @@ -0,0 +1,55 @@ +# 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 .resource_py3 import Resource + + +class ManagedClusterAccessProfile(Resource): + """Managed cluster Access Profile. + + 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: Resource name + :vartype name: str + :ivar type: Resource type + :vartype type: str + :param location: Required. Resource location + :type location: str + :param tags: Resource tags + :type tags: dict[str, str] + :param kube_config: Base64-encoded Kubernetes configuration file. + :type kube_config: bytearray + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'location': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'kube_config': {'key': 'properties.kubeConfig', 'type': 'bytearray'}, + } + + def __init__(self, *, location: str, tags=None, kube_config: bytearray=None, **kwargs) -> None: + super(ManagedClusterAccessProfile, self).__init__(location=location, tags=tags, **kwargs) + self.kube_config = kube_config diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py new file mode 100644 index 000000000000..796f9246a686 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py @@ -0,0 +1,38 @@ +# 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 ManagedClusterAddonProfile(Model): + """A Kubernetes add-on profile for a managed cluster. + + All required parameters must be populated in order to send to Azure. + + :param enabled: Required. Whether the add-on is enabled or not. + :type enabled: bool + :param config: Key-value pairs for configuring an add-on. + :type config: dict[str, str] + """ + + _validation = { + 'enabled': {'required': True}, + } + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + 'config': {'key': 'config', 'type': '{str}'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAddonProfile, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) + self.config = kwargs.get('config', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py new file mode 100644 index 000000000000..71e05cd14c0e --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py @@ -0,0 +1,38 @@ +# 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 ManagedClusterAddonProfile(Model): + """A Kubernetes add-on profile for a managed cluster. + + All required parameters must be populated in order to send to Azure. + + :param enabled: Required. Whether the add-on is enabled or not. + :type enabled: bool + :param config: Key-value pairs for configuring an add-on. + :type config: dict[str, str] + """ + + _validation = { + 'enabled': {'required': True}, + } + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + 'config': {'key': 'config', 'type': '{str}'}, + } + + def __init__(self, *, enabled: bool, config=None, **kwargs) -> None: + super(ManagedClusterAddonProfile, self).__init__(**kwargs) + self.enabled = enabled + self.config = config diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py new file mode 100644 index 000000000000..3684c29a65e3 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py @@ -0,0 +1,145 @@ +# 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 ManagedClusterAgentPoolProfile(Model): + """Profile for the container service agent pool. + + 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 name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. + :type name: str + :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. . Default value: 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', + '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', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + will apply the default osDisk size according to the vmSize specified. + :type os_disk_size_gb: int + :param dns_prefix: DNS prefix to be used to create the FQDN for the agent + pool. + :type dns_prefix: str + :ivar fqdn: FDQN for the agent pool. + :vartype fqdn: str + :param ports: Ports number array used to expose on this agent pool. The + default opened ports are different based on your choice of orchestrator. + :type ports: list[int] + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet + identifier. + :type vnet_subnet_id: str + :param max_pods: Maximum number of pods that can run on a node. + :type max_pods: int + :param os_type: OsType to be used to specify os type. Choose from Linux + and Windows. Default to Linux. Possible values include: 'Linux', + 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + """ + + _validation = { + 'name': {'required': True}, + 'count': {'maximum': 100, 'minimum': 1}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + 'ports': {'key': 'ports', 'type': '[int]'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'max_pods': {'key': 'maxPods', 'type': 'int'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAgentPoolProfile, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.count = kwargs.get('count', 1) + self.vm_size = kwargs.get('vm_size', None) + self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None) + self.dns_prefix = kwargs.get('dns_prefix', None) + self.fqdn = None + self.ports = kwargs.get('ports', None) + self.storage_profile = kwargs.get('storage_profile', None) + self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None) + self.max_pods = kwargs.get('max_pods', None) + self.os_type = kwargs.get('os_type', "Linux") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py new file mode 100644 index 000000000000..7434429facd8 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py @@ -0,0 +1,145 @@ +# 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 ManagedClusterAgentPoolProfile(Model): + """Profile for the container service agent pool. + + 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 name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. + :type name: str + :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. . Default value: 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', + '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', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + will apply the default osDisk size according to the vmSize specified. + :type os_disk_size_gb: int + :param dns_prefix: DNS prefix to be used to create the FQDN for the agent + pool. + :type dns_prefix: str + :ivar fqdn: FDQN for the agent pool. + :vartype fqdn: str + :param ports: Ports number array used to expose on this agent pool. The + default opened ports are different based on your choice of orchestrator. + :type ports: list[int] + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet + identifier. + :type vnet_subnet_id: str + :param max_pods: Maximum number of pods that can run on a node. + :type max_pods: int + :param os_type: OsType to be used to specify os type. Choose from Linux + and Windows. Default to Linux. Possible values include: 'Linux', + 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + """ + + _validation = { + 'name': {'required': True}, + 'count': {'maximum': 100, 'minimum': 1}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + 'ports': {'key': 'ports', 'type': '[int]'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'max_pods': {'key': 'maxPods', 'type': 'int'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + } + + def __init__(self, *, name: str, vm_size, count: int=1, os_disk_size_gb: int=None, dns_prefix: str=None, ports=None, storage_profile=None, vnet_subnet_id: str=None, max_pods: int=None, os_type="Linux", **kwargs) -> None: + super(ManagedClusterAgentPoolProfile, self).__init__(**kwargs) + self.name = name + self.count = count + self.vm_size = vm_size + self.os_disk_size_gb = os_disk_size_gb + self.dns_prefix = dns_prefix + self.fqdn = None + self.ports = ports + self.storage_profile = storage_profile + self.vnet_subnet_id = vnet_subnet_id + self.max_pods = max_pods + self.os_type = os_type diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile.py index a3edf16e46de..b6967a4a13e7 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile.py @@ -15,13 +15,16 @@ class ManagedClusterPoolUpgradeProfile(Model): """The list of available upgrade versions. - :param kubernetes_version: Kubernetes version (major, minor, patch). + All required parameters must be populated in order to send to Azure. + + :param kubernetes_version: Required. Kubernetes version (major, minor, + patch). :type kubernetes_version: str :param name: Pool name. :type name: str - :param os_type: OsType to be used to specify os type. Choose from Linux - and Windows. Default to Linux. Possible values include: 'Linux', - 'Windows'. Default value: "Linux" . + :param os_type: Required. OsType to be used to specify os type. Choose + from Linux and Windows. Default to Linux. Possible values include: + 'Linux', 'Windows'. Default value: "Linux" . :type os_type: str or ~azure.mgmt.containerservice.models.OSType :param upgrades: List of orchestrator types and versions available for upgrade. @@ -40,9 +43,9 @@ class ManagedClusterPoolUpgradeProfile(Model): 'upgrades': {'key': 'upgrades', 'type': '[str]'}, } - def __init__(self, kubernetes_version, name=None, os_type="Linux", upgrades=None): - super(ManagedClusterPoolUpgradeProfile, self).__init__() - self.kubernetes_version = kubernetes_version - self.name = name - self.os_type = os_type - self.upgrades = upgrades + def __init__(self, **kwargs): + super(ManagedClusterPoolUpgradeProfile, self).__init__(**kwargs) + self.kubernetes_version = kwargs.get('kubernetes_version', None) + self.name = kwargs.get('name', None) + self.os_type = kwargs.get('os_type', "Linux") + self.upgrades = kwargs.get('upgrades', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile_py3.py new file mode 100644 index 000000000000..a7bc407e58e2 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_pool_upgrade_profile_py3.py @@ -0,0 +1,51 @@ +# 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 ManagedClusterPoolUpgradeProfile(Model): + """The list of available upgrade versions. + + All required parameters must be populated in order to send to Azure. + + :param kubernetes_version: Required. Kubernetes version (major, minor, + patch). + :type kubernetes_version: str + :param name: Pool name. + :type name: str + :param os_type: Required. OsType to be used to specify os type. Choose + from Linux and Windows. Default to Linux. Possible values include: + 'Linux', 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + :param upgrades: List of orchestrator types and versions available for + upgrade. + :type upgrades: list[str] + """ + + _validation = { + 'kubernetes_version': {'required': True}, + 'os_type': {'required': True}, + } + + _attribute_map = { + 'kubernetes_version': {'key': 'kubernetesVersion', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + 'upgrades': {'key': 'upgrades', 'type': '[str]'}, + } + + def __init__(self, *, kubernetes_version: str, name: str=None, os_type="Linux", upgrades=None, **kwargs) -> None: + super(ManagedClusterPoolUpgradeProfile, self).__init__(**kwargs) + self.kubernetes_version = kubernetes_version + self.name = name + self.os_type = os_type + self.upgrades = upgrades diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py new file mode 100644 index 000000000000..2bd2f52cb5e4 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py @@ -0,0 +1,109 @@ +# 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 .resource_py3 import Resource + + +class ManagedCluster(Resource): + """Managed cluster. + + 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: Resource name + :vartype name: str + :ivar type: Resource type + :vartype type: str + :param location: Required. Resource location + :type location: str + :param tags: Resource tags + :type tags: dict[str, str] + :ivar provisioning_state: The current deployment or provisioning state, + which only appears in the response. + :vartype provisioning_state: str + :param kubernetes_version: Version of Kubernetes specified when creating + the managed cluster. + :type kubernetes_version: str + :param dns_prefix: DNS prefix specified when creating the managed cluster. + :type dns_prefix: str + :ivar fqdn: FDQN for the master pool. + :vartype fqdn: str + :param agent_pool_profiles: Properties of the agent pool. + :type agent_pool_profiles: + list[~azure.mgmt.containerservice.models.ManagedClusterAgentPoolProfile] + :param linux_profile: Profile for Linux VMs in the container service + cluster. + :type linux_profile: + ~azure.mgmt.containerservice.models.ContainerServiceLinuxProfile + :param service_principal_profile: Information about a service principal + identity for the cluster to use for manipulating Azure APIs. Either secret + or keyVaultSecretRef must be specified. + :type service_principal_profile: + ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile + :param addon_profiles: Profile of managed cluster add-on. + :type addon_profiles: dict[str, + ~azure.mgmt.containerservice.models.ManagedClusterAddonProfile] + :param enable_rbac: Whether to enable Kubernetes Role-Based Access + Control. + :type enable_rbac: bool + :param network_profile: Profile of network configuration. + :type network_profile: + ~azure.mgmt.containerservice.models.ContainerServiceNetworkProfile + :param aad_profile: Profile of Azure Active Directory configuration. + :type aad_profile: + ~azure.mgmt.containerservice.models.ManagedClusterAADProfile + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'location': {'required': True}, + 'provisioning_state': {'readonly': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, + 'dns_prefix': {'key': 'properties.dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'properties.fqdn', 'type': 'str'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterAgentPoolProfile]'}, + 'linux_profile': {'key': 'properties.linuxProfile', 'type': 'ContainerServiceLinuxProfile'}, + 'service_principal_profile': {'key': 'properties.servicePrincipalProfile', 'type': 'ContainerServiceServicePrincipalProfile'}, + 'addon_profiles': {'key': 'properties.addonProfiles', 'type': '{ManagedClusterAddonProfile}'}, + 'enable_rbac': {'key': 'properties.enableRBAC', 'type': 'bool'}, + 'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerServiceNetworkProfile'}, + 'aad_profile': {'key': 'properties.aadProfile', 'type': 'ManagedClusterAADProfile'}, + } + + def __init__(self, *, location: str, tags=None, kubernetes_version: str=None, dns_prefix: str=None, agent_pool_profiles=None, linux_profile=None, service_principal_profile=None, addon_profiles=None, enable_rbac: bool=None, network_profile=None, aad_profile=None, **kwargs) -> None: + super(ManagedCluster, self).__init__(location=location, tags=tags, **kwargs) + self.provisioning_state = None + self.kubernetes_version = kubernetes_version + self.dns_prefix = dns_prefix + self.fqdn = None + self.agent_pool_profiles = agent_pool_profiles + self.linux_profile = linux_profile + self.service_principal_profile = service_principal_profile + self.addon_profiles = addon_profiles + self.enable_rbac = enable_rbac + self.network_profile = network_profile + self.aad_profile = aad_profile diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile.py index 203713521738..11825a0b7392 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile.py @@ -18,18 +18,20 @@ class ManagedClusterUpgradeProfile(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. + :ivar id: Id of upgrade profile. :vartype id: str :ivar name: Name of upgrade profile. :vartype name: str :ivar type: Type of upgrade profile. :vartype type: str - :param control_plane_profile: The list of available upgrade versions for - the control plane. + :param control_plane_profile: Required. The list of available upgrade + versions for the control plane. :type control_plane_profile: ~azure.mgmt.containerservice.models.ManagedClusterPoolUpgradeProfile - :param agent_pool_profiles: The list of available upgrade versions for - agent pools. + :param agent_pool_profiles: Required. The list of available upgrade + versions for agent pools. :type agent_pool_profiles: list[~azure.mgmt.containerservice.models.ManagedClusterPoolUpgradeProfile] """ @@ -50,10 +52,10 @@ class ManagedClusterUpgradeProfile(Model): 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterPoolUpgradeProfile]'}, } - def __init__(self, control_plane_profile, agent_pool_profiles): - super(ManagedClusterUpgradeProfile, self).__init__() + def __init__(self, **kwargs): + super(ManagedClusterUpgradeProfile, self).__init__(**kwargs) self.id = None self.name = None self.type = None - self.control_plane_profile = control_plane_profile - self.agent_pool_profiles = agent_pool_profiles + self.control_plane_profile = kwargs.get('control_plane_profile', None) + self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile_py3.py new file mode 100644 index 000000000000..ff69e11fb1bc --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_upgrade_profile_py3.py @@ -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.serialization import Model + + +class ManagedClusterUpgradeProfile(Model): + """The list of available upgrades for compute pools. + + 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: Id of upgrade profile. + :vartype id: str + :ivar name: Name of upgrade profile. + :vartype name: str + :ivar type: Type of upgrade profile. + :vartype type: str + :param control_plane_profile: Required. The list of available upgrade + versions for the control plane. + :type control_plane_profile: + ~azure.mgmt.containerservice.models.ManagedClusterPoolUpgradeProfile + :param agent_pool_profiles: Required. The list of available upgrade + versions for agent pools. + :type agent_pool_profiles: + list[~azure.mgmt.containerservice.models.ManagedClusterPoolUpgradeProfile] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'control_plane_profile': {'required': True}, + 'agent_pool_profiles': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'control_plane_profile': {'key': 'properties.controlPlaneProfile', 'type': 'ManagedClusterPoolUpgradeProfile'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterPoolUpgradeProfile]'}, + } + + def __init__(self, *, control_plane_profile, agent_pool_profiles, **kwargs) -> None: + super(ManagedClusterUpgradeProfile, self).__init__(**kwargs) + self.id = None + self.name = None + self.type = None + self.control_plane_profile = control_plane_profile + self.agent_pool_profiles = agent_pool_profiles diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value.py new file mode 100644 index 000000000000..911f9fc80881 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/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 OperationValue(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(OperationValue, self).__init__(**kwargs) + self.origin = None + self.name = None + self.operation = None + self.resource = None + self.description = None + self.provider = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_paged.py new file mode 100644 index 000000000000..ac39a71819ae --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/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 OperationValuePaged(Paged): + """ + A paging container for iterating over a list of :class:`OperationValue ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[OperationValue]'} + } + + def __init__(self, *args, **kwargs): + + super(OperationValuePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/operation_value_py3.py new file mode 100644 index 000000000000..55bceaa75439 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/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 OperationValue(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(OperationValue, self).__init__(**kwargs) + self.origin = None + self.name = None + self.operation = None + self.resource = None + self.description = None + self.provider = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile.py index e905f193466c..d5560a1f8799 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile.py @@ -15,9 +15,12 @@ class OrchestratorProfile(Model): """Contains information about orchestrator. - :param orchestrator_type: Orchestrator type. + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. Orchestrator type. :type orchestrator_type: str - :param orchestrator_version: Orchestrator version (major, minor, patch). + :param orchestrator_version: Required. Orchestrator version (major, minor, + patch). :type orchestrator_version: str """ @@ -31,7 +34,7 @@ class OrchestratorProfile(Model): 'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'}, } - def __init__(self, orchestrator_type, orchestrator_version): - super(OrchestratorProfile, self).__init__() - self.orchestrator_type = orchestrator_type - self.orchestrator_version = orchestrator_version + def __init__(self, **kwargs): + super(OrchestratorProfile, self).__init__(**kwargs) + self.orchestrator_type = kwargs.get('orchestrator_type', None) + self.orchestrator_version = kwargs.get('orchestrator_version', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile_py3.py new file mode 100644 index 000000000000..f16e84a1fe3c --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_profile_py3.py @@ -0,0 +1,40 @@ +# 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 OrchestratorProfile(Model): + """Contains information about orchestrator. + + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. Orchestrator type. + :type orchestrator_type: str + :param orchestrator_version: Required. Orchestrator version (major, minor, + patch). + :type orchestrator_version: str + """ + + _validation = { + 'orchestrator_type': {'required': True}, + 'orchestrator_version': {'required': True}, + } + + _attribute_map = { + 'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'}, + 'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'}, + } + + def __init__(self, *, orchestrator_type: str, orchestrator_version: str, **kwargs) -> None: + super(OrchestratorProfile, self).__init__(**kwargs) + self.orchestrator_type = orchestrator_type + self.orchestrator_version = orchestrator_version diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile.py index b3ccf20bebd1..a906f913f69f 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile.py @@ -15,13 +15,17 @@ class OrchestratorVersionProfile(Model): """The profile of an orchestrator and its available versions. - :param orchestrator_type: Orchestrator type. + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. Orchestrator type. :type orchestrator_type: str - :param orchestrator_version: Orchestrator version (major, minor, patch). + :param orchestrator_version: Required. Orchestrator version (major, minor, + patch). :type orchestrator_version: str - :param default: Installed by default if version is not specified. + :param default: Required. Installed by default if version is not + specified. :type default: bool - :param upgrades: The list of available upgrade versions. + :param upgrades: Required. The list of available upgrade versions. :type upgrades: list[~azure.mgmt.containerservice.models.OrchestratorProfile] """ @@ -40,9 +44,9 @@ class OrchestratorVersionProfile(Model): 'upgrades': {'key': 'upgrades', 'type': '[OrchestratorProfile]'}, } - def __init__(self, orchestrator_type, orchestrator_version, default, upgrades): - super(OrchestratorVersionProfile, self).__init__() - self.orchestrator_type = orchestrator_type - self.orchestrator_version = orchestrator_version - self.default = default - self.upgrades = upgrades + def __init__(self, **kwargs): + super(OrchestratorVersionProfile, self).__init__(**kwargs) + self.orchestrator_type = kwargs.get('orchestrator_type', None) + self.orchestrator_version = kwargs.get('orchestrator_version', None) + self.default = kwargs.get('default', None) + self.upgrades = kwargs.get('upgrades', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result.py index 4e7f4b44ea61..27c2a65798ae 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result.py @@ -18,13 +18,15 @@ class OrchestratorVersionProfileListResult(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. + :ivar id: Id of the orchestrator version profile list result. :vartype id: str :ivar name: Name of the orchestrator version profile list result. :vartype name: str :ivar type: Type of the orchestrator version profile list result. :vartype type: str - :param orchestrators: List of orchestrator version profiles. + :param orchestrators: Required. List of orchestrator version profiles. :type orchestrators: list[~azure.mgmt.containerservice.models.OrchestratorVersionProfile] """ @@ -43,9 +45,9 @@ class OrchestratorVersionProfileListResult(Model): 'orchestrators': {'key': 'properties.orchestrators', 'type': '[OrchestratorVersionProfile]'}, } - def __init__(self, orchestrators): - super(OrchestratorVersionProfileListResult, self).__init__() + def __init__(self, **kwargs): + super(OrchestratorVersionProfileListResult, self).__init__(**kwargs) self.id = None self.name = None self.type = None - self.orchestrators = orchestrators + self.orchestrators = kwargs.get('orchestrators', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result_py3.py new file mode 100644 index 000000000000..b5bd30a5f546 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_list_result_py3.py @@ -0,0 +1,53 @@ +# 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 OrchestratorVersionProfileListResult(Model): + """The list of versions for supported orchestrators. + + 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: Id of the orchestrator version profile list result. + :vartype id: str + :ivar name: Name of the orchestrator version profile list result. + :vartype name: str + :ivar type: Type of the orchestrator version profile list result. + :vartype type: str + :param orchestrators: Required. List of orchestrator version profiles. + :type orchestrators: + list[~azure.mgmt.containerservice.models.OrchestratorVersionProfile] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'orchestrators': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'orchestrators': {'key': 'properties.orchestrators', 'type': '[OrchestratorVersionProfile]'}, + } + + def __init__(self, *, orchestrators, **kwargs) -> None: + super(OrchestratorVersionProfileListResult, self).__init__(**kwargs) + self.id = None + self.name = None + self.type = None + self.orchestrators = orchestrators diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_py3.py new file mode 100644 index 000000000000..c7bf212170a8 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/orchestrator_version_profile_py3.py @@ -0,0 +1,52 @@ +# 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 OrchestratorVersionProfile(Model): + """The profile of an orchestrator and its available versions. + + All required parameters must be populated in order to send to Azure. + + :param orchestrator_type: Required. Orchestrator type. + :type orchestrator_type: str + :param orchestrator_version: Required. Orchestrator version (major, minor, + patch). + :type orchestrator_version: str + :param default: Required. Installed by default if version is not + specified. + :type default: bool + :param upgrades: Required. The list of available upgrade versions. + :type upgrades: + list[~azure.mgmt.containerservice.models.OrchestratorProfile] + """ + + _validation = { + 'orchestrator_type': {'required': True}, + 'orchestrator_version': {'required': True}, + 'default': {'required': True}, + 'upgrades': {'required': True}, + } + + _attribute_map = { + 'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'}, + 'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'}, + 'default': {'key': 'default', 'type': 'bool'}, + 'upgrades': {'key': 'upgrades', 'type': '[OrchestratorProfile]'}, + } + + def __init__(self, *, orchestrator_type: str, orchestrator_version: str, default: bool, upgrades, **kwargs) -> None: + super(OrchestratorVersionProfile, self).__init__(**kwargs) + self.orchestrator_type = orchestrator_type + self.orchestrator_version = orchestrator_version + self.default = default + self.upgrades = upgrades diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource.py index 10269b591c68..5dd7d481c685 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource.py @@ -18,13 +18,15 @@ class Resource(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. + :ivar id: Resource Id :vartype id: str :ivar name: Resource name :vartype name: str :ivar type: Resource type :vartype type: str - :param location: Resource location + :param location: Required. Resource location :type location: str :param tags: Resource tags :type tags: dict[str, str] @@ -45,10 +47,10 @@ class Resource(Model): 'tags': {'key': 'tags', 'type': '{str}'}, } - def __init__(self, location, tags=None): - super(Resource, self).__init__() + def __init__(self, **kwargs): + super(Resource, self).__init__(**kwargs) self.id = None self.name = None self.type = None - self.location = location - self.tags = tags + self.location = kwargs.get('location', None) + self.tags = kwargs.get('tags', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource_py3.py new file mode 100644 index 000000000000..2f3702caf609 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/resource_py3.py @@ -0,0 +1,56 @@ +# 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 Resource(Model): + """The Resource model definition. + + 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: Resource name + :vartype name: str + :ivar type: Resource type + :vartype type: str + :param location: Required. Resource location + :type location: str + :param tags: Resource tags + :type tags: dict[str, str] + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'location': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + } + + def __init__(self, *, location: str, tags=None, **kwargs) -> None: + super(Resource, self).__init__(**kwargs) + self.id = None + self.name = None + self.type = None + self.location = location + self.tags = tags diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py index 597836f668a8..551547c5317b 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py @@ -10,9 +10,11 @@ # -------------------------------------------------------------------------- from .container_services_operations import ContainerServicesOperations +from .operations import Operations from .managed_clusters_operations import ManagedClustersOperations __all__ = [ 'ContainerServicesOperations', + 'Operations', 'ManagedClustersOperations', ] diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/container_services_operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/container_services_operations.py index 890c01a19637..9901518494b7 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/container_services_operations.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/container_services_operations.py @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -24,7 +24,7 @@ class ContainerServicesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. """ models = models @@ -62,7 +62,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/containerServices' + url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -107,6 +107,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/containerServices'} def _create_or_update_initial( @@ -114,7 +115,7 @@ def _create_or_update_initial( api_version = "2017-07-01" # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}' + url = self.create_or_update.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'containerServiceName': self._serialize.url("container_service_name", container_service_name, 'str'), @@ -165,7 +166,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, container_service_name, parameters, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, container_service_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates a container service. Creates or updates a container service with the specified configuration @@ -180,13 +181,16 @@ def create_or_update( Container Service operation. :type parameters: ~azure.mgmt.containerservice.models.ContainerService :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :return: An instance of AzureOperationPoller that returns - ContainerService or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns ContainerService or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.containerservice.models.ContainerService] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.containerservice.models.ContainerService]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -197,30 +201,8 @@ def create_or_update( raw=True, **operation_config ) - if raw: - return raw_result - - # Construct and send request - def long_running_send(): - return raw_result.response - - def get_long_running_status(status_link, headers=None): - - request = self._client.get(status_link) - if headers: - request.headers.update(headers) - header_parameters = {} - header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id'] - return self._client.send( - request, header_parameters, stream=False, **operation_config) def get_long_running_output(response): - - if response.status_code not in [200, 201, 202]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('ContainerService', response) if raw: @@ -229,12 +211,14 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) - return AzureOperationPoller( - long_running_send, get_long_running_output, - get_long_running_status, long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}'} def get( self, resource_group_name, container_service_name, custom_headers=None, raw=False, **operation_config): @@ -263,7 +247,7 @@ def get( api_version = "2017-07-01" # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}' + url = self.get.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'containerServiceName': self._serialize.url("container_service_name", container_service_name, 'str'), @@ -304,6 +288,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}'} def _delete_initial( @@ -311,7 +296,7 @@ def _delete_initial( api_version = "2017-07-01" # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}' + url = self.delete.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'containerServiceName': self._serialize.url("container_service_name", container_service_name, 'str'), @@ -347,7 +332,7 @@ def _delete_initial( return client_raw_response def delete( - self, resource_group_name, container_service_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, container_service_name, custom_headers=None, raw=False, polling=True, **operation_config): """Deletes the specified container service. Deletes the specified container service in the specified subscription @@ -363,12 +348,14 @@ def delete( the specified subscription and resource group. :type container_service_name: str :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :return: An instance of AzureOperationPoller that returns None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._delete_initial( @@ -378,40 +365,20 @@ def delete( raw=True, **operation_config ) - if raw: - return raw_result - - # Construct and send request - def long_running_send(): - return raw_result.response - - def get_long_running_status(status_link, headers=None): - - request = self._client.get(status_link) - if headers: - request.headers.update(headers) - header_parameters = {} - header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id'] - return self._client.send( - request, header_parameters, stream=False, **operation_config) def get_long_running_output(response): - - if response.status_code not in [202, 204]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - long_running_operation_timeout = operation_config.get( + lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) - return AzureOperationPoller( - long_running_send, get_long_running_output, - get_long_running_status, long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices/{containerServiceName}'} def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): @@ -440,7 +407,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices' + url = self.list_by_resource_group.metadata['url'] path_format_arguments = { 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -486,6 +453,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/containerServices'} def list_orchestrators( self, location, resource_type=None, custom_headers=None, raw=False, **operation_config): @@ -515,7 +483,7 @@ def list_orchestrators( api_version = "2017-09-30" # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/orchestrators' + url = self.list_orchestrators.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'location': self._serialize.url("location", location, 'str') @@ -557,3 +525,4 @@ def list_orchestrators( return client_raw_response return deserialized + list_orchestrators.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/orchestrators'} diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py index 867de535c22a..d7b2d3213a34 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py @@ -12,8 +12,8 @@ import uuid from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError -from msrest.exceptions import DeserializationError -from msrestazure.azure_operation import AzureOperationPoller +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling from .. import models @@ -24,8 +24,8 @@ class ManagedClustersOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. - :ivar api_version: Client Api Version. Constant value: "2017-08-31". + :param deserializer: An object model deserializer. + :ivar api_version: Client Api Version. Constant value: "2018-03-31". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-08-31" + self.api_version = "2018-03-31" self.config = config @@ -60,7 +60,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/managedClusters' + url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -105,6 +105,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/managedClusters'} def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): @@ -130,7 +131,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters' + url = self.list_by_resource_group.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str') @@ -176,6 +177,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters'} def get_upgrade_profile( self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): @@ -200,7 +202,7 @@ def get_upgrade_profile( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/upgradeProfiles/default' + url = self.get_upgrade_profile.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -241,10 +243,11 @@ def get_upgrade_profile( return client_raw_response return deserialized + get_upgrade_profile.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/upgradeProfiles/default'} - def get_access_profiles( + def get_access_profile( self, resource_group_name, resource_name, role_name, custom_headers=None, raw=False, **operation_config): - """Gets access profile of a managed cluster. + """Gets an access profile of a managed cluster. Gets the accessProfile for the specified role name of the managed cluster with a specified resource group and name. @@ -268,7 +271,7 @@ def get_access_profiles( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}' + url = self.get_access_profile.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -292,7 +295,7 @@ def get_access_profiles( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) + request = self._client.post(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200]: @@ -310,6 +313,7 @@ def get_access_profiles( return client_raw_response return deserialized + get_access_profile.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential'} def get( self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): @@ -333,7 +337,7 @@ def get( :raises: :class:`CloudError` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -374,12 +378,13 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}'} def _create_or_update_initial( self, resource_group_name, resource_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}' + url = self.create_or_update.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -428,7 +433,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, resource_name, parameters, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, resource_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates a managed cluster. Creates or updates a managed cluster with the specified configuration @@ -442,13 +447,16 @@ def create_or_update( Managed Cluster operation. :type parameters: ~azure.mgmt.containerservice.models.ManagedCluster :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :return: An instance of AzureOperationPoller that returns - ManagedCluster or ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns ManagedCluster or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.containerservice.models.ManagedCluster] - or ~msrest.pipeline.ClientRawResponse + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.containerservice.models.ManagedCluster]] :raises: :class:`CloudError` """ raw_result = self._create_or_update_initial( @@ -459,30 +467,8 @@ def create_or_update( raw=True, **operation_config ) - if raw: - return raw_result - - # Construct and send request - def long_running_send(): - return raw_result.response - - def get_long_running_status(status_link, headers=None): - - request = self._client.get(status_link) - if headers: - request.headers.update(headers) - header_parameters = {} - header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id'] - return self._client.send( - request, header_parameters, stream=False, **operation_config) def get_long_running_output(response): - - if response.status_code not in [200, 201]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - deserialized = self._deserialize('ManagedCluster', response) if raw: @@ -491,18 +477,20 @@ def get_long_running_output(response): return deserialized - long_running_operation_timeout = operation_config.get( + lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) - return AzureOperationPoller( - long_running_send, get_long_running_output, - get_long_running_status, long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}'} def _delete_initial( self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}' + url = self.delete.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), @@ -538,7 +526,7 @@ def _delete_initial( return client_raw_response def delete( - self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, resource_name, custom_headers=None, raw=False, polling=True, **operation_config): """Deletes a managed cluster. Deletes the managed cluster with a specified resource group and name. @@ -548,12 +536,14 @@ def delete( :param resource_name: The name of the managed cluster resource. :type resource_name: str :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :return: An instance of AzureOperationPoller that returns None or - ClientRawResponse if raw=true + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or - ~msrest.pipeline.ClientRawResponse + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: :class:`CloudError` """ raw_result = self._delete_initial( @@ -563,37 +553,17 @@ def delete( raw=True, **operation_config ) - if raw: - return raw_result - - # Construct and send request - def long_running_send(): - return raw_result.response - - def get_long_running_status(status_link, headers=None): - - request = self._client.get(status_link) - if headers: - request.headers.update(headers) - header_parameters = {} - header_parameters['x-ms-client-request-id'] = raw_result.response.request.headers['x-ms-client-request-id'] - return self._client.send( - request, header_parameters, stream=False, **operation_config) def get_long_running_output(response): - - if response.status_code not in [202, 204]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response - long_running_operation_timeout = operation_config.get( + lro_delay = operation_config.get( 'long_running_operation_timeout', self.config.long_running_operation_timeout) - return AzureOperationPoller( - long_running_send, get_long_running_output, - get_long_running_status, long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}'} diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py new file mode 100644 index 000000000000..83337ae0311b --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py @@ -0,0 +1,99 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class Operations(object): + """Operations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client Api Version. Constant value: "2018-03-31". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-03-31" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Gets a list of compute operations. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of OperationValue + :rtype: + ~azure.mgmt.containerservice.models.OperationValuePaged[~azure.mgmt.containerservice.models.OperationValue] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters) + response = self._client.send( + request, header_parameters, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.OperationValuePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.OperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/providers/Microsoft.ContainerService/operations'} diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py index fc4db3937e08..20cee28211d4 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "3.0.1" +VERSION = "4.0.0" diff --git a/azure-mgmt-containerservice/build.json b/azure-mgmt-containerservice/build.json deleted file mode 100644 index 4bac75b7e46d..000000000000 --- a/azure-mgmt-containerservice/build.json +++ /dev/null @@ -1,235 +0,0 @@ -{ - "autorest": [ - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest-core", - "version": "2.0.4168", - "engines": { - "node": ">=7.10.0" - }, - "dependencies": {}, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/async-io": "~1.0.22", - "@microsoft.azure/extension": "~1.2.12", - "@types/commonmark": "^0.27.0", - "@types/jsonpath": "^0.1.29", - "@types/node": "^8.0.28", - "@types/pify": "0.0.28", - "@types/source-map": "^0.5.0", - "@types/yargs": "^8.0.2", - "commonmark": "^0.27.0", - "file-url": "^2.0.2", - "get-uri": "^2.0.0", - "jsonpath": "^0.2.11", - "linq-es2015": "^2.4.25", - "mocha": "3.4.2", - "mocha-typescript": "1.1.5", - "pify": "^3.0.0", - "safe-eval": "^0.3.0", - "shx": "^0.2.2", - "source-map": "^0.5.6", - "source-map-support": "^0.4.15", - "strip-bom": "^3.0.0", - "typescript": "2.5.3", - "untildify": "^3.0.2", - "urijs": "^1.18.10", - "vscode-jsonrpc": "^3.3.1", - "yaml-ast-parser": "https://github.com/olydis/yaml-ast-parser/releases/download/0.0.34/yaml-ast-parser-0.0.34.tgz", - "yargs": "^8.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "_shasum": "33813111fc9bfa488bd600fbba48bc53cc9182c7", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest-core@2.0.4168", - "_from": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "_requested": { - "type": "directory", - "where": "D:\\VSProjects\\swagger-to-sdk", - "raw": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest-core@2.0.4168\\node_modules\\@microsoft.azure\\autorest-core", - "rawSpec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest-core@2.0.4168\\node_modules\\@microsoft.azure\\autorest-core", - "saveSpec": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core", - "fetchSpec": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest-core@2.0.4168/node_modules/@microsoft.azure/autorest-core" - }, - "_spec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest-core@2.0.4168\\node_modules\\@microsoft.azure\\autorest-core", - "_where": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest-core@2.0.4168\\node_modules\\@microsoft.azure\\autorest-core" - }, - "extensionManager": { - "installationPath": "C:\\Users\\lmazuel\\.autorest", - "dotnetPath": "C:\\Users\\lmazuel\\.dotnet" - }, - "installationPath": "C:\\Users\\lmazuel\\.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.go", - "version": "2.0.24", - "dependencies": { - "dotnet-2.0.0": "^1.1.0" - }, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/autorest.testserver": "^1.9.0", - "autorest": "^2.0.0", - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.1.1", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.go@2.0.24/node_modules/@microsoft.azure/autorest.go", - "_shasum": "409a4a9a21708a7aea58fadb0b064ea487a90fea", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.go@2.0.24", - "_from": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.go@2.0.24/node_modules/@microsoft.azure/autorest.go", - "_requested": { - "type": "directory", - "where": "D:\\VSProjects\\swagger-to-sdk", - "raw": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.go@2.0.24\\node_modules\\@microsoft.azure\\autorest.go", - "rawSpec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.go@2.0.24\\node_modules\\@microsoft.azure\\autorest.go", - "saveSpec": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.go@2.0.24/node_modules/@microsoft.azure/autorest.go", - "fetchSpec": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.go@2.0.24/node_modules/@microsoft.azure/autorest.go" - }, - "_spec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.go@2.0.24\\node_modules\\@microsoft.azure\\autorest.go", - "_where": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.go@2.0.24\\node_modules\\@microsoft.azure\\autorest.go" - }, - "extensionManager": { - "installationPath": "C:\\Users\\lmazuel\\.autorest", - "dotnetPath": "C:\\Users\\lmazuel\\.dotnet" - }, - "installationPath": "C:\\Users\\lmazuel\\.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.modeler", - "version": "2.0.18", - "dependencies": { - "dotnet-2.0.0": "^1.1.0" - }, - "optionalDependencies": {}, - "devDependencies": { - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.1.1", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.modeler@2.0.18/node_modules/@microsoft.azure/autorest.modeler", - "_shasum": "b8e853f83b99b2a37ad534cb8463da5de4b11418", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.modeler@2.0.18", - "_from": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.modeler@2.0.18/node_modules/@microsoft.azure/autorest.modeler", - "_requested": { - "type": "directory", - "where": "D:\\VSProjects\\swagger-to-sdk", - "raw": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.modeler@2.0.18\\node_modules\\@microsoft.azure\\autorest.modeler", - "rawSpec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.modeler@2.0.18\\node_modules\\@microsoft.azure\\autorest.modeler", - "saveSpec": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.modeler@2.0.18/node_modules/@microsoft.azure/autorest.modeler", - "fetchSpec": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.modeler@2.0.18/node_modules/@microsoft.azure/autorest.modeler" - }, - "_spec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.modeler@2.0.18\\node_modules\\@microsoft.azure\\autorest.modeler", - "_where": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.modeler@2.0.18\\node_modules\\@microsoft.azure\\autorest.modeler" - }, - "extensionManager": { - "installationPath": "C:\\Users\\lmazuel\\.autorest", - "dotnetPath": "C:\\Users\\lmazuel\\.dotnet" - }, - "installationPath": "C:\\Users\\lmazuel\\.autorest" - }, - { - "resolvedInfo": null, - "packageMetadata": { - "name": "@microsoft.azure/autorest.python", - "version": "2.0.13", - "dependencies": { - "dotnet-2.0.0": "^1.1.0" - }, - "optionalDependencies": {}, - "devDependencies": { - "@microsoft.azure/autorest.testserver": "^1.9.0", - "autorest": "^2.0.0", - "coffee-script": "^1.11.1", - "dotnet-sdk-2.0.0": "^1.1.1", - "gulp": "^3.9.1", - "gulp-filter": "^5.0.0", - "gulp-line-ending-corrector": "^1.0.1", - "iced-coffee-script": "^108.0.11", - "marked": "^0.3.6", - "marked-terminal": "^2.0.0", - "moment": "^2.17.1", - "run-sequence": "*", - "shx": "^0.2.2", - "through2-parallel": "^0.1.3", - "yargs": "^8.0.2", - "yarn": "^1.0.2" - }, - "bundleDependencies": false, - "peerDependencies": {}, - "deprecated": false, - "_resolved": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.python@2.0.13/node_modules/@microsoft.azure/autorest.python", - "_shasum": "ddbbf3e3f1f90ae4132b687cfa8450425ab4ffcd", - "_shrinkwrap": null, - "bin": null, - "_id": "@microsoft.azure/autorest.python@2.0.13", - "_from": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.python@2.0.13/node_modules/@microsoft.azure/autorest.python", - "_requested": { - "type": "directory", - "where": "D:\\VSProjects\\swagger-to-sdk", - "raw": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.python@2.0.13\\node_modules\\@microsoft.azure\\autorest.python", - "rawSpec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.python@2.0.13\\node_modules\\@microsoft.azure\\autorest.python", - "saveSpec": "file:C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.python@2.0.13/node_modules/@microsoft.azure/autorest.python", - "fetchSpec": "C:/Users/lmazuel/.autorest/@microsoft.azure_autorest.python@2.0.13/node_modules/@microsoft.azure/autorest.python" - }, - "_spec": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.python@2.0.13\\node_modules\\@microsoft.azure\\autorest.python", - "_where": "C:\\Users\\lmazuel\\.autorest\\@microsoft.azure_autorest.python@2.0.13\\node_modules\\@microsoft.azure\\autorest.python" - }, - "extensionManager": { - "installationPath": "C:\\Users\\lmazuel\\.autorest", - "dotnetPath": "C:\\Users\\lmazuel\\.dotnet" - }, - "installationPath": "C:\\Users\\lmazuel\\.autorest" - } - ], - "autorest_bootstrap": { - "dependencies": { - "autorest": { - "version": "2.0.4166", - "from": "autorest@latest", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4166.tgz" - } - } - } -} diff --git a/azure-mgmt-containerservice/sdk_packaging.toml b/azure-mgmt-containerservice/sdk_packaging.toml new file mode 100644 index 000000000000..d156cea3aafe --- /dev/null +++ b/azure-mgmt-containerservice/sdk_packaging.toml @@ -0,0 +1,5 @@ +[packaging] +package_name = "azure-mgmt-containerservice" +package_pprint_name = "Container Service Management" +package_doc_id = "containerservice" +is_stable = true diff --git a/azure-mgmt-containerservice/setup.py b/azure-mgmt-containerservice/setup.py index b763953b189a..185d6e666a0e 100644 --- a/azure-mgmt-containerservice/setup.py +++ b/azure-mgmt-containerservice/setup.py @@ -19,7 +19,7 @@ # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-mgmt-containerservice" -PACKAGE_PPRINT_NAME = "Container Service" +PACKAGE_PPRINT_NAME = "Container Service Management" # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace('-', '/') @@ -64,12 +64,11 @@ author_email='azpysdkhelp@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python', classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', @@ -78,7 +77,7 @@ zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure~=0.4.11', + 'msrestazure>=0.4.27,<2.0.0', 'azure-common~=1.1', ], cmdclass=cmdclass