Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR] sql/resource-manager #3769

Merged
merged 19 commits into from
Mar 28, 2019
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0fb87d3
Generated from 53c4ddeb556f158661ff82f16e58f8cfdbcaa9ff (#3768)
AutorestCI Nov 9, 2018
7e6b806
[AutoPR sql/resource-manager] Add sensitivityLabels.json to readme.md…
AutorestCI Nov 24, 2018
77c79fc
Generated from 9d8ee581a6a578917bf10678c5d69d7e08d57c7f (#4059)
AutorestCI Dec 13, 2018
7d7b327
[AutoPR sql/resource-manager] Add ManagedServerSecurityAlertPolicy an…
AutorestCI Dec 13, 2018
3938e14
[AutoPR sql/resource-manager] typo: sql/resource-manager/Microsoft.Sq…
AutorestCI Dec 13, 2018
565455e
Generated from d82d1491879729cdf44da9a664e815112acde158 (#4163)
AutorestCI Jan 11, 2019
202afff
[AutoPR sql/resource-manager] Added support for dropped databases on …
AutorestCI Jan 18, 2019
f605299
[AutoPR sql/resource-manager] Managed Instance GeoRestore Cmds (#4135)
AutorestCI Jan 22, 2019
0f09818
[AutoPR sql/resource-manager] Update managedInstances.json (#4267)
AutorestCI Jan 30, 2019
f6ef20b
[AutoPR sql/resource-manager] Updating Data Classification Swaggers. …
AutorestCI Feb 6, 2019
8924f99
[AutoPR sql/resource-manager] Updated managed instance swagger and ex…
AutorestCI Feb 8, 2019
73323d3
Generated from 8ac3ee015780aeac53d6a812e2abe5f6911a7b4c (#4380)
AutorestCI Feb 22, 2019
4bab3ff
Generated from a03ebb5e6ea5c7aa1585f40be78db1703c328084 (#4424)
AutorestCI Feb 28, 2019
6b8994d
[AutoPR sql/resource-manager] typo: Winodws -> Windows (#4482)
AutorestCI Mar 6, 2019
bdd3196
Packaging update of azure-mgmt-sql
azuresdkci Mar 6, 2019
093fff6
Merge branch 'master' into restapi_auto_sql/resource-manager
iscai-msft Mar 28, 2019
cd0b21c
Rebuild by https://github.com/Azure/azure-sdk-for-python/pull/3769
AutorestCI Mar 28, 2019
e7e8175
updated versioning and change log
iscai-msft Mar 28, 2019
3f939d6
Merge branch 'restapi_auto_sql/resource-manager' of github.com:Azure/…
iscai-msft Mar 28, 2019
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
1 change: 1 addition & 0 deletions azure-mgmt-sql/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
recursive-include tests *.py *.yaml
include *.rst
include azure/__init__.py
include azure/mgmt/__init__.py
Expand Down
22 changes: 3 additions & 19 deletions azure-mgmt-sql/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be manually updated?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope :)

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
=====

Expand All @@ -47,3 +28,6 @@ Provide Feedback
If you encounter any bugs or have suggestions, please file an issue in the
`Issues <https://github.com/Azure/azure-sdk-for-python/issues>`__
section of the project.


.. image:: https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-sql%2FREADME.png
43 changes: 43 additions & 0 deletions azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
from .sync_group_py3 import SyncGroup
from .sync_member_py3 import SyncMember
from .subscription_usage_py3 import SubscriptionUsage
from .virtual_cluster_py3 import VirtualCluster
from .virtual_cluster_update_py3 import VirtualClusterUpdate
from .virtual_network_rule_py3 import VirtualNetworkRule
from .extended_database_blob_auditing_policy_py3 import ExtendedDatabaseBlobAuditingPolicy
from .extended_server_blob_auditing_policy_py3 import ExtendedServerBlobAuditingPolicy
Expand Down Expand Up @@ -113,8 +115,12 @@
from .server_dns_alias_py3 import ServerDnsAlias
from .server_dns_alias_acquisition_py3 import ServerDnsAliasAcquisition
from .server_security_alert_policy_py3 import ServerSecurityAlertPolicy
from .restorable_dropped_managed_database_py3 import RestorableDroppedManagedDatabase
from .restore_point_py3 import RestorePoint
from .create_database_restore_point_definition_py3 import CreateDatabaseRestorePointDefinition
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 .database_operation_py3 import DatabaseOperation
from .elastic_pool_operation_py3 import ElasticPoolOperation
from .max_size_capability_py3 import MaxSizeCapability
Expand Down Expand Up @@ -152,6 +158,9 @@
from .tde_certificate_py3 import TdeCertificate
from .managed_instance_key_py3 import ManagedInstanceKey
from .managed_instance_encryption_protector_py3 import ManagedInstanceEncryptionProtector
from .recoverable_managed_database_py3 import RecoverableManagedDatabase
from .managed_instance_vulnerability_assessment_py3 import ManagedInstanceVulnerabilityAssessment
from .server_vulnerability_assessment_py3 import ServerVulnerabilityAssessment
except (SyntaxError, ImportError):
from .recoverable_database import RecoverableDatabase
from .restorable_dropped_database import RestorableDroppedDatabase
Expand Down Expand Up @@ -222,6 +231,8 @@
from .sync_group import SyncGroup
from .sync_member import SyncMember
from .subscription_usage import SubscriptionUsage
from .virtual_cluster import VirtualCluster
from .virtual_cluster_update import VirtualClusterUpdate
from .virtual_network_rule import VirtualNetworkRule
from .extended_database_blob_auditing_policy import ExtendedDatabaseBlobAuditingPolicy
from .extended_server_blob_auditing_policy import ExtendedServerBlobAuditingPolicy
Expand Down Expand Up @@ -256,8 +267,12 @@
from .server_dns_alias import ServerDnsAlias
from .server_dns_alias_acquisition import ServerDnsAliasAcquisition
from .server_security_alert_policy import ServerSecurityAlertPolicy
from .restorable_dropped_managed_database import RestorableDroppedManagedDatabase
from .restore_point import RestorePoint
from .create_database_restore_point_definition import CreateDatabaseRestorePointDefinition
from .managed_database_security_alert_policy import ManagedDatabaseSecurityAlertPolicy
from .managed_server_security_alert_policy import ManagedServerSecurityAlertPolicy
from .sensitivity_label import SensitivityLabel
from .database_operation import DatabaseOperation
from .elastic_pool_operation import ElasticPoolOperation
from .max_size_capability import MaxSizeCapability
Expand Down Expand Up @@ -295,6 +310,9 @@
from .tde_certificate import TdeCertificate
from .managed_instance_key import ManagedInstanceKey
from .managed_instance_encryption_protector import ManagedInstanceEncryptionProtector
from .recoverable_managed_database import RecoverableManagedDatabase
from .managed_instance_vulnerability_assessment import ManagedInstanceVulnerabilityAssessment
from .server_vulnerability_assessment import ServerVulnerabilityAssessment
from .recoverable_database_paged import RecoverableDatabasePaged
from .restorable_dropped_database_paged import RestorableDroppedDatabasePaged
from .server_paged import ServerPaged
Expand Down Expand Up @@ -330,6 +348,7 @@
from .sync_group_paged import SyncGroupPaged
from .sync_member_paged import SyncMemberPaged
from .subscription_usage_paged import SubscriptionUsagePaged
from .virtual_cluster_paged import VirtualClusterPaged
from .virtual_network_rule_paged import VirtualNetworkRulePaged
from .database_vulnerability_assessment_paged import DatabaseVulnerabilityAssessmentPaged
from .job_agent_paged import JobAgentPaged
Expand All @@ -343,14 +362,19 @@
from .managed_backup_short_term_retention_policy_paged import ManagedBackupShortTermRetentionPolicyPaged
from .managed_database_paged import ManagedDatabasePaged
from .server_dns_alias_paged import ServerDnsAliasPaged
from .restorable_dropped_managed_database_paged import RestorableDroppedManagedDatabasePaged
from .restore_point_paged import RestorePointPaged
from .sensitivity_label_paged import SensitivityLabelPaged
from .database_operation_paged import DatabaseOperationPaged
from .elastic_pool_operation_paged import ElasticPoolOperationPaged
from .vulnerability_assessment_scan_record_paged import VulnerabilityAssessmentScanRecordPaged
from .instance_failover_group_paged import InstanceFailoverGroupPaged
from .backup_short_term_retention_policy_paged import BackupShortTermRetentionPolicyPaged
from .managed_instance_key_paged import ManagedInstanceKeyPaged
from .managed_instance_encryption_protector_paged import ManagedInstanceEncryptionProtectorPaged
from .recoverable_managed_database_paged import RecoverableManagedDatabasePaged
from .managed_instance_vulnerability_assessment_paged import ManagedInstanceVulnerabilityAssessmentPaged
from .server_vulnerability_assessment_paged import ServerVulnerabilityAssessmentPaged
from .sql_management_client_enums import (
CheckNameAvailabilityReason,
ServerConnectionType,
Expand Down Expand Up @@ -385,6 +409,7 @@
ReadOnlyEndpointFailoverPolicy,
FailoverGroupReplicationRole,
IdentityType,
ManagedInstanceProxyOverride,
OperationOrigin,
SyncAgentState,
SyncMemberDbType,
Expand Down Expand Up @@ -427,6 +452,7 @@
InstanceFailoverGroupReplicationRole,
LongTermRetentionDatabaseState,
VulnerabilityAssessmentPolicyBaselineName,
SensitivityLabelSource,
CapabilityGroup,
)

Expand Down Expand Up @@ -500,6 +526,8 @@
'SyncGroup',
'SyncMember',
'SubscriptionUsage',
'VirtualCluster',
'VirtualClusterUpdate',
'VirtualNetworkRule',
'ExtendedDatabaseBlobAuditingPolicy',
'ExtendedServerBlobAuditingPolicy',
Expand Down Expand Up @@ -534,8 +562,12 @@
'ServerDnsAlias',
'ServerDnsAliasAcquisition',
'ServerSecurityAlertPolicy',
'RestorableDroppedManagedDatabase',
'RestorePoint',
'CreateDatabaseRestorePointDefinition',
'ManagedDatabaseSecurityAlertPolicy',
'ManagedServerSecurityAlertPolicy',
'SensitivityLabel',
'DatabaseOperation',
'ElasticPoolOperation',
'MaxSizeCapability',
Expand Down Expand Up @@ -573,6 +605,9 @@
'TdeCertificate',
'ManagedInstanceKey',
'ManagedInstanceEncryptionProtector',
'RecoverableManagedDatabase',
'ManagedInstanceVulnerabilityAssessment',
'ServerVulnerabilityAssessment',
'RecoverableDatabasePaged',
'RestorableDroppedDatabasePaged',
'ServerPaged',
Expand Down Expand Up @@ -608,6 +643,7 @@
'SyncGroupPaged',
'SyncMemberPaged',
'SubscriptionUsagePaged',
'VirtualClusterPaged',
'VirtualNetworkRulePaged',
'DatabaseVulnerabilityAssessmentPaged',
'JobAgentPaged',
Expand All @@ -621,14 +657,19 @@
'ManagedBackupShortTermRetentionPolicyPaged',
'ManagedDatabasePaged',
'ServerDnsAliasPaged',
'RestorableDroppedManagedDatabasePaged',
'RestorePointPaged',
'SensitivityLabelPaged',
'DatabaseOperationPaged',
'ElasticPoolOperationPaged',
'VulnerabilityAssessmentScanRecordPaged',
'InstanceFailoverGroupPaged',
'BackupShortTermRetentionPolicyPaged',
'ManagedInstanceKeyPaged',
'ManagedInstanceEncryptionProtectorPaged',
'RecoverableManagedDatabasePaged',
'ManagedInstanceVulnerabilityAssessmentPaged',
'ServerVulnerabilityAssessmentPaged',
'CheckNameAvailabilityReason',
'ServerConnectionType',
'SecurityAlertPolicyState',
Expand Down Expand Up @@ -662,6 +703,7 @@
'ReadOnlyEndpointFailoverPolicy',
'FailoverGroupReplicationRole',
'IdentityType',
'ManagedInstanceProxyOverride',
'OperationOrigin',
'SyncAgentState',
'SyncMemberDbType',
Expand Down Expand Up @@ -704,5 +746,6 @@
'InstanceFailoverGroupReplicationRole',
'LongTermRetentionDatabaseState',
'VulnerabilityAssessmentPolicyBaselineName',
'SensitivityLabelSource',
'CapabilityGroup',
]
2 changes: 1 addition & 1 deletion azure-mgmt-sql/azure/mgmt/sql/models/job_schedule.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JobSchedule(Model):
:param enabled: Whether or not the schedule is enabled.
:type enabled: bool
:param interval: Value of the schedule's recurring interval, if the
scheduletype is recurring. ISO8601 duration format.
schedule type is recurring. ISO8601 duration format.
:type interval: str
"""

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-sql/azure/mgmt/sql/models/job_schedule_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JobSchedule(Model):
:param enabled: Whether or not the schedule is enabled.
:type enabled: bool
:param interval: Value of the schedule's recurring interval, if the
scheduletype is recurring. ISO8601 duration format.
schedule type is recurring. ISO8601 duration format.
:type interval: str
"""

Expand Down
21 changes: 17 additions & 4 deletions azure-mgmt-sql/azure/mgmt/sql/models/managed_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class ManagedDatabase(TrackedResource):
:type tags: dict[str, str]
:param collation: Collation of the managed database.
:type collation: str
:ivar status: Status for the database. Possible values include: 'Online',
'Offline', 'Shutdown', 'Creating', 'Inaccessible'
:ivar status: Status of the database. Possible values include: 'Online',
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'
:vartype status: str or ~azure.mgmt.sql.models.ManagedDatabaseStatus
:ivar creation_date: Creation date of the database.
:vartype creation_date: datetime
Expand All @@ -56,8 +56,11 @@ class ManagedDatabase(TrackedResource):
database. SourceDatabaseName, SourceManagedInstanceName and PointInTime
must be specified. RestoreExternalBackup: Create a database by restoring
from external backup files. Collation, StorageContainerUri and
StorageContainerSasToken must be specified. Possible values include:
'Default', 'RestoreExternalBackup', 'PointInTimeRestore'
StorageContainerSasToken must be specified. Recovery: Creates a database
by restoring a geo-replicated backup. RecoverableDatabaseId must be
specified as the recoverable database resource ID to restore. Possible
values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore',
'Recovery'
:type create_mode: str or ~azure.mgmt.sql.models.ManagedDatabaseCreateMode
:param storage_container_uri: Conditional. If createMode is
RestoreExternalBackup, this value is required. Specifies the uri of the
Expand All @@ -66,13 +69,19 @@ class ManagedDatabase(TrackedResource):
:param source_database_id: The resource identifier of the source database
associated with create operation of this database.
:type source_database_id: str
:param restorable_dropped_database_id: The restorable dropped database
resource id to restore when creating this database.
:type restorable_dropped_database_id: str
:param storage_container_sas_token: Conditional. If createMode is
RestoreExternalBackup, this value is required. Specifies the storage
container sas token.
:type storage_container_sas_token: str
:ivar failover_group_id: Instance Failover Group resource identifier that
this managed database belongs to.
:vartype failover_group_id: str
:param recoverable_database_id: The resource identifier of the recoverable
database associated with create operation of this database.
:type recoverable_database_id: str
"""

_validation = {
Expand Down Expand Up @@ -103,8 +112,10 @@ class ManagedDatabase(TrackedResource):
'create_mode': {'key': 'properties.createMode', 'type': 'str'},
'storage_container_uri': {'key': 'properties.storageContainerUri', 'type': 'str'},
'source_database_id': {'key': 'properties.sourceDatabaseId', 'type': 'str'},
'restorable_dropped_database_id': {'key': 'properties.restorableDroppedDatabaseId', 'type': 'str'},
'storage_container_sas_token': {'key': 'properties.storageContainerSasToken', 'type': 'str'},
'failover_group_id': {'key': 'properties.failoverGroupId', 'type': 'str'},
'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand All @@ -119,5 +130,7 @@ def __init__(self, **kwargs):
self.create_mode = kwargs.get('create_mode', None)
self.storage_container_uri = kwargs.get('storage_container_uri', None)
self.source_database_id = kwargs.get('source_database_id', None)
self.restorable_dropped_database_id = kwargs.get('restorable_dropped_database_id', None)
self.storage_container_sas_token = kwargs.get('storage_container_sas_token', None)
self.failover_group_id = None
self.recoverable_database_id = kwargs.get('recoverable_database_id', None)
23 changes: 18 additions & 5 deletions azure-mgmt-sql/azure/mgmt/sql/models/managed_database_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class ManagedDatabase(TrackedResource):
:type tags: dict[str, str]
:param collation: Collation of the managed database.
:type collation: str
:ivar status: Status for the database. Possible values include: 'Online',
'Offline', 'Shutdown', 'Creating', 'Inaccessible'
:ivar status: Status of the database. Possible values include: 'Online',
'Offline', 'Shutdown', 'Creating', 'Inaccessible', 'Updating'
:vartype status: str or ~azure.mgmt.sql.models.ManagedDatabaseStatus
:ivar creation_date: Creation date of the database.
:vartype creation_date: datetime
Expand All @@ -56,8 +56,11 @@ class ManagedDatabase(TrackedResource):
database. SourceDatabaseName, SourceManagedInstanceName and PointInTime
must be specified. RestoreExternalBackup: Create a database by restoring
from external backup files. Collation, StorageContainerUri and
StorageContainerSasToken must be specified. Possible values include:
'Default', 'RestoreExternalBackup', 'PointInTimeRestore'
StorageContainerSasToken must be specified. Recovery: Creates a database
by restoring a geo-replicated backup. RecoverableDatabaseId must be
specified as the recoverable database resource ID to restore. Possible
values include: 'Default', 'RestoreExternalBackup', 'PointInTimeRestore',
'Recovery'
:type create_mode: str or ~azure.mgmt.sql.models.ManagedDatabaseCreateMode
:param storage_container_uri: Conditional. If createMode is
RestoreExternalBackup, this value is required. Specifies the uri of the
Expand All @@ -66,13 +69,19 @@ class ManagedDatabase(TrackedResource):
:param source_database_id: The resource identifier of the source database
associated with create operation of this database.
:type source_database_id: str
:param restorable_dropped_database_id: The restorable dropped database
resource id to restore when creating this database.
:type restorable_dropped_database_id: str
:param storage_container_sas_token: Conditional. If createMode is
RestoreExternalBackup, this value is required. Specifies the storage
container sas token.
:type storage_container_sas_token: str
:ivar failover_group_id: Instance Failover Group resource identifier that
this managed database belongs to.
:vartype failover_group_id: str
:param recoverable_database_id: The resource identifier of the recoverable
database associated with create operation of this database.
:type recoverable_database_id: str
"""

_validation = {
Expand Down Expand Up @@ -103,11 +112,13 @@ class ManagedDatabase(TrackedResource):
'create_mode': {'key': 'properties.createMode', 'type': 'str'},
'storage_container_uri': {'key': 'properties.storageContainerUri', 'type': 'str'},
'source_database_id': {'key': 'properties.sourceDatabaseId', 'type': 'str'},
'restorable_dropped_database_id': {'key': 'properties.restorableDroppedDatabaseId', 'type': 'str'},
'storage_container_sas_token': {'key': 'properties.storageContainerSasToken', 'type': 'str'},
'failover_group_id': {'key': 'properties.failoverGroupId', 'type': 'str'},
'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
}

def __init__(self, *, location: str, tags=None, collation: str=None, restore_point_in_time=None, catalog_collation=None, create_mode=None, storage_container_uri: str=None, source_database_id: str=None, storage_container_sas_token: str=None, **kwargs) -> None:
def __init__(self, *, location: str, tags=None, collation: str=None, restore_point_in_time=None, catalog_collation=None, create_mode=None, storage_container_uri: str=None, source_database_id: str=None, restorable_dropped_database_id: str=None, storage_container_sas_token: str=None, recoverable_database_id: str=None, **kwargs) -> None:
super(ManagedDatabase, self).__init__(location=location, tags=tags, **kwargs)
self.collation = collation
self.status = None
Expand All @@ -119,5 +130,7 @@ def __init__(self, *, location: str, tags=None, collation: str=None, restore_poi
self.create_mode = create_mode
self.storage_container_uri = storage_container_uri
self.source_database_id = source_database_id
self.restorable_dropped_database_id = restorable_dropped_database_id
self.storage_container_sas_token = storage_container_sas_token
self.failover_group_id = None
self.recoverable_database_id = recoverable_database_id
Loading