Skip to content

Commit 4f6a419

Browse files
AutorestCIfengzhou-msft
authored andcommitted
[AutoPR] sql/resource-manager (#7535)
* Generated from 9402dbf3fb3d5fffcb80f501b1fc857ff97ab723 (#7329) Fixing PR validation errors * regenerated * history and version
1 parent bf5da02 commit 4f6a419

13 files changed

+624
-148
lines changed

sdk/sql/azure-mgmt-sql/HISTORY.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
Release History
44
===============
55

6+
0.14.0 (2019-10-04)
7+
+++++++++++++++++++
8+
9+
**Features**
10+
11+
- Added operation ServerBlobAuditingPoliciesOperations.list_by_server
12+
- Added operation ManagedDatabasesOperations.complete_restore
13+
- Added operation DatabaseBlobAuditingPoliciesOperations.list_by_database
14+
- Added operation group ManagedDatabaseRestoreDetailsOperations
15+
616
0.13.0 (2019-09-03)
717
+++++++++++++++++++
818

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_sql_management_client.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
from .operations import LongTermRetentionBackupsOperations
6666
from .operations import BackupLongTermRetentionPoliciesOperations
6767
from .operations import ManagedBackupShortTermRetentionPoliciesOperations
68-
from .operations import ManagedDatabasesOperations
6968
from .operations import ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesOperations
7069
from .operations import ServerAutomaticTuningOperations
7170
from .operations import ServerDnsAliasesOperations
@@ -96,6 +95,8 @@
9695
from .operations import InstancePoolsOperations
9796
from .operations import UsagesOperations
9897
from .operations import ManagedInstancesOperations
98+
from .operations import ManagedDatabaseRestoreDetailsOperations
99+
from .operations import ManagedDatabasesOperations
99100
from .operations import PrivateEndpointConnectionsOperations
100101
from .operations import PrivateLinkResourcesOperations
101102
from . import models
@@ -211,8 +212,6 @@ class SqlManagementClient(SDKClient):
211212
:vartype backup_long_term_retention_policies: azure.mgmt.sql.operations.BackupLongTermRetentionPoliciesOperations
212213
:ivar managed_backup_short_term_retention_policies: ManagedBackupShortTermRetentionPolicies operations
213214
:vartype managed_backup_short_term_retention_policies: azure.mgmt.sql.operations.ManagedBackupShortTermRetentionPoliciesOperations
214-
:ivar managed_databases: ManagedDatabases operations
215-
:vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
216215
:ivar managed_restorable_dropped_database_backup_short_term_retention_policies: ManagedRestorableDroppedDatabaseBackupShortTermRetentionPolicies operations
217216
:vartype managed_restorable_dropped_database_backup_short_term_retention_policies: azure.mgmt.sql.operations.ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesOperations
218217
:ivar server_automatic_tuning: ServerAutomaticTuning operations
@@ -273,6 +272,10 @@ class SqlManagementClient(SDKClient):
273272
:vartype usages: azure.mgmt.sql.operations.UsagesOperations
274273
:ivar managed_instances: ManagedInstances operations
275274
:vartype managed_instances: azure.mgmt.sql.operations.ManagedInstancesOperations
275+
:ivar managed_database_restore_details: ManagedDatabaseRestoreDetails operations
276+
:vartype managed_database_restore_details: azure.mgmt.sql.operations.ManagedDatabaseRestoreDetailsOperations
277+
:ivar managed_databases: ManagedDatabases operations
278+
:vartype managed_databases: azure.mgmt.sql.operations.ManagedDatabasesOperations
276279
:ivar private_endpoint_connections: PrivateEndpointConnections operations
277280
:vartype private_endpoint_connections: azure.mgmt.sql.operations.PrivateEndpointConnectionsOperations
278281
:ivar private_link_resources: PrivateLinkResources operations
@@ -401,8 +404,6 @@ def __init__(
401404
self._client, self.config, self._serialize, self._deserialize)
402405
self.managed_backup_short_term_retention_policies = ManagedBackupShortTermRetentionPoliciesOperations(
403406
self._client, self.config, self._serialize, self._deserialize)
404-
self.managed_databases = ManagedDatabasesOperations(
405-
self._client, self.config, self._serialize, self._deserialize)
406407
self.managed_restorable_dropped_database_backup_short_term_retention_policies = ManagedRestorableDroppedDatabaseBackupShortTermRetentionPoliciesOperations(
407408
self._client, self.config, self._serialize, self._deserialize)
408409
self.server_automatic_tuning = ServerAutomaticTuningOperations(
@@ -463,6 +464,10 @@ def __init__(
463464
self._client, self.config, self._serialize, self._deserialize)
464465
self.managed_instances = ManagedInstancesOperations(
465466
self._client, self.config, self._serialize, self._deserialize)
467+
self.managed_database_restore_details = ManagedDatabaseRestoreDetailsOperations(
468+
self._client, self.config, self._serialize, self._deserialize)
469+
self.managed_databases = ManagedDatabasesOperations(
470+
self._client, self.config, self._serialize, self._deserialize)
466471
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
467472
self._client, self.config, self._serialize, self._deserialize)
468473
self.private_link_resources = PrivateLinkResourcesOperations(

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
from ._models_py3 import LongTermRetentionBackup
8181
from ._models_py3 import ManagedBackupShortTermRetentionPolicy
8282
from ._models_py3 import ManagedDatabase
83+
from ._models_py3 import ManagedDatabaseRestoreDetailsResult
8384
from ._models_py3 import ManagedDatabaseSecurityAlertPolicy
8485
from ._models_py3 import ManagedDatabaseUpdate
8586
from ._models_py3 import ManagedInstance
@@ -242,6 +243,7 @@
242243
from ._models import LongTermRetentionBackup
243244
from ._models import ManagedBackupShortTermRetentionPolicy
244245
from ._models import ManagedDatabase
246+
from ._models import ManagedDatabaseRestoreDetailsResult
245247
from ._models import ManagedDatabaseSecurityAlertPolicy
246248
from ._models import ManagedDatabaseUpdate
247249
from ._models import ManagedInstance
@@ -334,6 +336,7 @@
334336
from ._models import VulnerabilityAssessmentScanError
335337
from ._models import VulnerabilityAssessmentScanRecord
336338
from ._paged_models import BackupShortTermRetentionPolicyPaged
339+
from ._paged_models import DatabaseBlobAuditingPolicyPaged
337340
from ._paged_models import DatabaseOperationPaged
338341
from ._paged_models import DatabasePaged
339342
from ._paged_models import DatabaseUsagePaged
@@ -381,6 +384,7 @@
381384
from ._paged_models import RestorePointPaged
382385
from ._paged_models import SensitivityLabelPaged
383386
from ._paged_models import ServerAzureADAdministratorPaged
387+
from ._paged_models import ServerBlobAuditingPolicyPaged
384388
from ._paged_models import ServerCommunicationLinkPaged
385389
from ._paged_models import ServerDnsAliasPaged
386390
from ._paged_models import ServerKeyPaged
@@ -456,9 +460,6 @@
456460
JobStepActionSource,
457461
JobStepOutputType,
458462
JobTargetGroupMembershipType,
459-
ManagedDatabaseStatus,
460-
CatalogCollationType,
461-
ManagedDatabaseCreateMode,
462463
AutomaticTuningServerMode,
463464
AutomaticTuningServerReason,
464465
RestorePointType,
@@ -470,6 +471,7 @@
470471
CreateMode,
471472
SampleName,
472473
DatabaseStatus,
474+
CatalogCollationType,
473475
DatabaseLicenseType,
474476
DatabaseReadScale,
475477
ElasticPoolState,
@@ -481,6 +483,8 @@
481483
ManagedServerCreateMode,
482484
ManagedInstanceLicenseType,
483485
ManagedInstanceProxyOverride,
486+
ManagedDatabaseStatus,
487+
ManagedDatabaseCreateMode,
484488
LongTermRetentionDatabaseState,
485489
VulnerabilityAssessmentPolicyBaselineName,
486490
SensitivityLabelSource,
@@ -558,6 +562,7 @@
558562
'LongTermRetentionBackup',
559563
'ManagedBackupShortTermRetentionPolicy',
560564
'ManagedDatabase',
565+
'ManagedDatabaseRestoreDetailsResult',
561566
'ManagedDatabaseSecurityAlertPolicy',
562567
'ManagedDatabaseUpdate',
563568
'ManagedInstance',
@@ -685,6 +690,8 @@
685690
'SubscriptionUsagePaged',
686691
'VirtualClusterPaged',
687692
'VirtualNetworkRulePaged',
693+
'ServerBlobAuditingPolicyPaged',
694+
'DatabaseBlobAuditingPolicyPaged',
688695
'DatabaseVulnerabilityAssessmentPaged',
689696
'JobAgentPaged',
690697
'JobCredentialPaged',
@@ -695,7 +702,6 @@
695702
'JobVersionPaged',
696703
'LongTermRetentionBackupPaged',
697704
'ManagedBackupShortTermRetentionPolicyPaged',
698-
'ManagedDatabasePaged',
699705
'ServerDnsAliasPaged',
700706
'ServerSecurityAlertPolicyPaged',
701707
'RestorableDroppedManagedDatabasePaged',
@@ -717,6 +723,7 @@
717723
'InstancePoolPaged',
718724
'UsagePaged',
719725
'ManagedInstancePaged',
726+
'ManagedDatabasePaged',
720727
'PrivateEndpointConnectionPaged',
721728
'PrivateLinkResourcePaged',
722729
'CheckNameAvailabilityReason',
@@ -771,9 +778,6 @@
771778
'JobStepActionSource',
772779
'JobStepOutputType',
773780
'JobTargetGroupMembershipType',
774-
'ManagedDatabaseStatus',
775-
'CatalogCollationType',
776-
'ManagedDatabaseCreateMode',
777781
'AutomaticTuningServerMode',
778782
'AutomaticTuningServerReason',
779783
'RestorePointType',
@@ -785,6 +789,7 @@
785789
'CreateMode',
786790
'SampleName',
787791
'DatabaseStatus',
792+
'CatalogCollationType',
788793
'DatabaseLicenseType',
789794
'DatabaseReadScale',
790795
'ElasticPoolState',
@@ -796,6 +801,8 @@
796801
'ManagedServerCreateMode',
797802
'ManagedInstanceLicenseType',
798803
'ManagedInstanceProxyOverride',
804+
'ManagedDatabaseStatus',
805+
'ManagedDatabaseCreateMode',
799806
'LongTermRetentionDatabaseState',
800807
'VulnerabilityAssessmentPolicyBaselineName',
801808
'SensitivityLabelSource',

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py

Lines changed: 82 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4440,7 +4440,7 @@ class ManagedDatabase(TrackedResource):
44404440
:param collation: Collation of the managed database.
44414441
:type collation: str
44424442
:ivar status: Status of the database. Possible values include: 'Online',
4443-
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'
4443+
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Restoring', 'Updating'
44444444
:vartype status: str or ~azure.mgmt.sql.models.ManagedDatabaseStatus
44454445
:ivar creation_date: Creation date of the database.
44464446
:vartype creation_date: datetime
@@ -4543,6 +4543,86 @@ def __init__(self, **kwargs):
45434543
self.recoverable_database_id = kwargs.get('recoverable_database_id', None)
45444544

45454545

4546+
class ManagedDatabaseRestoreDetailsResult(ProxyResource):
4547+
"""A managed database restore details.
4548+
4549+
Variables are only populated by the server, and will be ignored when
4550+
sending a request.
4551+
4552+
:ivar id: Resource ID.
4553+
:vartype id: str
4554+
:ivar name: Resource name.
4555+
:vartype name: str
4556+
:ivar type: Resource type.
4557+
:vartype type: str
4558+
:ivar status: Restore status.
4559+
:vartype status: str
4560+
:ivar current_restoring_file_name: Current restoring file name.
4561+
:vartype current_restoring_file_name: str
4562+
:ivar last_restored_file_name: Last restored file name.
4563+
:vartype last_restored_file_name: str
4564+
:ivar last_restored_file_time: Last restored file time.
4565+
:vartype last_restored_file_time: datetime
4566+
:ivar percent_completed: Percent completed.
4567+
:vartype percent_completed: float
4568+
:ivar unrestorable_files: List of unrestorable files.
4569+
:vartype unrestorable_files: list[str]
4570+
:ivar number_of_files_detected: Number of files detected.
4571+
:vartype number_of_files_detected: long
4572+
:ivar last_uploaded_file_name: Last uploaded file name.
4573+
:vartype last_uploaded_file_name: str
4574+
:ivar last_uploaded_file_time: Last uploaded file time.
4575+
:vartype last_uploaded_file_time: datetime
4576+
:ivar block_reason: The reason why restore is in Blocked state.
4577+
:vartype block_reason: str
4578+
"""
4579+
4580+
_validation = {
4581+
'id': {'readonly': True},
4582+
'name': {'readonly': True},
4583+
'type': {'readonly': True},
4584+
'status': {'readonly': True},
4585+
'current_restoring_file_name': {'readonly': True},
4586+
'last_restored_file_name': {'readonly': True},
4587+
'last_restored_file_time': {'readonly': True},
4588+
'percent_completed': {'readonly': True},
4589+
'unrestorable_files': {'readonly': True},
4590+
'number_of_files_detected': {'readonly': True},
4591+
'last_uploaded_file_name': {'readonly': True},
4592+
'last_uploaded_file_time': {'readonly': True},
4593+
'block_reason': {'readonly': True},
4594+
}
4595+
4596+
_attribute_map = {
4597+
'id': {'key': 'id', 'type': 'str'},
4598+
'name': {'key': 'name', 'type': 'str'},
4599+
'type': {'key': 'type', 'type': 'str'},
4600+
'status': {'key': 'properties.status', 'type': 'str'},
4601+
'current_restoring_file_name': {'key': 'properties.currentRestoringFileName', 'type': 'str'},
4602+
'last_restored_file_name': {'key': 'properties.lastRestoredFileName', 'type': 'str'},
4603+
'last_restored_file_time': {'key': 'properties.lastRestoredFileTime', 'type': 'iso-8601'},
4604+
'percent_completed': {'key': 'properties.percentCompleted', 'type': 'float'},
4605+
'unrestorable_files': {'key': 'properties.unrestorableFiles', 'type': '[str]'},
4606+
'number_of_files_detected': {'key': 'properties.numberOfFilesDetected', 'type': 'long'},
4607+
'last_uploaded_file_name': {'key': 'properties.lastUploadedFileName', 'type': 'str'},
4608+
'last_uploaded_file_time': {'key': 'properties.lastUploadedFileTime', 'type': 'iso-8601'},
4609+
'block_reason': {'key': 'properties.blockReason', 'type': 'str'},
4610+
}
4611+
4612+
def __init__(self, **kwargs):
4613+
super(ManagedDatabaseRestoreDetailsResult, self).__init__(**kwargs)
4614+
self.status = None
4615+
self.current_restoring_file_name = None
4616+
self.last_restored_file_name = None
4617+
self.last_restored_file_time = None
4618+
self.percent_completed = None
4619+
self.unrestorable_files = None
4620+
self.number_of_files_detected = None
4621+
self.last_uploaded_file_name = None
4622+
self.last_uploaded_file_time = None
4623+
self.block_reason = None
4624+
4625+
45464626
class ManagedDatabaseSecurityAlertPolicy(ProxyResource):
45474627
"""A managed database security alert policy.
45484628
@@ -4628,7 +4708,7 @@ class ManagedDatabaseUpdate(Model):
46284708
:param collation: Collation of the managed database.
46294709
:type collation: str
46304710
:ivar status: Status of the database. Possible values include: 'Online',
4631-
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'
4711+
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Restoring', 'Updating'
46324712
:vartype status: str or ~azure.mgmt.sql.models.ManagedDatabaseStatus
46334713
:ivar creation_date: Creation date of the database.
46344714
:vartype creation_date: datetime

0 commit comments

Comments
 (0)