Skip to content

Commit e67d3eb

Browse files
committed
remove breaking change
1 parent fa9e0f1 commit e67d3eb

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/azure-cli/azure/cli/command_modules/mysql/_validators.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from azure.mgmt.core.tools import parse_resource_id, resource_id, is_valid_resource_id, is_valid_resource_name
1010
from azure.cli.core.azclierror import ValidationError, ArgumentUsageError, InvalidArgumentValueError
1111
from azure.cli.core.commands.client_factory import get_mgmt_service_client, get_subscription_id
12-
from azure.cli.core.util import parse_proxy_resource_id, user_confirmation
12+
from azure.cli.core.util import parse_proxy_resource_id
1313
from azure.cli.core.profiles import ResourceType
1414
from azure.core.exceptions import HttpResponseError
1515
from ._client_factory import cf_mysql_flexible_servers
@@ -267,9 +267,6 @@ def _mysql_high_availability_validator(high_availability, standby_availability_z
267267
raise ArgumentUsageError("This region is single availability zone. "
268268
"Zone redundant high availability is not supported "
269269
"in a single availability zone region.")
270-
if not single_az and high_availability.lower() == 'samezone':
271-
user_confirmation("The region supports multi-AZ, and the server will be provisioned as "
272-
"a zone-redundant HA server. Do you want to continue?", yes=yes)
273270
if auto_grow.lower == 'Disabled':
274271
raise ArgumentUsageError("Enabling High availability requires auto-grow to be turned ON.")
275272
if standby_availability_zone:

src/azure-cli/azure/cli/command_modules/mysql/custom.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ def flexible_server_create(cmd, client,
380380
iops=iops)
381381
list_skus_info = get_mysql_list_skus_info(db_context.cmd, location)
382382
iops_info = list_skus_info['iops_info']
383-
single_az = list_skus_info['single_az']
384383

385384
server_result = firewall_name = None
386385

@@ -408,8 +407,6 @@ def flexible_server_create(cmd, client,
408407

409408
storage_redundancy = _determine_storage_redundancy(storage_redundancy, tier)
410409

411-
high_availability = _determine_hight_availability(high_availability, single_az)
412-
413410
storage = models.Storage(storage_size_gb=storage_gb,
414411
iops=iops,
415412
auto_grow=auto_grow,
@@ -1675,11 +1672,6 @@ def _determine_acceleratedLogs(accelerated_logs, tier):
16751672
return accelerated_logs
16761673

16771674

1678-
def _determine_hight_availability(high_availability, single_az):
1679-
if not single_az and high_availability.lower() == 'samezone':
1680-
return 'ZoneRedundant'
1681-
1682-
16831675
def _determine_storage_redundancy(storage_redundancy, tier):
16841676
if storage_redundancy is None:
16851677
if tier == "MemoryOptimized":

0 commit comments

Comments
 (0)