[AutoPR postgresql/resource-manager] correct tier enum for postgres

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

@@ -9,27 +9,50 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-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 .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 .database import Database
-from .configuration import Configuration
-from .operation_display import OperationDisplay
-from .operation import Operation
-from .operation_list_result import OperationListResult
-from .log_file import LogFile
-from .performance_tier_service_level_objectives import PerformanceTierServiceLevelObjectives
-from .performance_tier_properties import PerformanceTierProperties
-from .name_availability_request import NameAvailabilityRequest
-from .name_availability import NameAvailability
+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 .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 .database_py3 import Database
+    from .configuration_py3 import Configuration
+    from .operation_display_py3 import OperationDisplay
+    from .operation_py3 import Operation
+    from .operation_list_result_py3 import OperationListResult
+    from .log_file_py3 import LogFile
+    from .performance_tier_service_level_objectives_py3 import PerformanceTierServiceLevelObjectives
+    from .performance_tier_properties_py3 import PerformanceTierProperties
+    from .name_availability_request_py3 import NameAvailabilityRequest
+    from .name_availability_py3 import NameAvailability
+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 .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 .database import Database
+    from .configuration import Configuration
+    from .operation_display import OperationDisplay
+    from .operation import Operation
+    from .operation_list_result import OperationListResult
+    from .log_file import LogFile
+    from .performance_tier_service_level_objectives import PerformanceTierServiceLevelObjectives
+    from .performance_tier_properties import PerformanceTierProperties
+    from .name_availability_request import NameAvailabilityRequest
+    from .name_availability import NameAvailability
 from .server_paged import ServerPaged
 from .firewall_rule_paged import FirewallRulePaged
 from .database_paged import DatabasePaged

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/configuration.py

@@ -60,11 +60,11 @@ class Configuration(ProxyResource):
         'source': {'key': 'properties.source', 'type': 'str'},
     }
 
-    def __init__(self, value=None, source=None):
-        super(Configuration, self).__init__()
-        self.value = value
+    def __init__(self, **kwargs):
+        super(Configuration, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
         self.description = None
         self.default_value = None
         self.data_type = None
         self.allowed_values = None
-        self.source = source
+        self.source = kwargs.get('source', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/configuration_py3.py

@@ -0,0 +1,70 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .proxy_resource import ProxyResource
+
+
+class Configuration(ProxyResource):
+    """Represents a Configuration.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource ID
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type.
+    :vartype type: str
+    :param value: Value of the configuration.
+    :type value: str
+    :ivar description: Description of the configuration.
+    :vartype description: str
+    :ivar default_value: Default value of the configuration.
+    :vartype default_value: str
+    :ivar data_type: Data type of the configuration.
+    :vartype data_type: str
+    :ivar allowed_values: Allowed values of the configuration.
+    :vartype allowed_values: str
+    :param source: Source of the configuration.
+    :type source: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'description': {'readonly': True},
+        'default_value': {'readonly': True},
+        'data_type': {'readonly': True},
+        'allowed_values': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'value': {'key': 'properties.value', 'type': 'str'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'default_value': {'key': 'properties.defaultValue', 'type': 'str'},
+        'data_type': {'key': 'properties.dataType', 'type': 'str'},
+        'allowed_values': {'key': 'properties.allowedValues', 'type': 'str'},
+        'source': {'key': 'properties.source', 'type': 'str'},
+    }
+
+    def __init__(self, *, value: str=None, source: str=None, **kwargs) -> None:
+        super(Configuration, self).__init__(, **kwargs)
+        self.value = value
+        self.description = None
+        self.default_value = None
+        self.data_type = None
+        self.allowed_values = None
+        self.source = source

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/database.py

@@ -44,7 +44,7 @@ class Database(ProxyResource):
         'collation': {'key': 'properties.collation', 'type': 'str'},
     }
 
-    def __init__(self, charset=None, collation=None):
-        super(Database, self).__init__()
-        self.charset = charset
-        self.collation = collation
+    def __init__(self, **kwargs):
+        super(Database, self).__init__(**kwargs)
+        self.charset = kwargs.get('charset', None)
+        self.collation = kwargs.get('collation', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/database_py3.py

@@ -0,0 +1,50 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .proxy_resource import ProxyResource
+
+
+class Database(ProxyResource):
+    """Represents a Database.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource ID
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type.
+    :vartype type: str
+    :param charset: The charset of the database.
+    :type charset: str
+    :param collation: The collation of the database.
+    :type collation: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'charset': {'key': 'properties.charset', 'type': 'str'},
+        'collation': {'key': 'properties.collation', 'type': 'str'},
+    }
+
+    def __init__(self, *, charset: str=None, collation: str=None, **kwargs) -> None:
+        super(Database, self).__init__(, **kwargs)
+        self.charset = charset
+        self.collation = collation

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/firewall_rule.py

@@ -18,17 +18,19 @@ class FirewallRule(ProxyResource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
+    All required parameters must be populated in order to send to Azure.
+
     :ivar id: Resource ID
     :vartype id: str
     :ivar name: Resource name.
     :vartype name: str
     :ivar type: Resource type.
     :vartype type: str
-    :param start_ip_address: The start IP address of the server firewall rule.
-     Must be IPv4 format.
+    :param start_ip_address: Required. The start IP address of the server
+     firewall rule. Must be IPv4 format.
     :type start_ip_address: str
-    :param end_ip_address: The end IP address of the server firewall rule.
-     Must be IPv4 format.
+    :param end_ip_address: Required. The end IP address of the server firewall
+     rule. Must be IPv4 format.
     :type end_ip_address: str
     """
 
@@ -48,7 +50,7 @@ class FirewallRule(ProxyResource):
         'end_ip_address': {'key': 'properties.endIpAddress', 'type': 'str'},
     }
 
-    def __init__(self, start_ip_address, end_ip_address):
-        super(FirewallRule, self).__init__()
-        self.start_ip_address = start_ip_address
-        self.end_ip_address = end_ip_address
+    def __init__(self, **kwargs):
+        super(FirewallRule, self).__init__(**kwargs)
+        self.start_ip_address = kwargs.get('start_ip_address', None)
+        self.end_ip_address = kwargs.get('end_ip_address', None)

azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/models/firewall_rule_py3.py

@@ -0,0 +1,56 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .proxy_resource import ProxyResource
+
+
+class FirewallRule(ProxyResource):
+    """Represents a server firewall rule.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource ID
+    :vartype id: str
+    :ivar name: Resource name.
+    :vartype name: str
+    :ivar type: Resource type.
+    :vartype type: str
+    :param start_ip_address: Required. The start IP address of the server
+     firewall rule. Must be IPv4 format.
+    :type start_ip_address: str
+    :param end_ip_address: Required. The end IP address of the server firewall
+     rule. Must be IPv4 format.
+    :type end_ip_address: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'start_ip_address': {'required': True, 'pattern': r'^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'},
+        'end_ip_address': {'required': True, 'pattern': r'^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$'},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'start_ip_address': {'key': 'properties.startIpAddress', 'type': 'str'},
+        'end_ip_address': {'key': 'properties.endIpAddress', 'type': 'str'},
+    }
+
+    def __init__(self, *, start_ip_address: str, end_ip_address: str, **kwargs) -> None:
+        super(FirewallRule, self).__init__(, **kwargs)
+        self.start_ip_address = start_ip_address
+        self.end_ip_address = end_ip_address

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

@@ -58,11 +58,11 @@ class LogFile(ProxyResource):
         'url': {'key': 'properties.url', 'type': 'str'},
     }
 
-    def __init__(self, log_file_name=None, size_in_kb=None, log_file_type=None, url=None):
-        super(LogFile, self).__init__()
-        self.log_file_name = log_file_name
-        self.size_in_kb = size_in_kb
+    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.log_file_type = log_file_type
-        self.url = url
+        self.log_file_type = kwargs.get('log_file_type', None)
+        self.url = kwargs.get('url', None)