|
23 | 23 | from ._client_factory import get_mysql_flexible_management_client, cf_mysql_flexible_firewall_rules, cf_mysql_flexible_db, \ |
24 | 24 | cf_mysql_check_resource_availability, cf_mysql_check_resource_availability_without_location, cf_mysql_flexible_config, \ |
25 | 25 | cf_mysql_flexible_servers, cf_mysql_flexible_replica, cf_mysql_flexible_adadmin, cf_mysql_flexible_private_dns_zone_suffix_operations, cf_mysql_servers, \ |
26 | | - cf_mysql_firewall_rules |
| 26 | + cf_mysql_firewall_rules, get_mysql_flexible_management_client_by_sub |
27 | 27 | from ._util import resolve_poller, generate_missing_parameters, get_mysql_list_skus_info, generate_password, parse_maintenance_window, \ |
28 | 28 | replace_memory_optimized_tier, build_identity_and_data_encryption, get_identity_and_data_encryption, get_tenant_id, run_subprocess, \ |
29 | 29 | fill_action_template, get_git_root_dir, get_single_to_flex_sku_mapping, get_firewall_rules_from_paged_response, \ |
@@ -734,7 +734,9 @@ def flexible_server_restore(cmd, client, resource_group_name, server_name, sourc |
734 | 734 |
|
735 | 735 | try: |
736 | 736 | id_parts = parse_resource_id(source_server_id) |
737 | | - source_server_object = client.get(id_parts['resource_group'], id_parts['name']) |
| 737 | + source_client = get_mysql_flexible_management_client_by_sub(cmd.cli_ctx, id_parts['subscription']).servers |
| 738 | + |
| 739 | + source_server_object = source_client.get(id_parts['resource_group'], id_parts['name']) |
738 | 740 | location = ''.join(source_server_object.location.lower().split()) |
739 | 741 | list_skus_info = get_mysql_list_skus_info(cmd, location) |
740 | 742 |
|
@@ -880,7 +882,9 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so |
880 | 882 |
|
881 | 883 | try: |
882 | 884 | id_parts = parse_resource_id(source_server_id) |
883 | | - source_server_object = client.get(id_parts['resource_group'], id_parts['name']) |
| 885 | + source_client = get_mysql_flexible_management_client_by_sub(cmd.cli_ctx, id_parts['subscription']).servers |
| 886 | + |
| 887 | + source_server_object = source_client.get(id_parts['resource_group'], id_parts['name']) |
884 | 888 | list_skus_info = get_mysql_list_skus_info(cmd, location) |
885 | 889 |
|
886 | 890 | if not tier: |
@@ -1340,7 +1344,8 @@ def flexible_replica_create(cmd, client, resource_group_name, source_server, rep |
1340 | 1344 |
|
1341 | 1345 | source_server_id_parts = parse_resource_id(source_server_id) |
1342 | 1346 | try: |
1343 | | - source_server_object = client.get(source_server_id_parts['resource_group'], source_server_id_parts['name']) |
| 1347 | + source_client = get_mysql_flexible_management_client_by_sub(cmd.cli_ctx, source_server_id_parts['subscription']).servers |
| 1348 | + source_server_object = source_client.get(source_server_id_parts['resource_group'], source_server_id_parts['name']) |
1344 | 1349 | validate_mysql_replica(source_server_object) |
1345 | 1350 | except Exception as e: |
1346 | 1351 | raise ResourceNotFoundError(e) |
|
0 commit comments