[AutoPR mysql/resource-manager/postgresql/resource-manager] [Don't Merge, Service rollout ~March/1/18 ] Swagger for new API changes 2017-12-01

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/__init__.py

@@ -12,16 +12,15 @@
 try:
     from .proxy_resource_py3 import ProxyResource
     from .tracked_resource_py3 import TrackedResource
-    from .storage_profile_py3 import StorageProfile
     from .server_properties_for_create_py3 import ServerPropertiesForCreate
     from .server_properties_for_default_create_py3 import ServerPropertiesForDefaultCreate
     from .server_properties_for_restore_py3 import ServerPropertiesForRestore
-    from .server_properties_for_geo_restore_py3 import ServerPropertiesForGeoRestore
     from .sku_py3 import Sku
     from .server_py3 import Server
     from .server_for_create_py3 import ServerForCreate
     from .server_update_parameters_py3 import ServerUpdateParameters
     from .firewall_rule_py3 import FirewallRule
+    from .virtual_network_rule_py3 import VirtualNetworkRule
     from .database_py3 import Database
     from .configuration_py3 import Configuration
     from .operation_display_py3 import OperationDisplay
@@ -35,16 +34,15 @@
 except (SyntaxError, ImportError):
     from .proxy_resource import ProxyResource
     from .tracked_resource import TrackedResource
-    from .storage_profile import StorageProfile
     from .server_properties_for_create import ServerPropertiesForCreate
     from .server_properties_for_default_create import ServerPropertiesForDefaultCreate
     from .server_properties_for_restore import ServerPropertiesForRestore
-    from .server_properties_for_geo_restore import ServerPropertiesForGeoRestore
     from .sku import Sku
     from .server import Server
     from .server_for_create import ServerForCreate
     from .server_update_parameters import ServerUpdateParameters
     from .firewall_rule import FirewallRule
+    from .virtual_network_rule import VirtualNetworkRule
     from .database import Database
     from .configuration import Configuration
     from .operation_display import OperationDisplay
@@ -57,6 +55,7 @@
     from .name_availability import NameAvailability
 from .server_paged import ServerPaged
 from .firewall_rule_paged import FirewallRulePaged
+from .virtual_network_rule_paged import VirtualNetworkRulePaged
 from .database_paged import DatabasePaged
 from .configuration_paged import ConfigurationPaged
 from .log_file_paged import LogFilePaged
@@ -65,24 +64,23 @@
     ServerVersion,
     SslEnforcementEnum,
     ServerState,
-    GeoRedundantBackup,
     SkuTier,
+    VirtualNetworkRuleState,
     OperationOrigin,
 )
 
 __all__ = [
     'ProxyResource',
     'TrackedResource',
-    'StorageProfile',
     'ServerPropertiesForCreate',
     'ServerPropertiesForDefaultCreate',
     'ServerPropertiesForRestore',
-    'ServerPropertiesForGeoRestore',
     'Sku',
     'Server',
     'ServerForCreate',
     'ServerUpdateParameters',
     'FirewallRule',
+    'VirtualNetworkRule',
     'Database',
     'Configuration',
     'OperationDisplay',
@@ -95,14 +93,15 @@
     'NameAvailability',
     'ServerPaged',
     'FirewallRulePaged',
+    'VirtualNetworkRulePaged',
     'DatabasePaged',
     'ConfigurationPaged',
     'LogFilePaged',
     'PerformanceTierPropertiesPaged',
     'ServerVersion',
     'SslEnforcementEnum',
     'ServerState',
-    'GeoRedundantBackup',
     'SkuTier',
+    'VirtualNetworkRuleState',
     'OperationOrigin',
 ]

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/log_file.py

@@ -24,12 +24,14 @@ class LogFile(ProxyResource):
     :vartype name: str
     :ivar type: Resource type.
     :vartype type: str
+    :param log_file_name: Log file name.
+    :type log_file_name: str
     :param size_in_kb: Size of the log file.
     :type size_in_kb: long
-    :ivar created_time: Creation timestamp of the log file.
-    :vartype created_time: datetime
-    :ivar last_modified_time: Last modified timestamp of the log file.
-    :vartype last_modified_time: datetime
+    :param created_time: Creation timestamp of the log file.
+    :type created_time: datetime
+    :param last_modified_time: Last modified timestamp of the log file.
+    :type last_modified_time: datetime
     :param log_file_type: Type of the log file.
     :type log_file_type: str
     :param url: The url to download the log file from.
@@ -40,14 +42,13 @@ class LogFile(ProxyResource):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'created_time': {'readonly': True},
-        'last_modified_time': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'log_file_name': {'key': 'properties.name', 'type': 'str'},
         'size_in_kb': {'key': 'properties.sizeInKB', 'type': 'long'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
@@ -57,8 +58,9 @@ class LogFile(ProxyResource):
 
     def __init__(self, **kwargs):
         super(LogFile, self).__init__(**kwargs)
+        self.log_file_name = kwargs.get('log_file_name', None)
         self.size_in_kb = kwargs.get('size_in_kb', None)
-        self.created_time = None
-        self.last_modified_time = None
+        self.created_time = kwargs.get('created_time', None)
+        self.last_modified_time = kwargs.get('last_modified_time', None)
         self.log_file_type = kwargs.get('log_file_type', None)
         self.url = kwargs.get('url', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/log_file_py3.py

@@ -24,12 +24,14 @@ class LogFile(ProxyResource):
     :vartype name: str
     :ivar type: Resource type.
     :vartype type: str
+    :param log_file_name: Log file name.
+    :type log_file_name: str
     :param size_in_kb: Size of the log file.
     :type size_in_kb: long
-    :ivar created_time: Creation timestamp of the log file.
-    :vartype created_time: datetime
-    :ivar last_modified_time: Last modified timestamp of the log file.
-    :vartype last_modified_time: datetime
+    :param created_time: Creation timestamp of the log file.
+    :type created_time: datetime
+    :param last_modified_time: Last modified timestamp of the log file.
+    :type last_modified_time: datetime
     :param log_file_type: Type of the log file.
     :type log_file_type: str
     :param url: The url to download the log file from.
@@ -40,25 +42,25 @@ class LogFile(ProxyResource):
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'created_time': {'readonly': True},
-        'last_modified_time': {'readonly': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'log_file_name': {'key': 'properties.name', 'type': 'str'},
         'size_in_kb': {'key': 'properties.sizeInKB', 'type': 'long'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
         'log_file_type': {'key': 'properties.type', 'type': 'str'},
         'url': {'key': 'properties.url', 'type': 'str'},
     }
 
-    def __init__(self, *, size_in_kb: int=None, log_file_type: str=None, url: str=None, **kwargs) -> None:
+    def __init__(self, *, log_file_name: str=None, size_in_kb: int=None, created_time=None, last_modified_time=None, log_file_type: str=None, url: str=None, **kwargs) -> None:
         super(LogFile, self).__init__(, **kwargs)
+        self.log_file_name = log_file_name
         self.size_in_kb = size_in_kb
-        self.created_time = None
-        self.last_modified_time = None
+        self.created_time = created_time
+        self.last_modified_time = last_modified_time
         self.log_file_type = log_file_type
         self.url = url

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/my_sql_management_client_enums.py

@@ -31,17 +31,19 @@ class ServerState(str, Enum):
     disabled = "Disabled"
 
 
-class GeoRedundantBackup(str, Enum):
+class SkuTier(str, Enum):
 
-    enabled = "Enabled"
-    disabled = "Disabled"
+    basic = "Basic"
+    standard = "Standard"
 
 
-class SkuTier(str, Enum):
+class VirtualNetworkRuleState(str, Enum):
 
-    basic = "Basic"
-    general_purpose = "GeneralPurpose"
-    memory_optimized = "MemoryOptimized"
+    initializing = "Initializing"
+    in_progress = "InProgress"
+    ready = "Ready"
+    deleting = "Deleting"
+    unknown = "Unknown"
 
 
 class OperationOrigin(str, Enum):

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/performance_tier_properties.py

@@ -17,6 +17,9 @@ class PerformanceTierProperties(Model):
 
     :param id: ID of the performance tier.
     :type id: str
+    :param backup_retention_days: Backup retention in days for the performance
+     tier edition
+    :type backup_retention_days: int
     :param service_level_objectives: Service level objectives associated with
      the performance tier
     :type service_level_objectives:
@@ -25,10 +28,12 @@ class PerformanceTierProperties(Model):
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
+        'backup_retention_days': {'key': 'backupRetentionDays', 'type': 'int'},
         'service_level_objectives': {'key': 'serviceLevelObjectives', 'type': '[PerformanceTierServiceLevelObjectives]'},
     }
 
     def __init__(self, **kwargs):
         super(PerformanceTierProperties, self).__init__(**kwargs)
         self.id = kwargs.get('id', None)
+        self.backup_retention_days = kwargs.get('backup_retention_days', None)
         self.service_level_objectives = kwargs.get('service_level_objectives', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/performance_tier_properties_py3.py

@@ -17,6 +17,9 @@ class PerformanceTierProperties(Model):
 
     :param id: ID of the performance tier.
     :type id: str
+    :param backup_retention_days: Backup retention in days for the performance
+     tier edition
+    :type backup_retention_days: int
     :param service_level_objectives: Service level objectives associated with
      the performance tier
     :type service_level_objectives:
@@ -25,10 +28,12 @@ class PerformanceTierProperties(Model):
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
+        'backup_retention_days': {'key': 'backupRetentionDays', 'type': 'int'},
         'service_level_objectives': {'key': 'serviceLevelObjectives', 'type': '[PerformanceTierServiceLevelObjectives]'},
     }
 
-    def __init__(self, *, id: str=None, service_level_objectives=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, backup_retention_days: int=None, service_level_objectives=None, **kwargs) -> None:
         super(PerformanceTierProperties, self).__init__(**kwargs)
         self.id = id
+        self.backup_retention_days = backup_retention_days
         self.service_level_objectives = service_level_objectives

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/performance_tier_service_level_objectives.py

@@ -19,41 +19,24 @@ class PerformanceTierServiceLevelObjectives(Model):
     :type id: str
     :param edition: Edition of the performance tier.
     :type edition: str
-    :param v_core: vCore associated with the service level objective
-    :type v_core: int
-    :param hardware_generation: Hardware generation associated with the
-     service level objective
-    :type hardware_generation: str
-    :param max_backup_retention_days: Maximum Backup retention in days for the
-     performance tier edition
-    :type max_backup_retention_days: int
-    :param min_backup_retention_days: Minimum Backup retention in days for the
-     performance tier edition
-    :type min_backup_retention_days: int
-    :param max_storage_mb: Max storage allowed for a server.
-    :type max_storage_mb: int
-    :param min_storage_mb: Max storage allowed for a server.
-    :type min_storage_mb: int
+    :param dtu: Database throughput unit associated with the service level
+     objective
+    :type dtu: int
+    :param storage_mb: Maximum storage in MB associated with the service level
+     objective
+    :type storage_mb: int
     """
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'edition': {'key': 'edition', 'type': 'str'},
-        'v_core': {'key': 'vCore', 'type': 'int'},
-        'hardware_generation': {'key': 'hardwareGeneration', 'type': 'str'},
-        'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
-        'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
-        'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
-        'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
+        'dtu': {'key': 'dtu', 'type': 'int'},
+        'storage_mb': {'key': 'storageMB', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(PerformanceTierServiceLevelObjectives, self).__init__(**kwargs)
         self.id = kwargs.get('id', None)
         self.edition = kwargs.get('edition', None)
-        self.v_core = kwargs.get('v_core', None)
-        self.hardware_generation = kwargs.get('hardware_generation', None)
-        self.max_backup_retention_days = kwargs.get('max_backup_retention_days', None)
-        self.min_backup_retention_days = kwargs.get('min_backup_retention_days', None)
-        self.max_storage_mb = kwargs.get('max_storage_mb', None)
-        self.min_storage_mb = kwargs.get('min_storage_mb', None)
+        self.dtu = kwargs.get('dtu', None)
+        self.storage_mb = kwargs.get('storage_mb', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/mysql/models/performance_tier_service_level_objectives_py3.py

@@ -19,41 +19,24 @@ class PerformanceTierServiceLevelObjectives(Model):
     :type id: str
     :param edition: Edition of the performance tier.
     :type edition: str
-    :param v_core: vCore associated with the service level objective
-    :type v_core: int
-    :param hardware_generation: Hardware generation associated with the
-     service level objective
-    :type hardware_generation: str
-    :param max_backup_retention_days: Maximum Backup retention in days for the
-     performance tier edition
-    :type max_backup_retention_days: int
-    :param min_backup_retention_days: Minimum Backup retention in days for the
-     performance tier edition
-    :type min_backup_retention_days: int
-    :param max_storage_mb: Max storage allowed for a server.
-    :type max_storage_mb: int
-    :param min_storage_mb: Max storage allowed for a server.
-    :type min_storage_mb: int
+    :param dtu: Database throughput unit associated with the service level
+     objective
+    :type dtu: int
+    :param storage_mb: Maximum storage in MB associated with the service level
+     objective
+    :type storage_mb: int
     """
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'edition': {'key': 'edition', 'type': 'str'},
-        'v_core': {'key': 'vCore', 'type': 'int'},
-        'hardware_generation': {'key': 'hardwareGeneration', 'type': 'str'},
-        'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
-        'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
-        'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
-        'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
+        'dtu': {'key': 'dtu', 'type': 'int'},
+        'storage_mb': {'key': 'storageMB', 'type': 'int'},
     }
 
-    def __init__(self, *, id: str=None, edition: str=None, v_core: int=None, hardware_generation: str=None, max_backup_retention_days: int=None, min_backup_retention_days: int=None, max_storage_mb: int=None, min_storage_mb: int=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, edition: str=None, dtu: int=None, storage_mb: int=None, **kwargs) -> None:
         super(PerformanceTierServiceLevelObjectives, self).__init__(**kwargs)
         self.id = id
         self.edition = edition
-        self.v_core = v_core
-        self.hardware_generation = hardware_generation
-        self.max_backup_retention_days = max_backup_retention_days
-        self.min_backup_retention_days = min_backup_retention_days
-        self.max_storage_mb = max_storage_mb
-        self.min_storage_mb = min_storage_mb
+        self.dtu = dtu
+        self.storage_mb = storage_mb