diff --git a/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py b/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py index f23f08c6348d..50f6c718333d 100644 --- a/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py +++ b/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py @@ -36,8 +36,6 @@ from .transparent_data_encryption_activity import TransparentDataEncryptionActivity from .elastic_pool_database_activity import ElasticPoolDatabaseActivity from .elastic_pool_activity import ElasticPoolActivity -from .recommended_elastic_pool_metric import RecommendedElasticPoolMetric -from .recommended_elastic_pool import RecommendedElasticPool from .database_security_alert_policy import DatabaseSecurityAlertPolicy from .data_masking_policy import DataMaskingPolicy from .data_masking_rule import DataMaskingRule @@ -54,6 +52,8 @@ from .metric import Metric from .metric_availability import MetricAvailability from .metric_definition import MetricDefinition +from .recommended_elastic_pool_metric import RecommendedElasticPoolMetric +from .recommended_elastic_pool import RecommendedElasticPool from .replication_link import ReplicationLink from .server_azure_ad_administrator import ServerAzureADAdministrator from .server_communication_link import ServerCommunicationLink @@ -111,14 +111,14 @@ from .elastic_pool_paged import ElasticPoolPaged from .firewall_rule_paged import FirewallRulePaged from .geo_backup_policy_paged import GeoBackupPolicyPaged +from .recommended_elastic_pool_paged import RecommendedElasticPoolPaged +from .recommended_elastic_pool_metric_paged import RecommendedElasticPoolMetricPaged from .replication_link_paged import ReplicationLinkPaged from .server_azure_ad_administrator_paged import ServerAzureADAdministratorPaged from .server_communication_link_paged import ServerCommunicationLinkPaged from .service_objective_paged import ServiceObjectivePaged from .elastic_pool_activity_paged import ElasticPoolActivityPaged from .elastic_pool_database_activity_paged import ElasticPoolDatabaseActivityPaged -from .recommended_elastic_pool_paged import RecommendedElasticPoolPaged -from .recommended_elastic_pool_metric_paged import RecommendedElasticPoolMetricPaged from .service_tier_advisor_paged import ServiceTierAdvisorPaged from .transparent_data_encryption_activity_paged import TransparentDataEncryptionActivityPaged from .server_usage_paged import ServerUsagePaged @@ -157,7 +157,6 @@ ReadScale, SampleName, TransparentDataEncryptionActivityStatus, - ElasticPoolEdition, SecurityAlertPolicyState, SecurityAlertPolicyEmailAccountAdmins, SecurityAlertPolicyUseServerDefault, @@ -165,6 +164,7 @@ DataMaskingRuleState, DataMaskingFunction, ElasticPoolState, + ElasticPoolEdition, GeoBackupPolicyState, StorageKeyType, AuthenticationType, @@ -196,7 +196,7 @@ AutomaticTuningServerReason, RestorePointType, ManagementOperationState, - DatabaseState, + LongTermRetentionDatabaseState, ) __all__ = [ @@ -227,8 +227,6 @@ 'TransparentDataEncryptionActivity', 'ElasticPoolDatabaseActivity', 'ElasticPoolActivity', - 'RecommendedElasticPoolMetric', - 'RecommendedElasticPool', 'DatabaseSecurityAlertPolicy', 'DataMaskingPolicy', 'DataMaskingRule', @@ -245,6 +243,8 @@ 'Metric', 'MetricAvailability', 'MetricDefinition', + 'RecommendedElasticPoolMetric', + 'RecommendedElasticPool', 'ReplicationLink', 'ServerAzureADAdministrator', 'ServerCommunicationLink', @@ -302,14 +302,14 @@ 'ElasticPoolPaged', 'FirewallRulePaged', 'GeoBackupPolicyPaged', + 'RecommendedElasticPoolPaged', + 'RecommendedElasticPoolMetricPaged', 'ReplicationLinkPaged', 'ServerAzureADAdministratorPaged', 'ServerCommunicationLinkPaged', 'ServiceObjectivePaged', 'ElasticPoolActivityPaged', 'ElasticPoolDatabaseActivityPaged', - 'RecommendedElasticPoolPaged', - 'RecommendedElasticPoolMetricPaged', 'ServiceTierAdvisorPaged', 'TransparentDataEncryptionActivityPaged', 'ServerUsagePaged', @@ -347,7 +347,6 @@ 'ReadScale', 'SampleName', 'TransparentDataEncryptionActivityStatus', - 'ElasticPoolEdition', 'SecurityAlertPolicyState', 'SecurityAlertPolicyEmailAccountAdmins', 'SecurityAlertPolicyUseServerDefault', @@ -355,6 +354,7 @@ 'DataMaskingRuleState', 'DataMaskingFunction', 'ElasticPoolState', + 'ElasticPoolEdition', 'GeoBackupPolicyState', 'StorageKeyType', 'AuthenticationType', @@ -386,5 +386,5 @@ 'AutomaticTuningServerReason', 'RestorePointType', 'ManagementOperationState', - 'DatabaseState', + 'LongTermRetentionDatabaseState', ] diff --git a/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py b/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py index 70d648eb69d9..09cdc0abcf82 100644 --- a/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py +++ b/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py @@ -195,13 +195,6 @@ class TransparentDataEncryptionActivityStatus(Enum): decrypting = "Decrypting" -class ElasticPoolEdition(Enum): - - basic = "Basic" - standard = "Standard" - premium = "Premium" - - class SecurityAlertPolicyState(Enum): new = "New" @@ -250,6 +243,13 @@ class ElasticPoolState(Enum): disabled = "Disabled" +class ElasticPoolEdition(Enum): + + basic = "Basic" + standard = "Standard" + premium = "Premium" + + class GeoBackupPolicyState(Enum): disabled = "Disabled" @@ -492,7 +492,7 @@ class ManagementOperationState(Enum): cancelled = "Cancelled" -class DatabaseState(Enum): +class LongTermRetentionDatabaseState(Enum): all = "All" live = "Live" diff --git a/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py b/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py index e73ee1288114..2438e9f52efd 100644 --- a/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py +++ b/azure-mgmt-sql/azure/mgmt/sql/operations/__init__.py @@ -21,13 +21,13 @@ from .elastic_pools_operations import ElasticPoolsOperations from .firewall_rules_operations import FirewallRulesOperations from .geo_backup_policies_operations import GeoBackupPoliciesOperations +from .recommended_elastic_pools_operations import RecommendedElasticPoolsOperations from .replication_links_operations import ReplicationLinksOperations from .server_azure_ad_administrators_operations import ServerAzureADAdministratorsOperations from .server_communication_links_operations import ServerCommunicationLinksOperations from .service_objectives_operations import ServiceObjectivesOperations from .elastic_pool_activities_operations import ElasticPoolActivitiesOperations from .elastic_pool_database_activities_operations import ElasticPoolDatabaseActivitiesOperations -from .recommended_elastic_pools_operations import RecommendedElasticPoolsOperations from .service_tier_advisors_operations import ServiceTierAdvisorsOperations from .transparent_data_encryptions_operations import TransparentDataEncryptionsOperations from .transparent_data_encryption_activities_operations import TransparentDataEncryptionActivitiesOperations @@ -65,13 +65,13 @@ 'ElasticPoolsOperations', 'FirewallRulesOperations', 'GeoBackupPoliciesOperations', + 'RecommendedElasticPoolsOperations', 'ReplicationLinksOperations', 'ServerAzureADAdministratorsOperations', 'ServerCommunicationLinksOperations', 'ServiceObjectivesOperations', 'ElasticPoolActivitiesOperations', 'ElasticPoolDatabaseActivitiesOperations', - 'RecommendedElasticPoolsOperations', 'ServiceTierAdvisorsOperations', 'TransparentDataEncryptionsOperations', 'TransparentDataEncryptionActivitiesOperations', diff --git a/azure-mgmt-sql/azure/mgmt/sql/operations/long_term_retention_backups_operations.py b/azure-mgmt-sql/azure/mgmt/sql/operations/long_term_retention_backups_operations.py index 93d77dbad5d2..d974038867ab 100644 --- a/azure-mgmt-sql/azure/mgmt/sql/operations/long_term_retention_backups_operations.py +++ b/azure-mgmt-sql/azure/mgmt/sql/operations/long_term_retention_backups_operations.py @@ -230,7 +230,8 @@ def list_by_database( :param database_state: Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted' - :type database_state: str or ~azure.mgmt.sql.models.DatabaseState + :type database_state: str or + ~azure.mgmt.sql.models.LongTermRetentionDatabaseState :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -311,7 +312,8 @@ def list_by_location( :param database_state: Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted' - :type database_state: str or ~azure.mgmt.sql.models.DatabaseState + :type database_state: str or + ~azure.mgmt.sql.models.LongTermRetentionDatabaseState :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -392,7 +394,8 @@ def list_by_server( :param database_state: Whether to query against just live databases, just deleted databases, or all databases. Possible values include: 'All', 'Live', 'Deleted' - :type database_state: str or ~azure.mgmt.sql.models.DatabaseState + :type database_state: str or + ~azure.mgmt.sql.models.LongTermRetentionDatabaseState :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response diff --git a/azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py b/azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py index f028e14bc51e..6bad4c7d6418 100644 --- a/azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py +++ b/azure-mgmt-sql/azure/mgmt/sql/sql_management_client.py @@ -25,13 +25,13 @@ from .operations.elastic_pools_operations import ElasticPoolsOperations from .operations.firewall_rules_operations import FirewallRulesOperations from .operations.geo_backup_policies_operations import GeoBackupPoliciesOperations +from .operations.recommended_elastic_pools_operations import RecommendedElasticPoolsOperations from .operations.replication_links_operations import ReplicationLinksOperations from .operations.server_azure_ad_administrators_operations import ServerAzureADAdministratorsOperations from .operations.server_communication_links_operations import ServerCommunicationLinksOperations from .operations.service_objectives_operations import ServiceObjectivesOperations from .operations.elastic_pool_activities_operations import ElasticPoolActivitiesOperations from .operations.elastic_pool_database_activities_operations import ElasticPoolDatabaseActivitiesOperations -from .operations.recommended_elastic_pools_operations import RecommendedElasticPoolsOperations from .operations.service_tier_advisors_operations import ServiceTierAdvisorsOperations from .operations.transparent_data_encryptions_operations import TransparentDataEncryptionsOperations from .operations.transparent_data_encryption_activities_operations import TransparentDataEncryptionActivitiesOperations @@ -121,6 +121,8 @@ class SqlManagementClient(object): :vartype firewall_rules: azure.mgmt.sql.operations.FirewallRulesOperations :ivar geo_backup_policies: GeoBackupPolicies operations :vartype geo_backup_policies: azure.mgmt.sql.operations.GeoBackupPoliciesOperations + :ivar recommended_elastic_pools: RecommendedElasticPools operations + :vartype recommended_elastic_pools: azure.mgmt.sql.operations.RecommendedElasticPoolsOperations :ivar replication_links: ReplicationLinks operations :vartype replication_links: azure.mgmt.sql.operations.ReplicationLinksOperations :ivar server_azure_ad_administrators: ServerAzureADAdministrators operations @@ -133,8 +135,6 @@ class SqlManagementClient(object): :vartype elastic_pool_activities: azure.mgmt.sql.operations.ElasticPoolActivitiesOperations :ivar elastic_pool_database_activities: ElasticPoolDatabaseActivities operations :vartype elastic_pool_database_activities: azure.mgmt.sql.operations.ElasticPoolDatabaseActivitiesOperations - :ivar recommended_elastic_pools: RecommendedElasticPools operations - :vartype recommended_elastic_pools: azure.mgmt.sql.operations.RecommendedElasticPoolsOperations :ivar service_tier_advisors: ServiceTierAdvisors operations :vartype service_tier_advisors: azure.mgmt.sql.operations.ServiceTierAdvisorsOperations :ivar transparent_data_encryptions: TransparentDataEncryptions operations @@ -225,6 +225,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.geo_backup_policies = GeoBackupPoliciesOperations( self._client, self.config, self._serialize, self._deserialize) + self.recommended_elastic_pools = RecommendedElasticPoolsOperations( + self._client, self.config, self._serialize, self._deserialize) self.replication_links = ReplicationLinksOperations( self._client, self.config, self._serialize, self._deserialize) self.server_azure_ad_administrators = ServerAzureADAdministratorsOperations( @@ -237,8 +239,6 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.elastic_pool_database_activities = ElasticPoolDatabaseActivitiesOperations( self._client, self.config, self._serialize, self._deserialize) - self.recommended_elastic_pools = RecommendedElasticPoolsOperations( - self._client, self.config, self._serialize, self._deserialize) self.service_tier_advisors = ServiceTierAdvisorsOperations( self._client, self.config, self._serialize, self._deserialize) self.transparent_data_encryptions = TransparentDataEncryptionsOperations(