Update from master

AzureSDKAutomation · May 1, 2020 · 0775a0d · 0775a0d
1 parent f94fc3f
commit 0775a0d
Show file tree

Hide file tree

Showing 34 changed files with 1,285 additions and 1,131 deletions.
diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/__init__.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/__init__.py
@@ -9,10 +9,11 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .databricks_client import DatabricksClient
-from .version import VERSION
+from ._configuration import DatabricksClientConfiguration
+from ._databricks_client import DatabricksClient
+__all__ = ['DatabricksClient', 'DatabricksClientConfiguration']
 
-__all__ = ['DatabricksClient']
+from .version import VERSION
 
 __version__ = VERSION
 
diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py
@@ -0,0 +1,48 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+from msrestazure import AzureConfiguration
+
+from .version import VERSION
+
+
+class DatabricksClientConfiguration(AzureConfiguration):
+    """Configuration for DatabricksClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: The ID of the target subscription.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        if credentials is None:
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not base_url:
+            base_url = 'https://management.azure.com'
+
+        super(DatabricksClientConfiguration, self).__init__(base_url)
+
+        # Starting Autorest.Python 4.0.64, make connection pool activated by default
+        self.keep_alive = True
+
+        self.add_user_agent('azure-mgmt-databricks/{}'.format(VERSION))
+        self.add_user_agent('Azure-SDK-For-Python')
+
+        self.credentials = credentials
+        self.subscription_id = subscription_id
diff --git a/...zure/mgmt/databricks/databricks_client.py → ...ure/mgmt/databricks/_databricks_client.py b/...zure/mgmt/databricks/databricks_client.py → ...ure/mgmt/databricks/_databricks_client.py
@@ -11,43 +11,11 @@
 
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
-from msrestazure import AzureConfiguration
-from .version import VERSION
-from .operations.workspaces_operations import WorkspacesOperations
-from .operations.operations import Operations
-from . import models
-
-
-class DatabricksClientConfiguration(AzureConfiguration):
-    """Configuration for DatabricksClient
-    Note that all parameters used to create this instance are saved as instance
-    attributes.
-
-    :param credentials: Credentials needed for the client to connect to Azure.
-    :type credentials: :mod:`A msrestazure Credentials
-     object<msrestazure.azure_active_directory>`
-    :param subscription_id: The ID of the target subscription.
-    :type subscription_id: str
-    :param str base_url: Service URL
-    """
-
-    def __init__(
-            self, credentials, subscription_id, base_url=None):
 
-        if credentials is None:
-            raise ValueError("Parameter 'credentials' must not be None.")
-        if subscription_id is None:
-            raise ValueError("Parameter 'subscription_id' must not be None.")
-        if not base_url:
-            base_url = 'https://management.azure.com'
-
-        super(DatabricksClientConfiguration, self).__init__(base_url)
-
-        self.add_user_agent('azure-mgmt-databricks/{}'.format(VERSION))
-        self.add_user_agent('Azure-SDK-For-Python')
-
-        self.credentials = credentials
-        self.subscription_id = subscription_id
+from ._configuration import DatabricksClientConfiguration
+from .operations import WorkspacesOperations
+from .operations import Operations
+from . import models
 
 
 class DatabricksClient(SDKClient):

diff --git a/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py b/sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py
@@ -10,48 +10,65 @@
 # --------------------------------------------------------------------------
 
 try:
-    from .workspace_provider_authorization_py3 import WorkspaceProviderAuthorization
-    from .sku_py3 import Sku
-    from .workspace_py3 import Workspace
-    from .tracked_resource_py3 import TrackedResource
-    from .resource_py3 import Resource
-    from .workspace_update_py3 import WorkspaceUpdate
-    from .error_detail_py3 import ErrorDetail
-    from .error_info_py3 import ErrorInfo
-    from .error_response_py3 import ErrorResponse, ErrorResponseException
-    from .operation_display_py3 import OperationDisplay
-    from .operation_py3 import Operation
+    from ._models_py3 import CreatedBy
+    from ._models_py3 import ErrorDetail
+    from ._models_py3 import ErrorInfo
+    from ._models_py3 import ErrorResponse, ErrorResponseException
+    from ._models_py3 import Operation
+    from ._models_py3 import OperationDisplay
+    from ._models_py3 import Resource
+    from ._models_py3 import Sku
+    from ._models_py3 import TrackedResource
+    from ._models_py3 import Workspace
+    from ._models_py3 import WorkspaceCustomBooleanParameter
+    from ._models_py3 import WorkspaceCustomObjectParameter
+    from ._models_py3 import WorkspaceCustomParameters
+    from ._models_py3 import WorkspaceCustomStringParameter
+    from ._models_py3 import WorkspaceProviderAuthorization
+    from ._models_py3 import WorkspaceUpdate
 except (SyntaxError, ImportError):
-    from .workspace_provider_authorization import WorkspaceProviderAuthorization
-    from .sku import Sku
-    from .workspace import Workspace
-    from .tracked_resource import TrackedResource
-    from .resource import Resource
-    from .workspace_update import WorkspaceUpdate
-    from .error_detail import ErrorDetail
-    from .error_info import ErrorInfo
-    from .error_response import ErrorResponse, ErrorResponseException
-    from .operation_display import OperationDisplay
-    from .operation import Operation
-from .workspace_paged import WorkspacePaged
-from .operation_paged import OperationPaged
-from .databricks_client_enums import (
+    from ._models import CreatedBy
+    from ._models import ErrorDetail
+    from ._models import ErrorInfo
+    from ._models import ErrorResponse, ErrorResponseException
+    from ._models import Operation
+    from ._models import OperationDisplay
+    from ._models import Resource
+    from ._models import Sku
+    from ._models import TrackedResource
+    from ._models import Workspace
+    from ._models import WorkspaceCustomBooleanParameter
+    from ._models import WorkspaceCustomObjectParameter
+    from ._models import WorkspaceCustomParameters
+    from ._models import WorkspaceCustomStringParameter
+    from ._models import WorkspaceProviderAuthorization
+    from ._models import WorkspaceUpdate
+from ._paged_models import OperationPaged
+from ._paged_models import WorkspacePaged
+from ._databricks_client_enums import (
+    CustomParameterType,
     ProvisioningState,
 )
 
 __all__ = [
-    'WorkspaceProviderAuthorization',
-    'Sku',
-    'Workspace',
-    'TrackedResource',
-    'Resource',
-    'WorkspaceUpdate',
+    'CreatedBy',
     'ErrorDetail',
     'ErrorInfo',
     'ErrorResponse', 'ErrorResponseException',
-    'OperationDisplay',
     'Operation',
+    'OperationDisplay',
+    'Resource',
+    'Sku',
+    'TrackedResource',
+    'Workspace',
+    'WorkspaceCustomBooleanParameter',
+    'WorkspaceCustomObjectParameter',
+    'WorkspaceCustomParameters',
+    'WorkspaceCustomStringParameter',
+    'WorkspaceProviderAuthorization',
+    'WorkspaceUpdate',
     'WorkspacePaged',
     'OperationPaged',
+    'CustomParameterType',
     'ProvisioningState',
 ]
diff --git a/...abricks/models/databricks_client_enums.py → ...bricks/models/_databricks_client_enums.py b/...abricks/models/databricks_client_enums.py → ...bricks/models/_databricks_client_enums.py
@@ -12,6 +12,13 @@
 from enum import Enum
 
 
+class CustomParameterType(str, Enum):
+
+    bool_enum = "Bool"
+    object_enum = "Object"
+    string = "String"
+
+
 class ProvisioningState(str, Enum):
 
     accepted = "Accepted"