Skip to content

Commit d68b394

Browse files
author
SDK Automation
committed
Update from release/v3
1 parent ca42cd1 commit d68b394

37 files changed

+2262
-1152
lines changed

‎sdk/databricks/azure-mgmt-databricks/README.md‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,21 @@
1-
## Microsoft Azure SDK for Python
1+
# Microsoft Azure SDK for Python
22

33
This is the Microsoft Azure Databricks Management Client Library.
4+
This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
5+
For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
46

5-
Azure Resource Manager (ARM) is the next generation of management APIs
6-
that replace the old Azure Service Management (ASM).
77

8-
This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
8+
# Usage
99

10-
For the older Azure Service Management (ASM) libraries, see
11-
[azure-servicemanagement-legacy](https://pypi.python.org/pypi/azure-servicemanagement-legacy)
12-
library.
10+
For code examples, see [Databricks Management](https://docs.microsoft.com/python/api/overview/azure/)
11+
on docs.microsoft.com.
1312

14-
For a more complete set of Azure libraries, see the
15-
[azure](https://pypi.python.org/pypi/azure) bundle package.
1613

17-
## Usage
14+
# Provide Feedback
1815

19-
For code examples, see [Databricks
20-
Management](https://docs.microsoft.com/python/api/overview/azure/) on
21-
docs.microsoft.com.
22-
23-
## Provide Feedback
24-
25-
If you encounter any bugs or have suggestions, please file an issue in
26-
the [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
16+
If you encounter any bugs or have suggestions, please file an issue in the
17+
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
2718
section of the project.
2819

29-
![image](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-databricks%2FREADME.png)
20+
21+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-databricks%2FREADME.png)

‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/__init__.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .databricks_client import DatabricksClient
13-
from .version import VERSION
12+
from ._configuration import DatabricksClientConfiguration
13+
from ._databricks_client import DatabricksClient
14+
__all__ = ['DatabricksClient', 'DatabricksClientConfiguration']
1415

15-
__all__ = ['DatabricksClient']
16+
from .version import VERSION
1617

1718
__version__ = VERSION
1819

‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_configuration.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from msrestazure import AzureConfiguration
12+
13+
from .version import VERSION
14+
15+
16+
class DatabricksClientConfiguration(AzureConfiguration):
17+
"""Configuration for DatabricksClient
18+
Note that all parameters used to create this instance are saved as instance
19+
attributes.
20+
21+
:param credentials: Credentials needed for the client to connect to Azure.
22+
:type credentials: :mod:`A msrestazure Credentials
23+
object<msrestazure.azure_active_directory>`
24+
:param subscription_id: The ID of the target subscription.
25+
:type subscription_id: str
26+
:param str base_url: Service URL
27+
"""
28+
29+
def __init__(
30+
self, credentials, subscription_id, base_url=None):
31+
32+
if credentials is None:
33+
raise ValueError("Parameter 'credentials' must not be None.")
34+
if subscription_id is None:
35+
raise ValueError("Parameter 'subscription_id' must not be None.")
36+
if not base_url:
37+
base_url = 'https://management.azure.com'
38+
39+
super(DatabricksClientConfiguration, self).__init__(base_url)
40+
41+
# Starting Autorest.Python 4.0.64, make connection pool activated by default
42+
self.keep_alive = True
43+
44+
self.add_user_agent('azure-mgmt-databricks/{}'.format(VERSION))
45+
self.add_user_agent('Azure-SDK-For-Python')
46+
47+
self.credentials = credentials
48+
self.subscription_id = subscription_id

‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/databricks_client.py‎ renamed to ‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/_databricks_client.py‎

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,12 @@
1111

1212
from msrest.service_client import SDKClient
1313
from msrest import Serializer, Deserializer
14-
from msrestazure import AzureConfiguration
15-
from .version import VERSION
16-
from .operations.workspaces_operations import WorkspacesOperations
17-
from .operations.operations import Operations
18-
from . import models
19-
20-
21-
class DatabricksClientConfiguration(AzureConfiguration):
22-
"""Configuration for DatabricksClient
23-
Note that all parameters used to create this instance are saved as instance
24-
attributes.
2514

26-
:param credentials: Credentials needed for the client to connect to Azure.
27-
:type credentials: :mod:`A msrestazure Credentials
28-
object<msrestazure.azure_active_directory>`
29-
:param subscription_id: The ID of the target subscription.
30-
:type subscription_id: str
31-
:param str base_url: Service URL
32-
"""
33-
34-
def __init__(
35-
self, credentials, subscription_id, base_url=None):
36-
37-
if credentials is None:
38-
raise ValueError("Parameter 'credentials' must not be None.")
39-
if subscription_id is None:
40-
raise ValueError("Parameter 'subscription_id' must not be None.")
41-
if not base_url:
42-
base_url = 'https://management.azure.com'
43-
44-
super(DatabricksClientConfiguration, self).__init__(base_url)
45-
46-
self.add_user_agent('azure-mgmt-databricks/{}'.format(VERSION))
47-
self.add_user_agent('Azure-SDK-For-Python')
48-
49-
self.credentials = credentials
50-
self.subscription_id = subscription_id
15+
from ._configuration import DatabricksClientConfiguration
16+
from .operations import WorkspacesOperations
17+
from .operations import VNetPeeringOperations
18+
from .operations import Operations
19+
from . import models
5120

5221

5322
class DatabricksClient(SDKClient):
@@ -58,6 +27,8 @@ class DatabricksClient(SDKClient):
5827
5928
:ivar workspaces: Workspaces operations
6029
:vartype workspaces: azure.mgmt.databricks.operations.WorkspacesOperations
30+
:ivar vnet_peering: VNetPeering operations
31+
:vartype vnet_peering: azure.mgmt.databricks.operations.VNetPeeringOperations
6132
:ivar operations: Operations operations
6233
:vartype operations: azure.mgmt.databricks.operations.Operations
6334
@@ -82,5 +53,7 @@ def __init__(
8253

8354
self.workspaces = WorkspacesOperations(
8455
self._client, self.config, self._serialize, self._deserialize)
56+
self.vnet_peering = VNetPeeringOperations(
57+
self._client, self.config, self._serialize, self._deserialize)
8558
self.operations = Operations(
8659
self._client, self.config, self._serialize, self._deserialize)

‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/__init__.py‎

Lines changed: 78 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,94 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13-
from .workspace_provider_authorization_py3 import WorkspaceProviderAuthorization
14-
from .sku_py3 import Sku
15-
from .workspace_py3 import Workspace
16-
from .tracked_resource_py3 import TrackedResource
17-
from .resource_py3 import Resource
18-
from .workspace_update_py3 import WorkspaceUpdate
19-
from .error_detail_py3 import ErrorDetail
20-
from .error_info_py3 import ErrorInfo
21-
from .error_response_py3 import ErrorResponse, ErrorResponseException
22-
from .operation_display_py3 import OperationDisplay
23-
from .operation_py3 import Operation
13+
from ._models_py3 import AddressSpace
14+
from ._models_py3 import CreatedBy
15+
from ._models_py3 import Encryption
16+
from ._models_py3 import ErrorDetail
17+
from ._models_py3 import ErrorInfo
18+
from ._models_py3 import ErrorResponse, ErrorResponseException
19+
from ._models_py3 import ManagedIdentityConfiguration
20+
from ._models_py3 import Operation
21+
from ._models_py3 import OperationDisplay
22+
from ._models_py3 import Resource
23+
from ._models_py3 import Sku
24+
from ._models_py3 import TrackedResource
25+
from ._models_py3 import VirtualNetworkPeering
26+
from ._models_py3 import VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork
27+
from ._models_py3 import VirtualNetworkPeeringPropertiesFormatRemoteVirtualNetwork
28+
from ._models_py3 import Workspace
29+
from ._models_py3 import WorkspaceCustomBooleanParameter
30+
from ._models_py3 import WorkspaceCustomObjectParameter
31+
from ._models_py3 import WorkspaceCustomParameters
32+
from ._models_py3 import WorkspaceCustomStringParameter
33+
from ._models_py3 import WorkspaceEncryptionParameter
34+
from ._models_py3 import WorkspaceProviderAuthorization
35+
from ._models_py3 import WorkspaceUpdate
2436
except (SyntaxError, ImportError):
25-
from .workspace_provider_authorization import WorkspaceProviderAuthorization
26-
from .sku import Sku
27-
from .workspace import Workspace
28-
from .tracked_resource import TrackedResource
29-
from .resource import Resource
30-
from .workspace_update import WorkspaceUpdate
31-
from .error_detail import ErrorDetail
32-
from .error_info import ErrorInfo
33-
from .error_response import ErrorResponse, ErrorResponseException
34-
from .operation_display import OperationDisplay
35-
from .operation import Operation
36-
from .workspace_paged import WorkspacePaged
37-
from .operation_paged import OperationPaged
38-
from .databricks_client_enums import (
37+
from ._models import AddressSpace
38+
from ._models import CreatedBy
39+
from ._models import Encryption
40+
from ._models import ErrorDetail
41+
from ._models import ErrorInfo
42+
from ._models import ErrorResponse, ErrorResponseException
43+
from ._models import ManagedIdentityConfiguration
44+
from ._models import Operation
45+
from ._models import OperationDisplay
46+
from ._models import Resource
47+
from ._models import Sku
48+
from ._models import TrackedResource
49+
from ._models import VirtualNetworkPeering
50+
from ._models import VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork
51+
from ._models import VirtualNetworkPeeringPropertiesFormatRemoteVirtualNetwork
52+
from ._models import Workspace
53+
from ._models import WorkspaceCustomBooleanParameter
54+
from ._models import WorkspaceCustomObjectParameter
55+
from ._models import WorkspaceCustomParameters
56+
from ._models import WorkspaceCustomStringParameter
57+
from ._models import WorkspaceEncryptionParameter
58+
from ._models import WorkspaceProviderAuthorization
59+
from ._models import WorkspaceUpdate
60+
from ._paged_models import OperationPaged
61+
from ._paged_models import VirtualNetworkPeeringPaged
62+
from ._paged_models import WorkspacePaged
63+
from ._databricks_client_enums import (
64+
CustomParameterType,
65+
KeySource,
3966
ProvisioningState,
67+
PeeringProvisioningState,
68+
PeeringState,
4069
)
4170

4271
__all__ = [
43-
'WorkspaceProviderAuthorization',
44-
'Sku',
45-
'Workspace',
46-
'TrackedResource',
47-
'Resource',
48-
'WorkspaceUpdate',
72+
'AddressSpace',
73+
'CreatedBy',
74+
'Encryption',
4975
'ErrorDetail',
5076
'ErrorInfo',
5177
'ErrorResponse', 'ErrorResponseException',
52-
'OperationDisplay',
78+
'ManagedIdentityConfiguration',
5379
'Operation',
80+
'OperationDisplay',
81+
'Resource',
82+
'Sku',
83+
'TrackedResource',
84+
'VirtualNetworkPeering',
85+
'VirtualNetworkPeeringPropertiesFormatDatabricksVirtualNetwork',
86+
'VirtualNetworkPeeringPropertiesFormatRemoteVirtualNetwork',
87+
'Workspace',
88+
'WorkspaceCustomBooleanParameter',
89+
'WorkspaceCustomObjectParameter',
90+
'WorkspaceCustomParameters',
91+
'WorkspaceCustomStringParameter',
92+
'WorkspaceEncryptionParameter',
93+
'WorkspaceProviderAuthorization',
94+
'WorkspaceUpdate',
5495
'WorkspacePaged',
96+
'VirtualNetworkPeeringPaged',
5597
'OperationPaged',
98+
'CustomParameterType',
99+
'KeySource',
56100
'ProvisioningState',
101+
'PeeringProvisioningState',
102+
'PeeringState',
57103
]

‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/databricks_client_enums.py‎ renamed to ‎sdk/databricks/azure-mgmt-databricks/azure/mgmt/databricks/models/_databricks_client_enums.py‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
from enum import Enum
1313

1414

15+
class CustomParameterType(str, Enum):
16+
17+
bool_enum = "Bool"
18+
object_enum = "Object"
19+
string = "String"
20+
21+
22+
class KeySource(str, Enum):
23+
24+
default = "Default"
25+
microsoft_keyvault = "Microsoft.Keyvault"
26+
27+
1528
class ProvisioningState(str, Enum):
1629

1730
accepted = "Accepted"
@@ -25,3 +38,18 @@ class ProvisioningState(str, Enum):
2538
failed = "Failed"
2639
succeeded = "Succeeded"
2740
updating = "Updating"
41+
42+
43+
class PeeringProvisioningState(str, Enum):
44+
45+
succeeded = "Succeeded"
46+
updating = "Updating"
47+
deleting = "Deleting"
48+
failed = "Failed"
49+
50+
51+
class PeeringState(str, Enum):
52+
53+
initiated = "Initiated"
54+
connected = "Connected"
55+
disconnected = "Disconnected"

0 commit comments

Comments
 (0)