Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/sql/azure-mgmt-sql/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the Microsoft Azure SQL Management Client Library.
Azure Resource Manager (ARM) is the next generation of management APIs that
replace the old Azure Service Management (ASM).

This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
This package has been tested with Python 2.7, 3.5, 3.6 and 3.7.

For the older Azure Service Management (ASM) libraries, see
`azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
Expand Down
63 changes: 45 additions & 18 deletions sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,10 @@
from .partner_info_py3 import PartnerInfo
from .failover_group_py3 import FailoverGroup
from .failover_group_update_py3 import FailoverGroupUpdate
from .resource_identity_py3 import ResourceIdentity
from .sku_py3 import Sku
from .managed_instance_py3 import ManagedInstance
from .managed_instance_update_py3 import ManagedInstanceUpdate
from .operation_display_py3 import OperationDisplay
from .operation_py3 import Operation
from .server_key_py3 import ServerKey
from .resource_identity_py3 import ResourceIdentity
from .server_py3 import Server
from .server_update_py3 import ServerUpdate
from .sync_agent_py3 import SyncAgent
Expand Down Expand Up @@ -90,6 +87,7 @@
from .database_vulnerability_assessment_rule_baseline_py3 import DatabaseVulnerabilityAssessmentRuleBaseline
from .vulnerability_assessment_recurring_scans_properties_py3 import VulnerabilityAssessmentRecurringScansProperties
from .database_vulnerability_assessment_py3 import DatabaseVulnerabilityAssessment
from .sku_py3 import Sku
from .job_agent_py3 import JobAgent
from .job_agent_update_py3 import JobAgentUpdate
from .job_credential_py3 import JobCredential
Expand Down Expand Up @@ -121,6 +119,7 @@
from .managed_database_security_alert_policy_py3 import ManagedDatabaseSecurityAlertPolicy
from .managed_server_security_alert_policy_py3 import ManagedServerSecurityAlertPolicy
from .sensitivity_label_py3 import SensitivityLabel
from .managed_instance_administrator_py3 import ManagedInstanceAdministrator
from .database_operation_py3 import DatabaseOperation
from .elastic_pool_operation_py3 import ElasticPoolOperation
from .max_size_capability_py3 import MaxSizeCapability
Expand Down Expand Up @@ -161,6 +160,12 @@
from .recoverable_managed_database_py3 import RecoverableManagedDatabase
from .managed_instance_vulnerability_assessment_py3 import ManagedInstanceVulnerabilityAssessment
from .server_vulnerability_assessment_py3 import ServerVulnerabilityAssessment
from .instance_pool_py3 import InstancePool
from .instance_pool_update_py3 import InstancePoolUpdate
from .name_py3 import Name
from .usage_py3 import Usage
from .managed_instance_py3 import ManagedInstance
from .managed_instance_update_py3 import ManagedInstanceUpdate
except (SyntaxError, ImportError):
from .recoverable_database import RecoverableDatabase
from .restorable_dropped_database import RestorableDroppedDatabase
Expand Down Expand Up @@ -208,13 +213,10 @@
from .partner_info import PartnerInfo
from .failover_group import FailoverGroup
from .failover_group_update import FailoverGroupUpdate
from .resource_identity import ResourceIdentity
from .sku import Sku
from .managed_instance import ManagedInstance
from .managed_instance_update import ManagedInstanceUpdate
from .operation_display import OperationDisplay
from .operation import Operation
from .server_key import ServerKey
from .resource_identity import ResourceIdentity
from .server import Server
from .server_update import ServerUpdate
from .sync_agent import SyncAgent
Expand Down Expand Up @@ -242,6 +244,7 @@
from .database_vulnerability_assessment_rule_baseline import DatabaseVulnerabilityAssessmentRuleBaseline
from .vulnerability_assessment_recurring_scans_properties import VulnerabilityAssessmentRecurringScansProperties
from .database_vulnerability_assessment import DatabaseVulnerabilityAssessment
from .sku import Sku
from .job_agent import JobAgent
from .job_agent_update import JobAgentUpdate
from .job_credential import JobCredential
Expand Down Expand Up @@ -273,6 +276,7 @@
from .managed_database_security_alert_policy import ManagedDatabaseSecurityAlertPolicy
from .managed_server_security_alert_policy import ManagedServerSecurityAlertPolicy
from .sensitivity_label import SensitivityLabel
from .managed_instance_administrator import ManagedInstanceAdministrator
from .database_operation import DatabaseOperation
from .elastic_pool_operation import ElasticPoolOperation
from .max_size_capability import MaxSizeCapability
Expand Down Expand Up @@ -313,6 +317,12 @@
from .recoverable_managed_database import RecoverableManagedDatabase
from .managed_instance_vulnerability_assessment import ManagedInstanceVulnerabilityAssessment
from .server_vulnerability_assessment import ServerVulnerabilityAssessment
from .instance_pool import InstancePool
from .instance_pool_update import InstancePoolUpdate
from .name import Name
from .usage import Usage
from .managed_instance import ManagedInstance
from .managed_instance_update import ManagedInstanceUpdate
from .recoverable_database_paged import RecoverableDatabasePaged
from .restorable_dropped_database_paged import RestorableDroppedDatabasePaged
from .server_paged import ServerPaged
Expand All @@ -337,7 +347,6 @@
from .database_usage_paged import DatabaseUsagePaged
from .encryption_protector_paged import EncryptionProtectorPaged
from .failover_group_paged import FailoverGroupPaged
from .managed_instance_paged import ManagedInstancePaged
from .operation_paged import OperationPaged
from .server_key_paged import ServerKeyPaged
from .sync_agent_paged import SyncAgentPaged
Expand Down Expand Up @@ -368,6 +377,7 @@
from .managed_database_security_alert_policy_paged import ManagedDatabaseSecurityAlertPolicyPaged
from .managed_server_security_alert_policy_paged import ManagedServerSecurityAlertPolicyPaged
from .sensitivity_label_paged import SensitivityLabelPaged
from .managed_instance_administrator_paged import ManagedInstanceAdministratorPaged
from .database_operation_paged import DatabaseOperationPaged
from .elastic_pool_operation_paged import ElasticPoolOperationPaged
from .vulnerability_assessment_scan_record_paged import VulnerabilityAssessmentScanRecordPaged
Expand All @@ -378,6 +388,9 @@
from .recoverable_managed_database_paged import RecoverableManagedDatabasePaged
from .managed_instance_vulnerability_assessment_paged import ManagedInstanceVulnerabilityAssessmentPaged
from .server_vulnerability_assessment_paged import ServerVulnerabilityAssessmentPaged
from .instance_pool_paged import InstancePoolPaged
from .usage_paged import UsagePaged
from .managed_instance_paged import ManagedInstancePaged
from .sql_management_client_enums import (
CheckNameAvailabilityReason,
ServerConnectionType,
Expand Down Expand Up @@ -411,9 +424,8 @@
ReadWriteEndpointFailoverPolicy,
ReadOnlyEndpointFailoverPolicy,
FailoverGroupReplicationRole,
IdentityType,
ManagedInstanceProxyOverride,
OperationOrigin,
IdentityType,
SyncAgentState,
SyncMemberDbType,
SyncGroupLogType,
Expand Down Expand Up @@ -453,6 +465,10 @@
VulnerabilityAssessmentScanTriggerType,
VulnerabilityAssessmentScanState,
InstanceFailoverGroupReplicationRole,
InstancePoolLicenseType,
ManagedServerCreateMode,
ManagedInstanceLicenseType,
ManagedInstanceProxyOverride,
LongTermRetentionDatabaseState,
VulnerabilityAssessmentPolicyBaselineName,
SensitivityLabelSource,
Expand Down Expand Up @@ -506,13 +522,10 @@
'PartnerInfo',
'FailoverGroup',
'FailoverGroupUpdate',
'ResourceIdentity',
'Sku',
'ManagedInstance',
'ManagedInstanceUpdate',
'OperationDisplay',
'Operation',
'ServerKey',
'ResourceIdentity',
'Server',
'ServerUpdate',
'SyncAgent',
Expand Down Expand Up @@ -540,6 +553,7 @@
'DatabaseVulnerabilityAssessmentRuleBaseline',
'VulnerabilityAssessmentRecurringScansProperties',
'DatabaseVulnerabilityAssessment',
'Sku',
'JobAgent',
'JobAgentUpdate',
'JobCredential',
Expand Down Expand Up @@ -571,6 +585,7 @@
'ManagedDatabaseSecurityAlertPolicy',
'ManagedServerSecurityAlertPolicy',
'SensitivityLabel',
'ManagedInstanceAdministrator',
'DatabaseOperation',
'ElasticPoolOperation',
'MaxSizeCapability',
Expand Down Expand Up @@ -611,6 +626,12 @@
'RecoverableManagedDatabase',
'ManagedInstanceVulnerabilityAssessment',
'ServerVulnerabilityAssessment',
'InstancePool',
'InstancePoolUpdate',
'Name',
'Usage',
'ManagedInstance',
'ManagedInstanceUpdate',
'RecoverableDatabasePaged',
'RestorableDroppedDatabasePaged',
'ServerPaged',
Expand All @@ -635,7 +656,6 @@
'DatabaseUsagePaged',
'EncryptionProtectorPaged',
'FailoverGroupPaged',
'ManagedInstancePaged',
'OperationPaged',
'ServerKeyPaged',
'SyncAgentPaged',
Expand Down Expand Up @@ -666,6 +686,7 @@
'ManagedDatabaseSecurityAlertPolicyPaged',
'ManagedServerSecurityAlertPolicyPaged',
'SensitivityLabelPaged',
'ManagedInstanceAdministratorPaged',
'DatabaseOperationPaged',
'ElasticPoolOperationPaged',
'VulnerabilityAssessmentScanRecordPaged',
Expand All @@ -676,6 +697,9 @@
'RecoverableManagedDatabasePaged',
'ManagedInstanceVulnerabilityAssessmentPaged',
'ServerVulnerabilityAssessmentPaged',
'InstancePoolPaged',
'UsagePaged',
'ManagedInstancePaged',
'CheckNameAvailabilityReason',
'ServerConnectionType',
'SecurityAlertPolicyState',
Expand Down Expand Up @@ -708,9 +732,8 @@
'ReadWriteEndpointFailoverPolicy',
'ReadOnlyEndpointFailoverPolicy',
'FailoverGroupReplicationRole',
'IdentityType',
'ManagedInstanceProxyOverride',
'OperationOrigin',
'IdentityType',
'SyncAgentState',
'SyncMemberDbType',
'SyncGroupLogType',
Expand Down Expand Up @@ -750,6 +773,10 @@
'VulnerabilityAssessmentScanTriggerType',
'VulnerabilityAssessmentScanState',
'InstanceFailoverGroupReplicationRole',
'InstancePoolLicenseType',
'ManagedServerCreateMode',
'ManagedInstanceLicenseType',
'ManagedInstanceProxyOverride',
'LongTermRetentionDatabaseState',
'VulnerabilityAssessmentPolicyBaselineName',
'SensitivityLabelSource',
Expand Down
25 changes: 23 additions & 2 deletions sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,17 @@ class Database(TrackedResource):
:type location: str
:param tags: Resource tags.
:type tags: dict[str, str]
:param sku: The name and tier of the SKU.
:param sku: The database SKU.
The list of SKUs may vary by region and support offer. To determine the
SKUs (including the SKU name, tier/edition, family, and capacity) that are
available to your subscription in an Azure region, use the
`Capabilities_ListByLocation` REST API or one of the following commands:
```azurecli
az sql db list-editions -l <location> -o table
````
```powershell
Get-AzSqlServerServiceObjective -Location <location>
````
:type sku: ~azure.mgmt.sql.models.Sku
:ivar kind: Kind of database. This is metadata used for the Azure portal
experience.
Expand Down Expand Up @@ -85,7 +95,8 @@ class Database(TrackedResource):
'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect',
'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed',
'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing',
'Paused', 'Resuming', 'Scaling'
'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
'OnlineChangingDwPerformanceTiers'
:vartype status: str or ~azure.mgmt.sql.models.DatabaseStatus
:ivar database_id: The ID of the database.
:vartype database_id: str
Expand Down Expand Up @@ -146,6 +157,12 @@ class Database(TrackedResource):
:type read_scale: str or ~azure.mgmt.sql.models.DatabaseReadScale
:ivar current_sku: The name and tier of the SKU.
:vartype current_sku: ~azure.mgmt.sql.models.Sku
:param auto_pause_delay: Time in minutes after which database is
automatically paused. A value of -1 means that automatic pause is disabled
:type auto_pause_delay: int
:param min_capacity: Minimal capacity that database will always have
allocated, if not paused
:type min_capacity: float
"""

_validation = {
Expand Down Expand Up @@ -202,6 +219,8 @@ class Database(TrackedResource):
'earliest_restore_date': {'key': 'properties.earliestRestoreDate', 'type': 'iso-8601'},
'read_scale': {'key': 'properties.readScale', 'type': 'str'},
'current_sku': {'key': 'properties.currentSku', 'type': 'Sku'},
'auto_pause_delay': {'key': 'properties.autoPauseDelay', 'type': 'int'},
'min_capacity': {'key': 'properties.minCapacity', 'type': 'float'},
}

def __init__(self, **kwargs):
Expand Down Expand Up @@ -235,3 +254,5 @@ def __init__(self, **kwargs):
self.earliest_restore_date = None
self.read_scale = kwargs.get('read_scale', None)
self.current_sku = None
self.auto_pause_delay = kwargs.get('auto_pause_delay', None)
self.min_capacity = kwargs.get('min_capacity', None)
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class DatabaseBlobAuditingPolicy(ProxyResource):
:type is_storage_secondary_key_in_use: bool
:param is_azure_monitor_target_enabled: Specifies whether audit events are
sent to Azure Monitor.
In order to send the events to Azure Monitor, specify 'State' as 'Enabled'
and 'IsAzureMonitorTargetEnabled' as true.
In order to send the events to Azure Monitor, specify 'state' as 'Enabled'
and 'isAzureMonitorTargetEnabled' as true.
When using REST API to configure auditing, Diagnostic Settings with
'SQLSecurityAuditEvents' diagnostic logs category on the database should
be also created.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ class DatabaseBlobAuditingPolicy(ProxyResource):
:type is_storage_secondary_key_in_use: bool
:param is_azure_monitor_target_enabled: Specifies whether audit events are
sent to Azure Monitor.
In order to send the events to Azure Monitor, specify 'State' as 'Enabled'
and 'IsAzureMonitorTargetEnabled' as true.
In order to send the events to Azure Monitor, specify 'state' as 'Enabled'
and 'isAzureMonitorTargetEnabled' as true.
When using REST API to configure auditing, Diagnostic Settings with
'SQLSecurityAuditEvents' diagnostic logs category on the database should
be also created.
Expand Down
27 changes: 24 additions & 3 deletions sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/database_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,17 @@ class Database(TrackedResource):
:type location: str
:param tags: Resource tags.
:type tags: dict[str, str]
:param sku: The name and tier of the SKU.
:param sku: The database SKU.
The list of SKUs may vary by region and support offer. To determine the
SKUs (including the SKU name, tier/edition, family, and capacity) that are
available to your subscription in an Azure region, use the
`Capabilities_ListByLocation` REST API or one of the following commands:
```azurecli
az sql db list-editions -l <location> -o table
````
```powershell
Get-AzSqlServerServiceObjective -Location <location>
````
:type sku: ~azure.mgmt.sql.models.Sku
:ivar kind: Kind of database. This is metadata used for the Azure portal
experience.
Expand Down Expand Up @@ -85,7 +95,8 @@ class Database(TrackedResource):
'Online', 'Restoring', 'RecoveryPending', 'Recovering', 'Suspect',
'Offline', 'Standby', 'Shutdown', 'EmergencyMode', 'AutoClosed',
'Copying', 'Creating', 'Inaccessible', 'OfflineSecondary', 'Pausing',
'Paused', 'Resuming', 'Scaling'
'Paused', 'Resuming', 'Scaling', 'OfflineChangingDwPerformanceTiers',
'OnlineChangingDwPerformanceTiers'
:vartype status: str or ~azure.mgmt.sql.models.DatabaseStatus
:ivar database_id: The ID of the database.
:vartype database_id: str
Expand Down Expand Up @@ -146,6 +157,12 @@ class Database(TrackedResource):
:type read_scale: str or ~azure.mgmt.sql.models.DatabaseReadScale
:ivar current_sku: The name and tier of the SKU.
:vartype current_sku: ~azure.mgmt.sql.models.Sku
:param auto_pause_delay: Time in minutes after which database is
automatically paused. A value of -1 means that automatic pause is disabled
:type auto_pause_delay: int
:param min_capacity: Minimal capacity that database will always have
allocated, if not paused
:type min_capacity: float
"""

_validation = {
Expand Down Expand Up @@ -202,9 +219,11 @@ class Database(TrackedResource):
'earliest_restore_date': {'key': 'properties.earliestRestoreDate', 'type': 'iso-8601'},
'read_scale': {'key': 'properties.readScale', 'type': 'str'},
'current_sku': {'key': 'properties.currentSku', 'type': 'Sku'},
'auto_pause_delay': {'key': 'properties.autoPauseDelay', 'type': 'int'},
'min_capacity': {'key': 'properties.minCapacity', 'type': 'float'},
}

def __init__(self, *, location: str, tags=None, sku=None, create_mode=None, collation: str=None, max_size_bytes: int=None, sample_name=None, elastic_pool_id: str=None, source_database_id: str=None, restore_point_in_time=None, source_database_deletion_date=None, recovery_services_recovery_point_id: str=None, long_term_retention_backup_resource_id: str=None, recoverable_database_id: str=None, restorable_dropped_database_id: str=None, catalog_collation=None, zone_redundant: bool=None, license_type=None, read_scale=None, **kwargs) -> None:
def __init__(self, *, location: str, tags=None, sku=None, create_mode=None, collation: str=None, max_size_bytes: int=None, sample_name=None, elastic_pool_id: str=None, source_database_id: str=None, restore_point_in_time=None, source_database_deletion_date=None, recovery_services_recovery_point_id: str=None, long_term_retention_backup_resource_id: str=None, recoverable_database_id: str=None, restorable_dropped_database_id: str=None, catalog_collation=None, zone_redundant: bool=None, license_type=None, read_scale=None, auto_pause_delay: int=None, min_capacity: float=None, **kwargs) -> None:
super(Database, self).__init__(location=location, tags=tags, **kwargs)
self.sku = sku
self.kind = None
Expand Down Expand Up @@ -235,3 +254,5 @@ def __init__(self, *, location: str, tags=None, sku=None, create_mode=None, coll
self.earliest_restore_date = None
self.read_scale = read_scale
self.current_sku = None
self.auto_pause_delay = auto_pause_delay
self.min_capacity = min_capacity
Loading