[RDBMS] Python SDK migration

scripts/sdk_process/patch_models.py

@@ -232,6 +232,7 @@ def find_autorest_generated_folder(module_prefix="azure.mgmt"):
         'azure.mgmt.network',
         'azure.mgmt.monitor',
         'azure-mgmt-loganalytics'
+        'azure.mgmt.rdbms'
     ]
     prefix = sys.argv[1] if len(sys.argv) >= 2 else "azure.mgmt"
     for autorest_package in find_autorest_generated_folder(prefix):

src/azure-cli/azure/cli/command_modules/rdbms/_client_factory.py

@@ -26,19 +26,19 @@ def get_mariadb_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
 
         return MariaDBManagementClient(
             subscription_id=getenv(SUB_ID_OVERRIDE),
             base_url=rm_uri_override,
-            credentials=credentials)
+            credential=credentials)
     # Normal production scenario.
     return get_mgmt_service_client(cli_ctx, MariaDBManagementClient)
 
@@ -54,19 +54,19 @@ def get_mysql_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
 
         return MySQLManagementClient(
             subscription_id=getenv(SUB_ID_OVERRIDE),
             base_url=rm_uri_override,
-            credentials=credentials)
+            credential=credentials)
     # Normal production scenario.
     return get_mgmt_service_client(cli_ctx, MySQLManagementClient)
 
@@ -82,19 +82,19 @@ def get_mysql_flexible_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
 
         return MySQLManagementClient(
             subscription_id=getenv(SUB_ID_OVERRIDE),
             base_url=rm_uri_override,
-            credentials=credentials)
+            credential=credentials)
     # Normal production scenario.
     return get_mgmt_service_client(cli_ctx, MySQLManagementClient)
 
@@ -110,19 +110,19 @@ def get_postgresql_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
 
         return PostgreSQLManagementClient(
             subscription_id=getenv(SUB_ID_OVERRIDE),
             base_url=rm_uri_override,
-            credentials=credentials)
+            credential=credentials)
     # Normal production scenario.
     return get_mgmt_service_client(cli_ctx, PostgreSQLManagementClient)
 
@@ -137,19 +137,19 @@ def get_postgresql_flexible_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
 
         return PostgreSQLManagementClient(
             subscription_id=getenv(SUB_ID_OVERRIDE),
             base_url=rm_uri_override,
-            credentials=credentials)
+            credential=credentials)
     # Normal production scenario.
     return get_mgmt_service_client(cli_ctx, PostgreSQLManagementClient)
 

src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py

@@ -7,13 +7,13 @@
 
 import random
 from knack.log import get_logger
-from msrest.paging import Paged
+from azure.core.paging import ItemPaged
 
 from azure.cli.core.commands import LongRunningOperation, _is_poller
 from azure.cli.core.util import CLIError
 from azure.mgmt.resource.resources.models import ResourceGroup
 from ._client_factory import resource_client_factory, cf_mysql_flexible_location_capabilities, cf_postgres_flexible_location_capabilities
-
+from .flexible_server_custom_common import firewall_rule_create_func
 logger = get_logger(__name__)
 
 DEFAULT_LOCATION_PG = 'eastus'  # For testing: 'eastus2euap'
@@ -106,9 +106,10 @@ def create_firewall_rule(db_context, cmd, resource_group_name, server_name, star
     #    firewall_client.create_or_update(resource_group_name, server_name, firewall_name , start_ip, end_ip),
     #    cmd.cli_ctx, '{} Firewall Rule Create/Update'.format(logging_name))
 
-    firewall = firewall_client.create_or_update(resource_group_name, server_name, firewall_name, start_ip,
-                                                end_ip).result()
-    return firewall.name
+    firewall = firewall_rule_create_func(firewall_client, resource_group_name, server_name, firewall_rule_name=firewall_name,
+                                         start_ip_address=start_ip, end_ip_address=end_ip)
+
+    return firewall.result().name
 
 
 # pylint: disable=inconsistent-return-statements
@@ -253,7 +254,7 @@ def _get_available_values(sku_info, argument, tier=None):
 
 
 def _get_list_from_paged_response(obj_list):
-    return list(obj_list) if isinstance(obj_list, Paged) else obj_list
+    return list(obj_list) if isinstance(obj_list, ItemPaged) else obj_list
 
 
 def _update_location(cmd, resource_group_name):

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

@@ -115,6 +115,7 @@ def _complex_params(command_group):
 
         with self.argument_context('{} server configuration set'.format(command_group)) as c:
             c.argument('value', help='Value of the configuration. If not provided, configuration value will be set to default.', validator=configuration_value_validator)
+            c.argument('configuration_name', options_list=['--name', '-n'], id_part='child_name_1', help='The name of the configuration')
             c.ignore('source')
 
         with self.argument_context('{} server wait'.format(command_group)) as c:
@@ -133,7 +134,9 @@ def _complex_params(command_group):
             c.argument('server_name', id_part=None, help='Name of the Server.')
 
         with self.argument_context('{} db'.format(command_group)) as c:
-            c.argument('database_name', options_list=['--name', '-n'])
+            c.argument('database_name', options_list=['--name', '-n'], help='The name of the database')
+            c.argument('charset', options_list=['--charset'], help='The charset of the database')
+            c.argument('collation', options_list=['--collation'], help='The collation of the database')
 
         with self.argument_context('{} db list'.format(command_group)) as c:
             c.argument('server_name', id_part=None, help='Name of the Server.')
@@ -159,7 +162,7 @@ def _complex_params(command_group):
 
         with self.argument_context('{} server configuration'.format(command_group)) as c:
             c.argument('server_name', options_list=['--server-name', '-s'])
-            c.argument('configuration_name', id_part='child_name_1', options_list=['--name', '-n'])
+            c.argument('configuration_name', options_list=['--name', '-n'], id_part='child_name_1')
 
         with self.argument_context('{} server replica list'.format(command_group)) as c:
             c.argument('server_name', options_list=['--server-name', '-s'], help='Name of the master server.')
@@ -421,17 +424,19 @@ def _flexible_server_params(command_group):
         if command_group == "mysql":
             with self.argument_context('{} flexible-server db'.format(command_group)) as c:
                 c.argument('server_name', options_list=['--server-name', '-s'], help='Name of the server.')
-                c.argument('database_name', arg_type=database_name_arg_type, options_list=['--database-name', '-d'], help='The name of a database.')
+                c.argument('database_name', id_part='child_name_1', arg_type=database_name_arg_type, options_list=['--database-name', '-d'], help='The name of the database.')
 
             with self.argument_context('{} flexible-server db create'.format(command_group)) as c:
-                c.argument('database_name', arg_type=database_name_setter_arg_type, options_list=['--database-name', '-d'], help='The name of a database.')
+                c.argument('charset', options_list=['--charset'], help='The charset of the database')
+                c.argument('collation', options_list=['--collation'], help='The collation of the database')
+                c.argument('database_name', arg_type=database_name_setter_arg_type, options_list=['--database-name', '-d'], help='The name of the database.')
 
             with self.argument_context('{} flexible-server db list'.format(command_group)) as c:
                 c.argument('server_name', id_part=None, options_list=['--server-name', '-s'], arg_type=server_name_arg_type)
-                c.argument('database_name', id_part=None, arg_type=database_name_setter_arg_type, options_list=['--database-name', '-d'], help='The name of a database.')
+                c.argument('database_name', id_part=None, arg_type=database_name_setter_arg_type, options_list=['--database-name', '-d'], help='The name of the database.')
 
             with self.argument_context('{} flexible-server db delete'.format(command_group)) as c:
-                c.argument('database_name', arg_type=database_name_getter_arg_type, options_list=['--database-name', '-d'], help='The name of a database.')
+                c.argument('database_name', arg_type=database_name_getter_arg_type, options_list=['--database-name', '-d'], help='The name of the database.')
                 c.argument('yes', options_list=['--yes', '-y'], action='store_true', help='Do not prompt for confirmation.')
 
         with self.argument_context('{} flexible-server show-connection-string'.format(command_group)) as c:
@@ -440,7 +445,7 @@ def _flexible_server_params(command_group):
                        help='The login username of the administrator.')
             c.argument('administrator_login_password', options_list=['--admin-password', '-p'],
                        help='The login password of the administrator.')
-            c.argument('database_name', arg_type=database_name_arg_type, options_list=['--database-name', '-d'], help='The name of a database.')
+            c.argument('database_name', arg_type=database_name_arg_type, options_list=['--database-name', '-d'], help='The name of the database.')
 
         with self.argument_context('{} flexible-server replica list'.format(command_group)) as c:
             c.argument('server_name', id_part=None, options_list=['--name', '-n'], help='Name of the source server.')

src/azure-cli/azure/cli/command_modules/rdbms/_util.py

@@ -80,6 +80,8 @@ def create_firewall_rule(cmd, resource_group_name, server_name, start_ip, end_ip
     elif db_engine == 'mariadb':
         firewall_client = cf_mariadb_firewall_rules(cmd.cli_ctx, None)
 
-    firewall = firewall_client.create_or_update(resource_group_name, server_name, firewall_name, start_ip,
-                                                end_ip).result()
-    return firewall.name
+    parameters = {'name': firewall_name, 'start_ip_address': start_ip, 'end_ip_address': end_ip}
+
+    firewall = firewall_client.begin_create_or_update(resource_group_name, server_name, firewall_name, parameters)
+
+    return firewall.result().name