[MySQL] az mysql flexible-server create/update: Update --storage-redundancy parameter and add --backup-interval

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

@@ -372,7 +372,7 @@ def load_arguments(self, _):    # pylint: disable=too-many-statements, too-many-
         c.argument('public_access', arg_type=public_access_create_arg_type)
         c.argument('vnet', arg_type=vnet_arg_type)
         c.argument('vnet_address_prefix', arg_type=vnet_address_prefix_arg_type)
-        c.argument('storage_redundancy', arg_type=storage_redundancy_arg_type)
+        c.argument('storage_redundancy', arg_type=storage_redundancy_arg_type, default="LocalRedundancy")
         c.argument('subnet', arg_type=subnet_arg_type)
         c.argument('subnet_address_prefix', arg_type=subnet_address_prefix_arg_type)
         c.argument('private_dns_zone_arguments', private_dns_zone_arguments_arg_type)
@@ -479,6 +479,7 @@ def load_arguments(self, _):    # pylint: disable=too-many-statements, too-many-
         c.argument('storage_gb', arg_type=storage_gb_arg_type)
         c.argument('standby_availability_zone', arg_type=standby_availability_zone_arg_type)
         c.argument('high_availability', arg_type=high_availability_arg_type)
+        c.argument('backup_interval', arg_type=backup_interval_arg_type)
         c.argument('byok_key', arg_type=key_arg_type)
         c.argument('byok_identity', arg_type=identity_arg_type)
         c.argument('auto_grow', arg_type=auto_grow_arg_type)
@@ -593,7 +594,7 @@ def load_arguments(self, _):    # pylint: disable=too-many-statements, too-many-
         c.argument('sku_name', arg_type=sku_name_arg_type)
         c.argument('storage_gb', arg_type=storage_gb_arg_type)
         c.argument('iops', arg_type=iops_arg_type)
-        c.argument('storage_redundancy', arg_type=storage_redundancy_arg_type)
+        c.argument('storage_redundancy', arg_type=storage_redundancy_arg_type, default="LocalRedundancy")
         c.argument('faster_provisioning', arg_type=faster_provisioning_arg_type)
         c.argument('database_port', arg_type=database_port_arg_type)
         c.argument('backup_retention', arg_type=mysql_backup_retention_arg_type)

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

@@ -107,7 +107,7 @@ def mysql_arguments_validator(db_context, location, tier, sku_name, storage_gb,
                               public_access=None, version=None, auto_grow=None, replication_role=None, subnet=None,
                               byok_identity=None, backup_interval=None, backup_byok_identity=None, byok_key=None,
                               geo_redundant_backup=None, disable_data_encryption=None, iops=None, auto_io_scaling=None,
-                              accelerated_logs=None, storage_redundancy=None, instance=None, data_source_type=None,
+                              accelerated_logs=None, instance=None, data_source_type=None,
                               mode=None, data_source_backup_dir=None, data_source_sas_token=None):
     validate_server_name(db_context, server_name, 'Microsoft.DBforMySQL/flexibleServers')
 
@@ -135,7 +135,6 @@ def mysql_arguments_validator(db_context, location, tier, sku_name, storage_gb,
     _mysql_backup_interval_validator(backup_interval)
     _mysql_iops_validator(iops, auto_io_scaling, instance)
     mysql_accelerated_logs_validator(accelerated_logs, tier)
-    storage_redundancy_validator(storage_redundancy, tier)
     _mysql_import_data_source_type_validator(data_source_type, data_source_backup_dir, data_source_sas_token)
     _mysql_import_mode_validator(mode)
 
@@ -325,12 +324,6 @@ def mysql_accelerated_logs_validator(accelerated_logs, tier):
                        "So the accelerated logs will be disabled.")
 
 
-def storage_redundancy_validator(storage_redundancy, tier):
-    if tier != "MemoryOptimized" and storage_redundancy is not None and storage_redundancy.lower() == "zoneredundancy":
-        logger.warning("Zone Redundancy is only supported for Memory Optimized tier. "
-                       "So Local Redundancy will be enabled for your server.")
-
-
 def _network_arg_validator(subnet, public_access):
     if subnet is not None and public_access is not None:
         raise CLIError("Incorrect usage : A combination of the parameters --subnet "

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

@@ -32,7 +32,7 @@
 from ._validators import mysql_arguments_validator, mysql_auto_grow_validator, mysql_georedundant_backup_validator, mysql_restore_tier_validator, mysql_accelerated_logs_validator, \
     mysql_retention_validator, mysql_sku_name_validator, mysql_storage_validator, validate_mysql_replica, validate_server_name, \
     validate_mysql_tier_update, validate_and_format_restore_point_in_time, validate_public_access_server, mysql_import_single_server_ready_validator, \
-    mysql_import_version_validator, mysql_import_storage_validator, validate_and_format_maintenance_start_time, storage_redundancy_validator
+    mysql_import_version_validator, mysql_import_storage_validator, validate_and_format_maintenance_start_time
 
 logger = get_logger(__name__)
 DELEGATION_SERVICE_NAME = "Microsoft.DBforMySQL/flexibleServers"
@@ -377,7 +377,6 @@ def flexible_server_create(cmd, client,
                               backup_byok_key=backup_byok_key,
                               auto_io_scaling=auto_scale_iops,
                               accelerated_logs=accelerated_logs,
-                              storage_redundancy=storage_redundancy,
                               iops=iops)
     list_skus_info = get_mysql_list_skus_info(db_context.cmd, location)
     iops_info = list_skus_info['iops_info']
@@ -406,8 +405,6 @@ def flexible_server_create(cmd, client,
 
     accelerated_logs = _determine_acceleratedLogs(accelerated_logs, tier)
 
-    storage_redundancy = _determine_storage_redundancy(storage_redundancy, tier)
-
     storage = models.Storage(storage_size_gb=storage_gb,
                              iops=iops,
                              auto_grow=auto_grow,
@@ -769,8 +766,6 @@ def flexible_server_restore(cmd, client, resource_group_name, server_name, sourc
 
         if not storage_redundancy:
             storage_redundancy = source_server_object.storage.storage_redundancy
-        else:
-            storage_redundancy_validator(storage_redundancy, tier)
 
         if not backup_retention:
             backup_retention = source_server_object.backup.backup_retention_days
@@ -908,8 +903,6 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
 
         if not storage_redundancy:
             storage_redundancy = source_server_object.storage.storage_redundancy
-        else:
-            storage_redundancy_validator(storage_redundancy, tier)
 
         if not backup_retention:
             backup_retention = source_server_object.backup.backup_retention_days
@@ -992,26 +985,13 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
 
 
 # pylint: disable=too-many-branches, disable=too-many-locals, too-many-statements, raise-missing-from
-def flexible_server_update_custom_func(cmd, client, instance,
-                                       sku_name=None,
-                                       tier=None,
-                                       storage_gb=None,
-                                       auto_grow=None,
-                                       iops=None,
-                                       auto_scale_iops=None,
-                                       accelerated_logs=None,
-                                       backup_retention=None,
-                                       geo_redundant_backup=None,
-                                       administrator_login_password=None,
-                                       high_availability=None,
-                                       standby_availability_zone=None,
-                                       maintenance_window=None,
-                                       tags=None,
-                                       replication_role=None,
-                                       byok_identity=None, backup_byok_identity=None, byok_key=None, backup_byok_key=None,
-                                       disable_data_encryption=False,
-                                       public_access=None,
-                                       maintenance_policy_patch_strategy=None):
+def flexible_server_update_custom_func(cmd, client, instance, sku_name=None, tier=None, storage_gb=None,
+                                       auto_grow=None, iops=None, auto_scale_iops=None, accelerated_logs=None,
+                                       backup_retention=None, geo_redundant_backup=None, administrator_login_password=None,
+                                       high_availability=None, standby_availability_zone=None, maintenance_window=None,
+                                       tags=None, replication_role=None, byok_identity=None, backup_byok_identity=None,
+                                       byok_key=None, backup_byok_key=None, disable_data_encryption=False,
+                                       public_access=None, maintenance_policy_patch_strategy=None, backup_interval=None):
     # validator
     location = ''.join(instance.location.lower().split())
     db_context = DbContext(
@@ -1043,7 +1023,8 @@ def flexible_server_update_custom_func(cmd, client, instance,
                               backup_byok_key=backup_byok_key,
                               disable_data_encryption=disable_data_encryption,
                               auto_io_scaling=auto_scale_iops,
-                              iops=iops)
+                              iops=iops,
+                              backup_interval=backup_interval)
 
     list_skus_info = get_mysql_list_skus_info(db_context.cmd, location, server_name=instance.name if instance else None)
     iops_info = list_skus_info['iops_info']
@@ -1065,6 +1046,9 @@ def flexible_server_update_custom_func(cmd, client, instance,
     if geo_redundant_backup:
         instance.backup.geo_redundant_backup = geo_redundant_backup
 
+    if backup_interval:
+        instance.backup.backup_interval_hours = backup_interval
+
     if maintenance_window:
         # if disabled is pass in reset to default values
         if maintenance_window.lower() == "disabled":
@@ -1380,11 +1364,6 @@ def flexible_replica_create(cmd, client, resource_group_name, source_server, rep
     else:
         auto_io_scaling = _determine_auto_io_scaling_by_faster_provisioning(faster_provisioning)
 
-    if not storage_redundancy:
-        storage_redundancy = source_server_object.storage.storage_redundancy
-    else:
-        storage_redundancy_validator(storage_redundancy, tier)
-
     identity, data_encryption = get_identity_and_data_encryption(source_server_object)
 
     storage = models.Storage(storage_size_gb=storage_gb,
@@ -1695,11 +1674,6 @@ def _determine_acceleratedLogs(accelerated_logs, tier):
     return accelerated_logs
 
 
-def _determine_storage_redundancy(storage_redundancy, tier):
-    storage_redundancy = "LocalRedundancy"
-    return storage_redundancy
-
-
 def get_free_iops(storage_in_mb, iops_info, tier, sku_name):
     free_iops = MINIMUM_IOPS + (storage_in_mb // 1024) * 3
     max_supported_iops = iops_info[tier][sku_name]  # free iops cannot exceed maximum supported iops for the sku