[SQL] az sql failover-group create: Add support for multiple partner failover groups (#31782)

Author: alecbain

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

@@ -58,6 +58,7 @@
     DatabaseCapabilitiesAdditionalDetails,
     ElasticPoolCapabilitiesAdditionalDetails,
     FailoverPolicyType,
+    FailoverReadOnlyEndpointPolicy,
     ResourceIdType,
     ServicePrincipalType,
     SqlServerMinimalTlsVersionType,
@@ -1720,6 +1721,11 @@ def _configure_security_policy_storage_params(arg_ctx):
                    arg_type=try_planned_before_forced_failover_param_type)
         c.argument('secondary_type', help="Databases secondary type on partner server",
                    arg_type=get_enum_type(FailoverGroupDatabasesSecondaryType))
+        c.argument('partner_server_ids', nargs='+',
+                   help="The list of partner server resource id's of the Failover Group")
+        c.argument('ro_failover_policy', help="The policy of the read only endpoint of the Failover Group",
+                   arg_type=get_enum_type(FailoverReadOnlyEndpointPolicy))
+        c.argument('ro_endpoint_target', help="The resource id of the read only endpoint target server")
 
     ###############################################
     #             sql instance pool               #

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

@@ -573,7 +573,7 @@ def _get_database_identity(
 def _failover_group_update_common(
         instance,
         failover_policy=None,
-        grace_period=None,):
+        grace_period=None):
     '''
     Updates the failover group grace period and failover policy. Common logic for both Sterling and Managed Instance
     '''
@@ -642,6 +642,11 @@ class FailoverPolicyType(Enum):
     manual = 'Manual'
 
 
+class FailoverReadOnlyEndpointPolicy(Enum):
+    enabled = 'Enabled'
+    disabled = 'Disabled'
+
+
 class FailoverGroupDatabasesSecondaryType(Enum):
     geo = 'Geo'
     standby = 'Standby'
@@ -6509,7 +6514,10 @@ def failover_group_create(
         partner_resource_group=None,
         failover_policy=FailoverPolicyType.manual.value,
         grace_period=1,
-        add_db=None):
+        add_db=None,
+        partner_server_ids=None,
+        ro_failover_policy=FailoverReadOnlyEndpointPolicy.disabled.value,
+        ro_endpoint_target=None):
     '''
     Creates a failover group.
     '''
@@ -6542,14 +6550,24 @@ def failover_group_create(
         add_db,
         [])
 
+    if partner_server_ids is not None:
+        print(partner_server_ids)
+        partner_servers = [PartnerInfo(id=p) for p in partner_server_ids]
+    else:
+        partner_servers = [partner_server]
+
+    if ro_endpoint_target is None:
+        ro_endpoint_target = partner_server_id
+
     failover_group_params = FailoverGroup(
-        partner_servers=[partner_server],
+        partner_servers=partner_servers,
         databases=databases,
         read_write_endpoint=FailoverGroupReadWriteEndpoint(
             failover_policy=failover_policy,
             failover_with_data_loss_grace_period_minutes=grace_period),
         read_only_endpoint=FailoverGroupReadOnlyEndpoint(
-            failover_policy="Disabled")
+            failover_policy=ro_failover_policy,
+            target_server=ro_endpoint_target)
     )
 
     if secondary_type is not None:
@@ -6571,7 +6589,10 @@ def failover_group_update(
         failover_policy=None,
         grace_period=None,
         add_db=None,
-        remove_db=None):
+        remove_db=None,
+        ro_endpoint_target=None,
+        ro_failover_policy=None,
+        partner_server_ids=None):
     '''
     Updates the failover group.
     '''
@@ -6599,6 +6620,13 @@ def failover_group_update(
     if secondary_type is not None:
         instance.secondary_type = secondary_type
 
+    if partner_server_ids is not None:
+        instance.partner_servers = [PartnerInfo(id=p) for p in partner_server_ids]
+
+    instance.read_only_endpoint = FailoverGroupReadOnlyEndpoint(
+        failover_policy=ro_failover_policy if ro_failover_policy is not None else instance.read_only_endpoint.failover_policy,
+        target_server=ro_endpoint_target if ro_endpoint_target is not None else instance.read_only_endpoint.target_server)
+
     return instance