diff --git a/sdk/rdbms/azure-mgmt-rdbms/_meta.json b/sdk/rdbms/azure-mgmt-rdbms/_meta.json index 7666972ffea0..5f05be7e754d 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/_meta.json +++ b/sdk/rdbms/azure-mgmt-rdbms/_meta.json @@ -4,8 +4,8 @@ "@autorest/python@5.8.4", "@autorest/modelerfour@4.19.2" ], - "commit": "5d442a18cbb7ede47abfd7ae8b7acc20cc1d7946", + "commit": "678d5a1994e1c1f888abd26b26f9cefc4b706ec3", "repository_url": "https://github.com/Azure/azure-rest-api-specs", - "autorest_command": "autorest specification/mysql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5", - "readme": "specification/mysql/resource-manager/readme.md" + "autorest_command": "autorest specification/postgresql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5", + "readme": "specification/postgresql/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py index f89ed38360ab..e5754a47ce68 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "9.1.0" +VERSION = "1.0.0b1" diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py index f89ed38360ab..e5754a47ce68 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "9.1.0" +VERSION = "1.0.0b1" diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/__init__.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/__init__.py index 1cd0378a581b..184130773e2b 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/__init__.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/__init__.py @@ -22,7 +22,6 @@ from ._models_py3 import FlexibleServerEditionCapability from ._models_py3 import HighAvailability from ._models_py3 import HyperscaleNodeEditionCapability - from ._models_py3 import Identity from ._models_py3 import MaintenanceWindow from ._models_py3 import NameAvailability from ._models_py3 import NameAvailabilityRequest @@ -63,7 +62,6 @@ from ._models import FlexibleServerEditionCapability # type: ignore from ._models import HighAvailability # type: ignore from ._models import HyperscaleNodeEditionCapability # type: ignore - from ._models import Identity # type: ignore from ._models import MaintenanceWindow # type: ignore from ._models import NameAvailability # type: ignore from ._models import NameAvailabilityRequest # type: ignore @@ -94,6 +92,7 @@ CreateMode, CreateModeForUpdate, CreatedByType, + FailoverMode, GeoRedundantBackupEnum, HighAvailabilityMode, OperationOrigin, @@ -120,7 +119,6 @@ 'FlexibleServerEditionCapability', 'HighAvailability', 'HyperscaleNodeEditionCapability', - 'Identity', 'MaintenanceWindow', 'NameAvailability', 'NameAvailabilityRequest', @@ -149,6 +147,7 @@ 'CreateMode', 'CreateModeForUpdate', 'CreatedByType', + 'FailoverMode', 'GeoRedundantBackupEnum', 'HighAvailabilityMode', 'OperationOrigin', diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models.py index bb23e819126e..9c9bdbcfd502 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models.py @@ -674,41 +674,6 @@ def __init__( self.status = None -class Identity(msrest.serialization.Model): - """Identity for the resource. - - Variables are only populated by the server, and will be ignored when sending a request. - - :ivar principal_id: The principal ID of resource identity. - :vartype principal_id: str - :ivar tenant_id: The tenant ID of resource. - :vartype tenant_id: str - :param type: The identity type. The only acceptable values to pass in are None and - "SystemAssigned". The default value is None. - :type type: str - """ - - _validation = { - 'principal_id': {'readonly': True}, - 'tenant_id': {'readonly': True}, - } - - _attribute_map = { - 'principal_id': {'key': 'principalId', 'type': 'str'}, - 'tenant_id': {'key': 'tenantId', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - } - - def __init__( - self, - **kwargs - ): - super(Identity, self).__init__(**kwargs) - self.principal_id = None - self.tenant_id = None - self.type = kwargs.get('type', None) - - class MaintenanceWindow(msrest.serialization.Model): """Maintenance window properties of a server. @@ -984,8 +949,9 @@ class RestartParameter(msrest.serialization.Model): :param restart_with_failover: Indicates whether to restart the server with failover. :type restart_with_failover: bool - :param failover_mode: Failover mode. - :type failover_mode: str + :param failover_mode: Failover mode. Possible values include: "PlannedFailover", + "ForcedFailover", "PlannedSwitchover", "ForcedSwitchover". + :type failover_mode: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.FailoverMode """ _attribute_map = { @@ -1066,8 +1032,6 @@ class Server(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives. :type location: str - :param identity: The Azure Active Directory identity of the server. - :type identity: ~azure.mgmt.rdbms.postgresql_flexibleservers.models.Identity :param sku: The SKU (pricing tier) of the server. :type sku: ~azure.mgmt.rdbms.postgresql_flexibleservers.models.Sku :ivar system_data: The system metadata relating to this resource. @@ -1129,7 +1093,6 @@ class Server(TrackedResource): 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'identity': {'key': 'identity', 'type': 'Identity'}, 'sku': {'key': 'sku', 'type': 'Sku'}, 'system_data': {'key': 'systemData', 'type': 'SystemData'}, 'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'}, @@ -1155,7 +1118,6 @@ def __init__( **kwargs ): super(Server, self).__init__(**kwargs) - self.identity = kwargs.get('identity', None) self.sku = kwargs.get('sku', None) self.system_data = None self.administrator_login = kwargs.get('administrator_login', None) diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models_py3.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models_py3.py index 472e65efb3a6..3ef34c600f5a 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models_py3.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_models_py3.py @@ -703,43 +703,6 @@ def __init__( self.status = None -class Identity(msrest.serialization.Model): - """Identity for the resource. - - Variables are only populated by the server, and will be ignored when sending a request. - - :ivar principal_id: The principal ID of resource identity. - :vartype principal_id: str - :ivar tenant_id: The tenant ID of resource. - :vartype tenant_id: str - :param type: The identity type. The only acceptable values to pass in are None and - "SystemAssigned". The default value is None. - :type type: str - """ - - _validation = { - 'principal_id': {'readonly': True}, - 'tenant_id': {'readonly': True}, - } - - _attribute_map = { - 'principal_id': {'key': 'principalId', 'type': 'str'}, - 'tenant_id': {'key': 'tenantId', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - } - - def __init__( - self, - *, - type: Optional[str] = None, - **kwargs - ): - super(Identity, self).__init__(**kwargs) - self.principal_id = None - self.tenant_id = None - self.type = type - - class MaintenanceWindow(msrest.serialization.Model): """Maintenance window properties of a server. @@ -1036,8 +999,9 @@ class RestartParameter(msrest.serialization.Model): :param restart_with_failover: Indicates whether to restart the server with failover. :type restart_with_failover: bool - :param failover_mode: Failover mode. - :type failover_mode: str + :param failover_mode: Failover mode. Possible values include: "PlannedFailover", + "ForcedFailover", "PlannedSwitchover", "ForcedSwitchover". + :type failover_mode: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.FailoverMode """ _attribute_map = { @@ -1049,7 +1013,7 @@ def __init__( self, *, restart_with_failover: Optional[bool] = None, - failover_mode: Optional[str] = None, + failover_mode: Optional[Union[str, "FailoverMode"]] = None, **kwargs ): super(RestartParameter, self).__init__(**kwargs) @@ -1124,8 +1088,6 @@ class Server(TrackedResource): :type tags: dict[str, str] :param location: Required. The geo-location where the resource lives. :type location: str - :param identity: The Azure Active Directory identity of the server. - :type identity: ~azure.mgmt.rdbms.postgresql_flexibleservers.models.Identity :param sku: The SKU (pricing tier) of the server. :type sku: ~azure.mgmt.rdbms.postgresql_flexibleservers.models.Sku :ivar system_data: The system metadata relating to this resource. @@ -1187,7 +1149,6 @@ class Server(TrackedResource): 'type': {'key': 'type', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'location': {'key': 'location', 'type': 'str'}, - 'identity': {'key': 'identity', 'type': 'Identity'}, 'sku': {'key': 'sku', 'type': 'Sku'}, 'system_data': {'key': 'systemData', 'type': 'SystemData'}, 'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'}, @@ -1213,7 +1174,6 @@ def __init__( *, location: str, tags: Optional[Dict[str, str]] = None, - identity: Optional["Identity"] = None, sku: Optional["Sku"] = None, administrator_login: Optional[str] = None, administrator_login_password: Optional[str] = None, @@ -1231,7 +1191,6 @@ def __init__( **kwargs ): super(Server, self).__init__(tags=tags, location=location, **kwargs) - self.identity = identity self.sku = sku self.system_data = None self.administrator_login = administrator_login diff --git a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_postgre_sql_management_client_enums.py b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_postgre_sql_management_client_enums.py index 90494cca3f20..16a0ab4ace10 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_postgre_sql_management_client_enums.py +++ b/sdk/rdbms/azure-mgmt-rdbms/azure/mgmt/rdbms/postgresql_flexibleservers/models/_postgre_sql_management_client_enums.py @@ -60,6 +60,15 @@ class CreateModeForUpdate(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): DEFAULT = "Default" UPDATE = "Update" +class FailoverMode(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): + """Failover mode. + """ + + PLANNED_FAILOVER = "PlannedFailover" + FORCED_FAILOVER = "ForcedFailover" + PLANNED_SWITCHOVER = "PlannedSwitchover" + FORCED_SWITCHOVER = "ForcedSwitchover" + class GeoRedundantBackupEnum(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)): """A value indicating whether Geo-Redundant backup is enabled on the server. """