diff --git a/azure-mgmt-devspaces/HISTORY.rst b/azure-mgmt-devspaces/HISTORY.rst deleted file mode 100644 index 185318d58cca..000000000000 --- a/azure-mgmt-devspaces/HISTORY.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. :changelog: - -Release History -=============== - -0.1.0 (2018-07-12) -++++++++++++++++++ - -* Initial Release diff --git a/azure-mgmt-devspaces/MANIFEST.in b/azure-mgmt-devspaces/MANIFEST.in deleted file mode 100644 index bb37a2723dae..000000000000 --- a/azure-mgmt-devspaces/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include *.rst diff --git a/sdk/aks/azure-mgmt-devspaces/HISTORY.rst b/sdk/aks/azure-mgmt-devspaces/HISTORY.rst new file mode 100644 index 000000000000..dded295100ea --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/HISTORY.rst @@ -0,0 +1,23 @@ +.. :changelog: + +Release History +=============== + +0.2.0 (2019-05-23) +++++++++++++++++++ + +**Features** + +- Model ControllerUpdateParameters has a new parameter target_container_host_credentials_base64 +- Added operation group ContainerHostMappingsOperations + +**Breaking changes** + +- Operation ControllersOperations.list_connection_details has a new signature +- Operation ControllersOperations.update has a new signature +- Model ControllerConnectionDetails has a new signature + +0.1.0 (2018-07-12) +++++++++++++++++++ + +* Initial Release diff --git a/sdk/aks/azure-mgmt-devspaces/MANIFEST.in b/sdk/aks/azure-mgmt-devspaces/MANIFEST.in new file mode 100644 index 000000000000..e4884efef41b --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/MANIFEST.in @@ -0,0 +1,5 @@ +recursive-include tests *.py *.yaml +include *.rst +include azure/__init__.py +include azure/mgmt/__init__.py + diff --git a/azure-mgmt-devspaces/README.rst b/sdk/aks/azure-mgmt-devspaces/README.rst similarity index 74% rename from azure-mgmt-devspaces/README.rst rename to sdk/aks/azure-mgmt-devspaces/README.rst index 8e3976a55b07..0aa99b07538f 100644 --- a/azure-mgmt-devspaces/README.rst +++ b/sdk/aks/azure-mgmt-devspaces/README.rst @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see For a more complete set of Azure libraries, see the `azure `__ bundle package. -Compatibility -============= - -**IMPORTANT**: If you have an earlier version of the azure package -(version < 1.0), you should uninstall it before installing this package. - -You can check the version using pip: - -.. code:: shell - - pip freeze - -If you see azure==0.11.0 (or any version below 1.0), uninstall it first: - -.. code:: shell - - pip uninstall azure - - Usage ===== diff --git a/azure-mgmt-devspaces/azure/__init__.py b/sdk/aks/azure-mgmt-devspaces/azure/__init__.py similarity index 100% rename from azure-mgmt-devspaces/azure/__init__.py rename to sdk/aks/azure-mgmt-devspaces/azure/__init__.py diff --git a/azure-mgmt-devspaces/azure/mgmt/__init__.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/__init__.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/__init__.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/__init__.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/__init__.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/__init__.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/__init__.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/__init__.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py similarity index 88% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py index 15bca069693d..8fab3db5da41 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/dev_spaces_management_client.py @@ -13,8 +13,9 @@ from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION -from .operations.controllers_operations import ControllersOperations +from .operations.container_host_mappings_operations import ContainerHostMappingsOperations from .operations.operations import Operations +from .operations.controllers_operations import ControllersOperations from . import models @@ -56,10 +57,12 @@ class DevSpacesManagementClient(SDKClient): :ivar config: Configuration for client. :vartype config: DevSpacesManagementClientConfiguration - :ivar controllers: Controllers operations - :vartype controllers: azure.mgmt.devspaces.operations.ControllersOperations + :ivar container_host_mappings: ContainerHostMappings operations + :vartype container_host_mappings: azure.mgmt.devspaces.operations.ContainerHostMappingsOperations :ivar operations: Operations operations :vartype operations: azure.mgmt.devspaces.operations.Operations + :ivar controllers: Controllers operations + :vartype controllers: azure.mgmt.devspaces.operations.ControllersOperations :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials @@ -76,11 +79,13 @@ def __init__( super(DevSpacesManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2018-06-01-preview' + self.api_version = '2019-04-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) - self.controllers = ControllersOperations( + self.container_host_mappings = ContainerHostMappingsOperations( self._client, self.config, self._serialize, self._deserialize) self.operations = Operations( self._client, self.config, self._serialize, self._deserialize) + self.controllers = ControllersOperations( + self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py similarity index 81% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py index b23c697b8c05..ec13a481a4b8 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/__init__.py @@ -10,56 +10,62 @@ # -------------------------------------------------------------------------- try: + from .container_host_mapping_py3 import ContainerHostMapping + from .tracked_resource_py3 import TrackedResource + from .resource_provider_operation_display_py3 import ResourceProviderOperationDisplay + from .resource_provider_operation_definition_py3 import ResourceProviderOperationDefinition from .sku_py3 import Sku from .controller_py3 import Controller from .controller_update_parameters_py3 import ControllerUpdateParameters + from .list_connection_details_parameters_py3 import ListConnectionDetailsParameters from .orchestrator_specific_connection_details_py3 import OrchestratorSpecificConnectionDetails from .controller_connection_details_py3 import ControllerConnectionDetails from .controller_connection_details_list_py3 import ControllerConnectionDetailsList - from .tracked_resource_py3 import TrackedResource - from .resource_provider_operation_display_py3 import ResourceProviderOperationDisplay - from .resource_provider_operation_definition_py3 import ResourceProviderOperationDefinition from .resource_py3 import Resource from .kubernetes_connection_details_py3 import KubernetesConnectionDetails from .error_details_py3 import ErrorDetails - from .error_response_py3 import ErrorResponse, ErrorResponseException + from .dev_spaces_error_response_py3 import DevSpacesErrorResponse, DevSpacesErrorResponseException except (SyntaxError, ImportError): + from .container_host_mapping import ContainerHostMapping + from .tracked_resource import TrackedResource + from .resource_provider_operation_display import ResourceProviderOperationDisplay + from .resource_provider_operation_definition import ResourceProviderOperationDefinition from .sku import Sku from .controller import Controller from .controller_update_parameters import ControllerUpdateParameters + from .list_connection_details_parameters import ListConnectionDetailsParameters from .orchestrator_specific_connection_details import OrchestratorSpecificConnectionDetails from .controller_connection_details import ControllerConnectionDetails from .controller_connection_details_list import ControllerConnectionDetailsList - from .tracked_resource import TrackedResource - from .resource_provider_operation_display import ResourceProviderOperationDisplay - from .resource_provider_operation_definition import ResourceProviderOperationDefinition from .resource import Resource from .kubernetes_connection_details import KubernetesConnectionDetails from .error_details import ErrorDetails - from .error_response import ErrorResponse, ErrorResponseException -from .controller_paged import ControllerPaged + from .dev_spaces_error_response import DevSpacesErrorResponse, DevSpacesErrorResponseException from .resource_provider_operation_definition_paged import ResourceProviderOperationDefinitionPaged +from .controller_paged import ControllerPaged from .dev_spaces_management_client_enums import ( ProvisioningState, SkuTier, ) __all__ = [ + 'ContainerHostMapping', + 'TrackedResource', + 'ResourceProviderOperationDisplay', + 'ResourceProviderOperationDefinition', 'Sku', 'Controller', 'ControllerUpdateParameters', + 'ListConnectionDetailsParameters', 'OrchestratorSpecificConnectionDetails', 'ControllerConnectionDetails', 'ControllerConnectionDetailsList', - 'TrackedResource', - 'ResourceProviderOperationDisplay', - 'ResourceProviderOperationDefinition', 'Resource', 'KubernetesConnectionDetails', 'ErrorDetails', - 'ErrorResponse', 'ErrorResponseException', - 'ControllerPaged', + 'DevSpacesErrorResponse', 'DevSpacesErrorResponseException', 'ResourceProviderOperationDefinitionPaged', + 'ControllerPaged', 'ProvisioningState', 'SkuTier', ] diff --git a/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping.py new file mode 100644 index 000000000000..893bc7f395cb --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping.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 ContainerHostMapping(Model): + """Container host mapping object specifying the Container host resource ID and + its associated Controller resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param container_host_resource_id: ARM ID of the Container Host resource + :type container_host_resource_id: str + :ivar mapped_controller_resource_id: ARM ID of the mapped Controller + resource + :vartype mapped_controller_resource_id: str + """ + + _validation = { + 'mapped_controller_resource_id': {'readonly': True}, + } + + _attribute_map = { + 'container_host_resource_id': {'key': 'containerHostResourceId', 'type': 'str'}, + 'mapped_controller_resource_id': {'key': 'mappedControllerResourceId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerHostMapping, self).__init__(**kwargs) + self.container_host_resource_id = kwargs.get('container_host_resource_id', None) + self.mapped_controller_resource_id = None diff --git a/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping_py3.py new file mode 100644 index 000000000000..d3dd56a2e029 --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/container_host_mapping_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 ContainerHostMapping(Model): + """Container host mapping object specifying the Container host resource ID and + its associated Controller resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param container_host_resource_id: ARM ID of the Container Host resource + :type container_host_resource_id: str + :ivar mapped_controller_resource_id: ARM ID of the mapped Controller + resource + :vartype mapped_controller_resource_id: str + """ + + _validation = { + 'mapped_controller_resource_id': {'readonly': True}, + } + + _attribute_map = { + 'container_host_resource_id': {'key': 'containerHostResourceId', 'type': 'str'}, + 'mapped_controller_resource_id': {'key': 'mappedControllerResourceId', 'type': 'str'}, + } + + def __init__(self, *, container_host_resource_id: str=None, **kwargs) -> None: + super(ContainerHostMapping, self).__init__(**kwargs) + self.container_host_resource_id = container_host_resource_id + self.mapped_controller_resource_id = None diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py similarity index 92% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py index 6066bd15af2a..87580d5b1d7e 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller.py @@ -32,12 +32,12 @@ class Controller(TrackedResource): :type location: str :ivar provisioning_state: Provisioning state of the Azure Dev Spaces Controller. Possible values include: 'Succeeded', 'Failed', 'Canceled', - 'Updating', 'Creating', 'Deleting' + 'Updating', 'Creating', 'Deleting', 'Deleted' :vartype provisioning_state: str or ~azure.mgmt.devspaces.models.ProvisioningState - :param host_suffix: Required. DNS suffix for public endpoints running in - the Azure Dev Spaces Controller. - :type host_suffix: str + :ivar host_suffix: DNS suffix for public endpoints running in the Azure + Dev Spaces Controller. + :vartype host_suffix: str :ivar data_plane_fqdn: DNS name for accessing DataPlane services :vartype data_plane_fqdn: str :param target_container_host_resource_id: Required. Resource ID of the @@ -55,7 +55,7 @@ class Controller(TrackedResource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, - 'host_suffix': {'required': True}, + 'host_suffix': {'readonly': True}, 'data_plane_fqdn': {'readonly': True}, 'target_container_host_resource_id': {'required': True}, 'target_container_host_credentials_base64': {'required': True}, @@ -79,7 +79,7 @@ class Controller(TrackedResource): def __init__(self, **kwargs): super(Controller, self).__init__(**kwargs) self.provisioning_state = None - self.host_suffix = kwargs.get('host_suffix', None) + self.host_suffix = None self.data_plane_fqdn = None self.target_container_host_resource_id = kwargs.get('target_container_host_resource_id', None) self.target_container_host_credentials_base64 = kwargs.get('target_container_host_credentials_base64', None) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py similarity index 54% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py index 3701e8a363b8..9cede3fd6c76 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details.py @@ -15,36 +15,15 @@ class ControllerConnectionDetails(Model): """ControllerConnectionDetails. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar auth_key: Authentication key for communicating with services. - :vartype auth_key: str - :ivar workspace_storage_account_name: Workspace storage account name. - :vartype workspace_storage_account_name: str - :ivar workspace_storage_sas_token: Workspace storage account SAS token. - :vartype workspace_storage_sas_token: str :param orchestrator_specific_connection_details: :type orchestrator_specific_connection_details: ~azure.mgmt.devspaces.models.OrchestratorSpecificConnectionDetails """ - _validation = { - 'auth_key': {'readonly': True}, - 'workspace_storage_account_name': {'readonly': True}, - 'workspace_storage_sas_token': {'readonly': True}, - } - _attribute_map = { - 'auth_key': {'key': 'authKey', 'type': 'str'}, - 'workspace_storage_account_name': {'key': 'workspaceStorageAccountName', 'type': 'str'}, - 'workspace_storage_sas_token': {'key': 'workspaceStorageSasToken', 'type': 'str'}, 'orchestrator_specific_connection_details': {'key': 'orchestratorSpecificConnectionDetails', 'type': 'OrchestratorSpecificConnectionDetails'}, } def __init__(self, **kwargs): super(ControllerConnectionDetails, self).__init__(**kwargs) - self.auth_key = None - self.workspace_storage_account_name = None - self.workspace_storage_sas_token = None self.orchestrator_specific_connection_details = kwargs.get('orchestrator_specific_connection_details', None) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_list_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py similarity index 54% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py index fef49a40f947..c63644e8d743 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_connection_details_py3.py @@ -15,36 +15,15 @@ class ControllerConnectionDetails(Model): """ControllerConnectionDetails. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar auth_key: Authentication key for communicating with services. - :vartype auth_key: str - :ivar workspace_storage_account_name: Workspace storage account name. - :vartype workspace_storage_account_name: str - :ivar workspace_storage_sas_token: Workspace storage account SAS token. - :vartype workspace_storage_sas_token: str :param orchestrator_specific_connection_details: :type orchestrator_specific_connection_details: ~azure.mgmt.devspaces.models.OrchestratorSpecificConnectionDetails """ - _validation = { - 'auth_key': {'readonly': True}, - 'workspace_storage_account_name': {'readonly': True}, - 'workspace_storage_sas_token': {'readonly': True}, - } - _attribute_map = { - 'auth_key': {'key': 'authKey', 'type': 'str'}, - 'workspace_storage_account_name': {'key': 'workspaceStorageAccountName', 'type': 'str'}, - 'workspace_storage_sas_token': {'key': 'workspaceStorageSasToken', 'type': 'str'}, 'orchestrator_specific_connection_details': {'key': 'orchestratorSpecificConnectionDetails', 'type': 'OrchestratorSpecificConnectionDetails'}, } def __init__(self, *, orchestrator_specific_connection_details=None, **kwargs) -> None: super(ControllerConnectionDetails, self).__init__(**kwargs) - self.auth_key = None - self.workspace_storage_account_name = None - self.workspace_storage_sas_token = None self.orchestrator_specific_connection_details = orchestrator_specific_connection_details diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_paged.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_paged.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_paged.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_paged.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py similarity index 88% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py index c24d70754737..a24c6a8042dd 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_py3.py @@ -32,12 +32,12 @@ class Controller(TrackedResource): :type location: str :ivar provisioning_state: Provisioning state of the Azure Dev Spaces Controller. Possible values include: 'Succeeded', 'Failed', 'Canceled', - 'Updating', 'Creating', 'Deleting' + 'Updating', 'Creating', 'Deleting', 'Deleted' :vartype provisioning_state: str or ~azure.mgmt.devspaces.models.ProvisioningState - :param host_suffix: Required. DNS suffix for public endpoints running in - the Azure Dev Spaces Controller. - :type host_suffix: str + :ivar host_suffix: DNS suffix for public endpoints running in the Azure + Dev Spaces Controller. + :vartype host_suffix: str :ivar data_plane_fqdn: DNS name for accessing DataPlane services :vartype data_plane_fqdn: str :param target_container_host_resource_id: Required. Resource ID of the @@ -55,7 +55,7 @@ class Controller(TrackedResource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'provisioning_state': {'readonly': True}, - 'host_suffix': {'required': True}, + 'host_suffix': {'readonly': True}, 'data_plane_fqdn': {'readonly': True}, 'target_container_host_resource_id': {'required': True}, 'target_container_host_credentials_base64': {'required': True}, @@ -76,10 +76,10 @@ class Controller(TrackedResource): 'sku': {'key': 'sku', 'type': 'Sku'}, } - def __init__(self, *, host_suffix: str, target_container_host_resource_id: str, target_container_host_credentials_base64: str, sku, tags=None, location: str=None, **kwargs) -> None: + def __init__(self, *, target_container_host_resource_id: str, target_container_host_credentials_base64: str, sku, tags=None, location: str=None, **kwargs) -> None: super(Controller, self).__init__(tags=tags, location=location, **kwargs) self.provisioning_state = None - self.host_suffix = host_suffix + self.host_suffix = None self.data_plane_fqdn = None self.target_container_host_resource_id = target_container_host_resource_id self.target_container_host_credentials_base64 = target_container_host_credentials_base64 diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py similarity index 69% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py index 814c47933c7e..89c4af59b22b 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters.py @@ -17,12 +17,17 @@ class ControllerUpdateParameters(Model): :param tags: Tags for the Azure Dev Spaces Controller. :type tags: dict[str, str] + :param target_container_host_credentials_base64: Credentials of the target + container host (base64). + :type target_container_host_credentials_base64: str """ _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, + 'target_container_host_credentials_base64': {'key': 'properties.targetContainerHostCredentialsBase64', 'type': 'str'}, } def __init__(self, **kwargs): super(ControllerUpdateParameters, self).__init__(**kwargs) self.tags = kwargs.get('tags', None) + self.target_container_host_credentials_base64 = kwargs.get('target_container_host_credentials_base64', None) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py similarity index 64% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py index 23b45b9cf3ba..59d0b1bb6749 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/controller_update_parameters_py3.py @@ -17,12 +17,17 @@ class ControllerUpdateParameters(Model): :param tags: Tags for the Azure Dev Spaces Controller. :type tags: dict[str, str] + :param target_container_host_credentials_base64: Credentials of the target + container host (base64). + :type target_container_host_credentials_base64: str """ _attribute_map = { 'tags': {'key': 'tags', 'type': '{str}'}, + 'target_container_host_credentials_base64': {'key': 'properties.targetContainerHostCredentialsBase64', 'type': 'str'}, } - def __init__(self, *, tags=None, **kwargs) -> None: + def __init__(self, *, tags=None, target_container_host_credentials_base64: str=None, **kwargs) -> None: super(ControllerUpdateParameters, self).__init__(**kwargs) self.tags = tags + self.target_container_host_credentials_base64 = target_container_host_credentials_base64 diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response.py similarity index 76% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response.py index 9f90351350f0..a73eee9a345b 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response.py @@ -13,7 +13,7 @@ from msrest.exceptions import HttpOperationError -class ErrorResponse(Model): +class DevSpacesErrorResponse(Model): """Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. @@ -26,12 +26,12 @@ class ErrorResponse(Model): } def __init__(self, **kwargs): - super(ErrorResponse, self).__init__(**kwargs) + super(DevSpacesErrorResponse, self).__init__(**kwargs) self.error = kwargs.get('error', None) -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. +class DevSpacesErrorResponseException(HttpOperationError): + """Server responsed with exception of type: 'DevSpacesErrorResponse'. :param deserialize: A deserializer :param response: Server response to be deserialized. @@ -39,4 +39,4 @@ class ErrorResponseException(HttpOperationError): def __init__(self, deserialize, response, *args): - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) + super(DevSpacesErrorResponseException, self).__init__(deserialize, response, 'DevSpacesErrorResponse', *args) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response_py3.py similarity index 76% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response_py3.py index f2baf9cce1ee..e5d4da727637 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_response_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_error_response_py3.py @@ -13,7 +13,7 @@ from msrest.exceptions import HttpOperationError -class ErrorResponse(Model): +class DevSpacesErrorResponse(Model): """Error response indicates that the service is not able to process the incoming request. The reason is provided in the error message. @@ -26,12 +26,12 @@ class ErrorResponse(Model): } def __init__(self, *, error=None, **kwargs) -> None: - super(ErrorResponse, self).__init__(**kwargs) + super(DevSpacesErrorResponse, self).__init__(**kwargs) self.error = error -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. +class DevSpacesErrorResponseException(HttpOperationError): + """Server responsed with exception of type: 'DevSpacesErrorResponse'. :param deserialize: A deserializer :param response: Server response to be deserialized. @@ -39,4 +39,4 @@ class ErrorResponseException(HttpOperationError): def __init__(self, deserialize, response, *args): - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) + super(DevSpacesErrorResponseException, self).__init__(deserialize, response, 'DevSpacesErrorResponse', *args) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py similarity index 96% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py index b94e6f8aeb98..fba06f9ddbcf 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/dev_spaces_management_client_enums.py @@ -20,6 +20,7 @@ class ProvisioningState(str, Enum): updating = "Updating" creating = "Creating" deleting = "Deleting" + deleted = "Deleted" class SkuTier(str, Enum): diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/error_details_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py similarity index 95% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py index 822de6ef48fb..e7175c8c1ab3 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details.py @@ -13,7 +13,7 @@ class KubernetesConnectionDetails(OrchestratorSpecificConnectionDetails): - """KubernetesConnectionDetails. + """Contains information used to connect to a Kubernetes cluster. All required parameters must be populated in order to send to Azure. diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py similarity index 95% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py index 537bce3ae461..143bb5a98963 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/kubernetes_connection_details_py3.py @@ -13,7 +13,7 @@ class KubernetesConnectionDetails(OrchestratorSpecificConnectionDetails): - """KubernetesConnectionDetails. + """Contains information used to connect to a Kubernetes cluster. All required parameters must be populated in order to send to Azure. diff --git a/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters.py new file mode 100644 index 000000000000..8aa1a6556b5a --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters.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 ListConnectionDetailsParameters(Model): + """Parameters for listing connection details of an Azure Dev Spaces + Controller. + + All required parameters must be populated in order to send to Azure. + + :param target_container_host_resource_id: Required. Resource ID of the + target container host mapped to the Azure Dev Spaces Controller. + :type target_container_host_resource_id: str + """ + + _validation = { + 'target_container_host_resource_id': {'required': True}, + } + + _attribute_map = { + 'target_container_host_resource_id': {'key': 'targetContainerHostResourceId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ListConnectionDetailsParameters, self).__init__(**kwargs) + self.target_container_host_resource_id = kwargs.get('target_container_host_resource_id', None) diff --git a/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters_py3.py new file mode 100644 index 000000000000..1ec148d8c07f --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/list_connection_details_parameters_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 ListConnectionDetailsParameters(Model): + """Parameters for listing connection details of an Azure Dev Spaces + Controller. + + All required parameters must be populated in order to send to Azure. + + :param target_container_host_resource_id: Required. Resource ID of the + target container host mapped to the Azure Dev Spaces Controller. + :type target_container_host_resource_id: str + """ + + _validation = { + 'target_container_host_resource_id': {'required': True}, + } + + _attribute_map = { + 'target_container_host_resource_id': {'key': 'targetContainerHostResourceId', 'type': 'str'}, + } + + def __init__(self, *, target_container_host_resource_id: str, **kwargs) -> None: + super(ListConnectionDetailsParameters, self).__init__(**kwargs) + self.target_container_host_resource_id = target_container_host_resource_id diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py similarity index 93% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py index f81894f7749c..cde860d75d2a 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details.py @@ -13,7 +13,8 @@ class OrchestratorSpecificConnectionDetails(Model): - """OrchestratorSpecificConnectionDetails. + """Base class for types that supply values used to connect to container + orchestrators. You probably want to use the sub-classes and not this class directly. Known sub-classes are: KubernetesConnectionDetails diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py similarity index 93% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py index c361a2b46837..c5a97af6956f 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/orchestrator_specific_connection_details_py3.py @@ -13,7 +13,8 @@ class OrchestratorSpecificConnectionDetails(Model): - """OrchestratorSpecificConnectionDetails. + """Base class for types that supply values used to connect to container + orchestrators. You probably want to use the sub-classes and not this class directly. Known sub-classes are: KubernetesConnectionDetails diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_paged.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_paged.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_paged.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_paged.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_definition_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_provider_operation_display_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/resource_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/sku_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource_py3.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource_py3.py similarity index 100% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource_py3.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/models/tracked_resource_py3.py diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py similarity index 84% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py index e2a90c21eba8..166c97cda17e 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/__init__.py @@ -9,10 +9,12 @@ # regenerated. # -------------------------------------------------------------------------- -from .controllers_operations import ControllersOperations +from .container_host_mappings_operations import ContainerHostMappingsOperations from .operations import Operations +from .controllers_operations import ControllersOperations __all__ = [ - 'ControllersOperations', + 'ContainerHostMappingsOperations', 'Operations', + 'ControllersOperations', ] diff --git a/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/container_host_mappings_operations.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/container_host_mappings_operations.py new file mode 100644 index 000000000000..be50d5c6b29b --- /dev/null +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/container_host_mappings_operations.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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse + +from .. import models + + +class ContainerHostMappingsOperations(object): + """ContainerHostMappingsOperations 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: "2019-04-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2019-04-01" + + self.config = config + + def get_container_host_mapping( + self, resource_group_name, location, container_host_resource_id=None, custom_headers=None, raw=False, **operation_config): + """Returns container host mapping object for a container host resource ID + if an associated controller exists. + + :param resource_group_name: Resource group to which the resource + belongs. + :type resource_group_name: str + :param location: Location of the container host. + :type location: str + :param container_host_resource_id: ARM ID of the Container Host + resource + :type container_host_resource_id: str + :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: ContainerHostMapping or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.devspaces.models.ContainerHostMapping or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`DevSpacesErrorResponseException` + """ + container_host_mapping = models.ContainerHostMapping(container_host_resource_id=container_host_resource_id) + + # Construct URL + url = self.get_container_host_mapping.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', max_length=90, min_length=1), + 'location': self._serialize.url("location", location, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + 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 body + body_content = self._serialize.body(container_host_mapping, 'ContainerHostMapping') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 204]: + raise models.DevSpacesErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ContainerHostMapping', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_container_host_mapping.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevSpaces/locations/{location}/checkContainerHostMapping'} diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py similarity index 83% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py index d68c6285c616..bcd78880c41a 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/controllers_operations.py @@ -24,7 +24,7 @@ class ControllersOperations(object): :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-06-01-preview". + :ivar api_version: Client API version. Constant value: "2019-04-01". """ models = models @@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-06-01-preview" + self.api_version = "2019-04-01" self.config = config @@ -58,14 +58,14 @@ def get( :rtype: ~azure.mgmt.devspaces.models.Controller or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ # Construct URL 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', max_length=90, min_length=1), - 'name': self._serialize.url("name", name, 'str', max_length=31, min_length=3, pattern=r'^[a-zA-Z0-9](-?[a-zA-Z0-9])*$') + 'name': self._serialize.url("name", name, 'str', max_length=63, min_length=1, pattern=r'^[a-zA-Z0-9]([_-]*[a-zA-Z0-9])*$') } url = self._client.format_url(url, **path_format_arguments) @@ -75,7 +75,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -84,11 +84,11 @@ def get( 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) deserialized = None @@ -110,7 +110,7 @@ def _create_initial( 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', max_length=90, min_length=1), - 'name': self._serialize.url("name", name, 'str', max_length=31, min_length=3, pattern=r'^[a-zA-Z0-9](-?[a-zA-Z0-9])*$') + 'name': self._serialize.url("name", name, 'str', max_length=63, min_length=1, pattern=r'^[a-zA-Z0-9]([_-]*[a-zA-Z0-9])*$') } url = self._client.format_url(url, **path_format_arguments) @@ -120,6 +120,7 @@ def _create_initial( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -132,12 +133,11 @@ def _create_initial( body_content = self._serialize.body(controller, 'Controller') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 201]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) deserialized = None @@ -178,7 +178,7 @@ def create( or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.devspaces.models.Controller]] :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ raw_result = self._create_initial( resource_group_name=resource_group_name, @@ -215,7 +215,7 @@ def _delete_initial( 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', max_length=90, min_length=1), - 'name': self._serialize.url("name", name, 'str', max_length=31, min_length=3, pattern=r'^[a-zA-Z0-9](-?[a-zA-Z0-9])*$') + 'name': self._serialize.url("name", name, 'str', max_length=63, min_length=1, pattern=r'^[a-zA-Z0-9]([_-]*[a-zA-Z0-9])*$') } url = self._client.format_url(url, **path_format_arguments) @@ -225,7 +225,6 @@ def _delete_initial( # 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: @@ -234,11 +233,11 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) if raw: client_raw_response = ClientRawResponse(None, response) @@ -265,7 +264,7 @@ def delete( :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ raw_result = self._delete_initial( resource_group_name=resource_group_name, @@ -290,7 +289,7 @@ def get_long_running_output(response): delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevSpaces/controllers/{name}'} def update( - self, resource_group_name, name, tags=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, tags=None, target_container_host_credentials_base64=None, custom_headers=None, raw=False, **operation_config): """Updates an Azure Dev Spaces Controller. Updates the properties of an existing Azure Dev Spaces Controller with @@ -303,6 +302,9 @@ def update( :type name: str :param tags: Tags for the Azure Dev Spaces Controller. :type tags: dict[str, str] + :param target_container_host_credentials_base64: Credentials of the + target container host (base64). + :type target_container_host_credentials_base64: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -312,16 +314,16 @@ def update( :rtype: ~azure.mgmt.devspaces.models.Controller or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ - controller_update_parameters = models.ControllerUpdateParameters(tags=tags) + controller_update_parameters = models.ControllerUpdateParameters(tags=tags, target_container_host_credentials_base64=target_container_host_credentials_base64) # Construct URL url = self.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', max_length=90, min_length=1), - 'name': self._serialize.url("name", name, 'str', max_length=31, min_length=3, pattern=r'^[a-zA-Z0-9](-?[a-zA-Z0-9])*$') + 'name': self._serialize.url("name", name, 'str', max_length=63, min_length=1, pattern=r'^[a-zA-Z0-9]([_-]*[a-zA-Z0-9])*$') } url = self._client.format_url(url, **path_format_arguments) @@ -331,6 +333,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -343,17 +346,18 @@ def update( body_content = self._serialize.body(controller_update_parameters, 'ControllerUpdateParameters') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 201]: + raise models.DevSpacesErrorResponseException(self._deserialize, response) deserialized = None if response.status_code == 200: deserialized = self._deserialize('Controller', response) + if response.status_code == 201: + deserialized = self._deserialize('Controller', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -381,7 +385,7 @@ def list_by_resource_group( :rtype: ~azure.mgmt.devspaces.models.ControllerPaged[~azure.mgmt.devspaces.models.Controller] :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -404,7 +408,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -413,12 +417,11 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) return response @@ -449,7 +452,7 @@ def list( :rtype: ~azure.mgmt.devspaces.models.ControllerPaged[~azure.mgmt.devspaces.models.Controller] :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ def internal_paging(next_link=None, raw=False): @@ -471,7 +474,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -480,12 +483,11 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) return response @@ -501,7 +503,7 @@ def internal_paging(next_link=None, raw=False): list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DevSpaces/controllers'} def list_connection_details( - self, resource_group_name, name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, name, target_container_host_resource_id, custom_headers=None, raw=False, **operation_config): """Lists connection details for an Azure Dev Spaces Controller. Lists connection details for the underlying container resources of an @@ -512,6 +514,9 @@ def list_connection_details( :type resource_group_name: str :param name: Name of the resource. :type name: str + :param target_container_host_resource_id: Resource ID of the target + container host mapped to the Azure Dev Spaces Controller. + :type target_container_host_resource_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -522,14 +527,16 @@ def list_connection_details( :rtype: ~azure.mgmt.devspaces.models.ControllerConnectionDetailsList or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`DevSpacesErrorResponseException` """ + list_connection_details_parameters = models.ListConnectionDetailsParameters(target_container_host_resource_id=target_container_host_resource_id) + # Construct URL url = self.list_connection_details.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', max_length=90, min_length=1), - 'name': self._serialize.url("name", name, 'str', max_length=31, min_length=3, pattern=r'^[a-zA-Z0-9](-?[a-zA-Z0-9])*$') + 'name': self._serialize.url("name", name, 'str', max_length=63, min_length=1, pattern=r'^[a-zA-Z0-9]([_-]*[a-zA-Z0-9])*$') } url = self._client.format_url(url, **path_format_arguments) @@ -539,6 +546,7 @@ def list_connection_details( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' 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()) @@ -547,12 +555,15 @@ def list_connection_details( 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 body + body_content = self._serialize.body(list_connection_details_parameters, 'ListConnectionDetailsParameters') + # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + raise models.DevSpacesErrorResponseException(self._deserialize, response) deserialized = None diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py similarity index 90% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py index 9b1e28b996fb..5e3a4646b0f3 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/operations/operations.py @@ -23,7 +23,7 @@ class Operations(object): :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-06-01-preview". + :ivar api_version: Client API version. Constant value: "2019-04-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-06-01-preview" + self.api_version = "2019-04-01" self.config = config @@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -80,9 +80,8 @@ def internal_paging(next_link=None, raw=False): 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) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-devspaces/azure/mgmt/devspaces/version.py b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/version.py similarity index 96% rename from azure-mgmt-devspaces/azure/mgmt/devspaces/version.py rename to sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/version.py index e0ec669828cb..9bd1dfac7ecb 100644 --- a/azure-mgmt-devspaces/azure/mgmt/devspaces/version.py +++ b/sdk/aks/azure-mgmt-devspaces/azure/mgmt/devspaces/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.1.0" +VERSION = "0.2.0" diff --git a/azure-mgmt-devspaces/sdk_packaging.toml b/sdk/aks/azure-mgmt-devspaces/sdk_packaging.toml similarity index 100% rename from azure-mgmt-devspaces/sdk_packaging.toml rename to sdk/aks/azure-mgmt-devspaces/sdk_packaging.toml diff --git a/azure-mgmt-devspaces/setup.cfg b/sdk/aks/azure-mgmt-devspaces/setup.cfg similarity index 100% rename from azure-mgmt-devspaces/setup.cfg rename to sdk/aks/azure-mgmt-devspaces/setup.cfg diff --git a/azure-mgmt-devspaces/setup.py b/sdk/aks/azure-mgmt-devspaces/setup.py similarity index 98% rename from azure-mgmt-devspaces/setup.py rename to sdk/aks/azure-mgmt-devspaces/setup.py index e14033a3af4b..c8d968227ee5 100644 --- a/azure-mgmt-devspaces/setup.py +++ b/sdk/aks/azure-mgmt-devspaces/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com',