From 6075d370c7fe139901b39d78ed3c95ead7b38332 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 13 Jun 2023 06:24:25 +0000 Subject: [PATCH] CodeGen from PR 24208 in Azure/azure-rest-api-specs Merge fdca60aa22980f8adf6471d02b7c23327bb14467 into f36b1ea47fd9524a8aa46e7489a372a3ae880ce5 --- sdk/rdbms/azure-mgmt-rdbms/_meta.json | 6 +++--- .../azure/mgmt/rdbms/postgresql/_version.py | 2 +- .../rdbms/postgresql_flexibleservers/_version.py | 2 +- .../models/_models_py3.py | 16 ++++++++-------- .../postgresql_flexibleservers/server_create.py | 2 +- .../server_create_with_aad_auth_enabled.py | 2 +- .../postgresql_flexibleservers/server_update.py | 2 +- .../server_update_with_aad_auth_enabled.py | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk/rdbms/azure-mgmt-rdbms/_meta.json b/sdk/rdbms/azure-mgmt-rdbms/_meta.json index 8d344ef1fd0a..014b47fbc46e 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/_meta.json +++ b/sdk/rdbms/azure-mgmt-rdbms/_meta.json @@ -1,11 +1,11 @@ { - "commit": "dc92283b118284e79f4ed3837763e2bb079ffa09", + "commit": "1f707cd3d86c85efa3327ea7a881d0c728908e31", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "autorest": "3.9.2", "use": [ - "@autorest/python@6.4.12", + "@autorest/python@6.6.0", "@autorest/modelerfour@4.24.3" ], - "autorest_command": "autorest specification/postgresql/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/postgresql/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", "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 0e54abf8a90d..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 = "10.2.0b10" +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 0e54abf8a90d..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 = "10.2.0b10" +VERSION = "1.0.0b1" 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 4b2fa7c9a0f6..d53ef5c16c4a 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 @@ -3521,9 +3521,9 @@ class Storage(_serialization.Model): :ivar auto_grow: Flag to enable / disable Storage Auto grow for flexible server. Known values are: "Enabled" and "Disabled". :vartype auto_grow: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.StorageAutoGrow - :ivar iops_tier: Name of storage tier for IOPS. Known values are: "P1", "P2", "P3", "P4", "P6", + :ivar tier: Name of storage tier for IOPS. Known values are: "P1", "P2", "P3", "P4", "P6", "P10", "P15", "P20", "P30", "P40", "P50", "P60", "P70", and "P80". - :vartype iops_tier: str or + :vartype tier: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.AzureManagedDiskPerformanceTiers :ivar iops: Storage tier IOPS quantity. :vartype iops: int @@ -3536,7 +3536,7 @@ class Storage(_serialization.Model): _attribute_map = { "storage_size_gb": {"key": "storageSizeGB", "type": "int"}, "auto_grow": {"key": "autoGrow", "type": "str"}, - "iops_tier": {"key": "iopsTier", "type": "str"}, + "tier": {"key": "tier", "type": "str"}, "iops": {"key": "iops", "type": "int"}, } @@ -3545,7 +3545,7 @@ def __init__( *, storage_size_gb: Optional[int] = None, auto_grow: Optional[Union[str, "_models.StorageAutoGrow"]] = None, - iops_tier: Optional[Union[str, "_models.AzureManagedDiskPerformanceTiers"]] = None, + tier: Optional[Union[str, "_models.AzureManagedDiskPerformanceTiers"]] = None, **kwargs: Any ) -> None: """ @@ -3555,15 +3555,15 @@ def __init__( values are: "Enabled" and "Disabled". :paramtype auto_grow: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.StorageAutoGrow - :keyword iops_tier: Name of storage tier for IOPS. Known values are: "P1", "P2", "P3", "P4", - "P6", "P10", "P15", "P20", "P30", "P40", "P50", "P60", "P70", and "P80". - :paramtype iops_tier: str or + :keyword tier: Name of storage tier for IOPS. Known values are: "P1", "P2", "P3", "P4", "P6", + "P10", "P15", "P20", "P30", "P40", "P50", "P60", "P70", and "P80". + :paramtype tier: str or ~azure.mgmt.rdbms.postgresql_flexibleservers.models.AzureManagedDiskPerformanceTiers """ super().__init__(**kwargs) self.storage_size_gb = storage_size_gb self.auto_grow = auto_grow - self.iops_tier = iops_tier + self.tier = tier self.iops = None diff --git a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create.py b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create.py index c32dfb6663b2..e89c4e67b540 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create.py +++ b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create.py @@ -45,7 +45,7 @@ def main(): "delegatedSubnetResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet", "privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone.postgres.database.azure.com", }, - "storage": {"autoGrow": "Disabled", "iopsTier": "P20", "storageSizeGB": 512}, + "storage": {"autoGrow": "Disabled", "storageSizeGB": 512, "tier": "P20"}, "version": "12", }, "sku": {"name": "Standard_D4s_v3", "tier": "GeneralPurpose"}, diff --git a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create_with_aad_auth_enabled.py b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create_with_aad_auth_enabled.py index 0db122202119..56e8a5344e5b 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create_with_aad_auth_enabled.py +++ b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_create_with_aad_auth_enabled.py @@ -51,7 +51,7 @@ def main(): "delegatedSubnetResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet", "privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourcegroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone.postgres.database.azure.com", }, - "storage": {"autoGrow": "Disabled", "iopsTier": "P20", "storageSizeGB": 512}, + "storage": {"autoGrow": "Disabled", "storageSizeGB": 512, "tier": "P20"}, "version": "12", }, "sku": {"name": "Standard_D4s_v3", "tier": "GeneralPurpose"}, diff --git a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update.py b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update.py index f40ea59daa43..402ed9b64fb1 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update.py +++ b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update.py @@ -37,7 +37,7 @@ def main(): "administratorLoginPassword": "newpassword", "backup": {"backupRetentionDays": 20}, "createMode": "Update", - "storage": {"autoGrow": "Enabled", "iopsTier": "P30", "storageSizeGB": 1024}, + "storage": {"autoGrow": "Enabled", "storageSizeGB": 1024, "tier": "P30"}, }, "sku": {"name": "Standard_D8s_v3", "tier": "GeneralPurpose"}, }, diff --git a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update_with_aad_auth_enabled.py b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update_with_aad_auth_enabled.py index 5faa97766eda..92f7ce545ce8 100644 --- a/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update_with_aad_auth_enabled.py +++ b/sdk/rdbms/azure-mgmt-rdbms/generated_samples/postgresql_flexibleservers/server_update_with_aad_auth_enabled.py @@ -42,7 +42,7 @@ def main(): }, "backup": {"backupRetentionDays": 20}, "createMode": "Update", - "storage": {"autoGrow": "Disabled", "iopsTier": "P30", "storageSizeGB": 1024}, + "storage": {"autoGrow": "Disabled", "storageSizeGB": 1024, "tier": "P30"}, }, "sku": {"name": "Standard_D8s_v3", "tier": "GeneralPurpose"}, },