CodeGen from PR 15417 in Azure/azure-rest-api-specs

Merge 3e1538958f5f39a34fa41540cc5931fff5652a27 into 7cc0a47

Author: SDKAuto

src/redisenterprise/HISTORY.rst

@@ -3,11 +3,6 @@
 Release History
 ===============
 
-0.1.1
-++++++
-* Renamed remaining snake_case command output fields to camelCase to be consistent with the REST API.
-* Listed the following cluster attribute as null in the command output when the cluster attribute is null: zones.
-
 0.1.0
 ++++++
 * Initial release.

src/redisenterprise/azext_redisenterprise/azext_metadata.json

@@ -1,4 +1,3 @@
 {
-    "azext.isPreview": true,
     "azext.minCliCoreVersion": "2.15.0"
 }

src/redisenterprise/azext_redisenterprise/generated/_help.py

@@ -193,12 +193,13 @@
 
 helps['redisenterprise database import'] = """
     type: command
-    short-summary: "Imports a database file to target database."
+    short-summary: "Imports database files to target database."
     examples:
       - name: RedisEnterpriseDatabasesImport
         text: |-
-               az redisenterprise database import --cluster-name "cache1" --sas-uri "https://contosostorage.blob.core.w\
-indow.net/urltoBlobFile?sasKeyParameters" --resource-group "rg1"
+               az redisenterprise database import --cluster-name "cache1" --sas-uris "https://contosostorage.blob.core.\
+window.net/urltoBlobFile1?sasKeyParameters" "https://contosostorage.blob.core.window.net/urltoBlobFile2?sasKeyParameter\
+s" --resource-group "rg1"
 """
 
 helps['redisenterprise database list-keys'] = """

src/redisenterprise/azext_redisenterprise/generated/_params.py

@@ -136,7 +136,7 @@ def load_arguments(self, _):
         c.argument('resource_group_name', resource_group_name_type)
         c.argument('cluster_name', options_list=['--cluster-name', '--name', '-n'], type=str, help='The name of the '
                    'RedisEnterprise cluster.', id_part='name')
-        c.argument('sas_uri', type=str, help='SAS URI for the target blob to import from')
+        c.argument('sas_uris', nargs='+', help='SAS URIs for the target blobs to import from')
 
     with self.argument_context('redisenterprise database list-keys') as c:
         c.argument('resource_group_name', resource_group_name_type)

src/redisenterprise/azext_redisenterprise/generated/commands.py

@@ -9,33 +9,28 @@
 # --------------------------------------------------------------------------
 # pylint: disable=too-many-statements
 # pylint: disable=too-many-locals
-# pylint: disable=line-too-long
 
 from azure.cli.core.commands import CliCommandType
 
 
 def load_command_table(self, _):
 
     from azext_redisenterprise.generated._client_factory import cf_operation_status
-
     redisenterprise_operation_status = CliCommandType(
-        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._operations_status_operations#OperationsStatusOperations.{}',
-        client_factory=cf_operation_status,
-    )
-    with self.command_group(
-            'redisenterprise operation-status', redisenterprise_operation_status, client_factory=cf_operation_status
-    ) as g:
+        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._operations_status_operations#O'
+        'perationsStatusOperations.{}',
+        client_factory=cf_operation_status)
+    with self.command_group('redisenterprise operation-status', redisenterprise_operation_status,
+                            client_factory=cf_operation_status) as g:
         g.custom_show_command('show', 'redisenterprise_operation_status_show')
 
     from azext_redisenterprise.generated._client_factory import cf_redis_enterprise
-
     redisenterprise_redis_enterprise = CliCommandType(
-        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._redis_enterprise_operations#RedisEnterpriseOperations.{}',
-        client_factory=cf_redis_enterprise,
-    )
-    with self.command_group(
-            'redisenterprise', redisenterprise_redis_enterprise, client_factory=cf_redis_enterprise
-    ) as g:
+        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._redis_enterprise_operations#Re'
+        'disEnterpriseOperations.{}',
+        client_factory=cf_redis_enterprise)
+    with self.command_group('redisenterprise', redisenterprise_redis_enterprise,
+                            client_factory=cf_redis_enterprise) as g:
         g.custom_command('list', 'redisenterprise_list')
         g.custom_show_command('show', 'redisenterprise_show')
         g.custom_command('create', 'redisenterprise_create', supports_no_wait=True)
@@ -44,11 +39,10 @@ def load_command_table(self, _):
         g.custom_wait_command('wait', 'redisenterprise_show')
 
     from azext_redisenterprise.generated._client_factory import cf_database
-
     redisenterprise_database = CliCommandType(
-        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._databases_operations#DatabasesOperations.{}',
-        client_factory=cf_database,
-    )
+        operations_tmpl='azext_redisenterprise.vendored_sdks.redisenterprise.operations._databases_operations#Databases'
+        'Operations.{}',
+        client_factory=cf_database)
     with self.command_group('redisenterprise database', redisenterprise_database, client_factory=cf_database) as g:
         g.custom_command('list', 'redisenterprise_database_list')
         g.custom_show_command('show', 'redisenterprise_database_show')

src/redisenterprise/azext_redisenterprise/generated/custom.py

@@ -49,7 +49,6 @@ def redisenterprise_create(client,
     parameters['sku'] = {}
     parameters['sku']['name'] = sku
     parameters['sku']['capacity'] = capacity
-    parameters['zones'] = zones
     parameters['minimum_tls_version'] = minimum_tls_version
     return sdk_no_wait(no_wait,
                        client.begin_create,
@@ -70,7 +69,6 @@ def redisenterprise_update(client,
     parameters['sku'] = {}
     parameters['sku']['name'] = sku
     parameters['sku']['capacity'] = capacity
-    parameters['tags'] = tags
     parameters['minimum_tls_version'] = minimum_tls_version
     return sdk_no_wait(no_wait,
                        client.begin_update,
@@ -177,10 +175,10 @@ def redisenterprise_database_export(client,
 def redisenterprise_database_import(client,
                                     resource_group_name,
                                     cluster_name,
-                                    sas_uri,
+                                    sas_uris,
                                     no_wait=False):
     parameters = {}
-    parameters['sas_uri'] = sas_uri
+    parameters['sas_uris'] = sas_uris
     return sdk_no_wait(no_wait,
                        client.begin_import_method,
                        resource_group_name=resource_group_name,

src/redisenterprise/azext_redisenterprise/tests/latest/example_steps.py

@@ -7,7 +7,6 @@
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 # --------------------------------------------------------------------------
-# pylint: disable=unused-argument
 
 
 from .. import try_manual
@@ -87,7 +86,8 @@ def step_database_import(test, rg, checks=None):
         checks = []
     test.cmd('az redisenterprise database import '
              '--cluster-name "cache1" '
-             '--sas-uri "https://contosostorage.blob.core.window.net/urltoBlobFile?sasKeyParameters" '
+             '--sas-uris "https://contosostorage.blob.core.window.net/urltoBlobFile1?sasKeyParameters" '
+             '"https://contosostorage.blob.core.window.net/urltoBlobFile2?sasKeyParameters" '
              '--resource-group "{rg}"',
              checks=checks)
 
@@ -209,3 +209,4 @@ def step_delete(test, rg, checks=None):
              '--cluster-name "cache1" '
              '--resource-group "{rg}"',
              checks=checks)
+

src/redisenterprise/azext_redisenterprise/tests/latest/test_redisenterprise_scenario.py

@@ -67,6 +67,7 @@ class Redisenterprisescenario1Test(ScenarioTest):
     def __init__(self, *args, **kwargs):
         super(Redisenterprisescenario1Test, self).__init__(*args, **kwargs)
 
+
     @ResourceGroupPreparer(name_prefix='clitestredisenterprise_rg1'[:7], key='rg', parameter_name='rg')
     def test_redisenterprise_scenario1(self, rg):
         call_scenario1(self, rg)
@@ -111,8 +112,10 @@ class Redisenterprisescenario2Test(ScenarioTest):
     def __init__(self, *args, **kwargs):
         super(Redisenterprisescenario2Test, self).__init__(*args, **kwargs)
 
+
     @ResourceGroupPreparer(name_prefix='clitestredisenterprise_rg1'[:7], key='rg', parameter_name='rg')
     def test_redisenterprise_scenario2(self, rg):
         call_scenario2(self, rg)
         calc_coverage(__file__)
         raise_if()
+

src/redisenterprise/azext_redisenterprise/vendored_sdks/redisenterprise/__init__.py

@@ -7,9 +7,6 @@
 # --------------------------------------------------------------------------
 
 from ._redis_enterprise_management_client import RedisEnterpriseManagementClient
-from ._version import VERSION
-
-__version__ = VERSION
 __all__ = ['RedisEnterpriseManagementClient']
 
 try:

src/redisenterprise/azext_redisenterprise/vendored_sdks/redisenterprise/_configuration.py

@@ -12,14 +12,13 @@
 from azure.core.pipeline import policies
 from azure.mgmt.core.policies import ARMHttpLoggingPolicy
 
-from ._version import VERSION
-
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from typing import Any
 
     from azure.core.credentials import TokenCredential
 
+VERSION = "unknown"
 
 class RedisEnterpriseManagementClientConfiguration(Configuration):
     """Configuration for RedisEnterpriseManagementClient.
@@ -48,9 +47,9 @@ def __init__(
 
         self.credential = credential
         self.subscription_id = subscription_id
-        self.api_version = "2021-03-01"
+        self.api_version = "2021-08-01"
         self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
-        kwargs.setdefault('sdk_moniker', 'mgmt-redisenterprise/{}'.format(VERSION))
+        kwargs.setdefault('sdk_moniker', 'redisenterprisemanagementclient/{}'.format(VERSION))
         self._configure(**kwargs)
 
     def _configure(