[Refactor] General template mismatch fix for 'key'

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/_help.py

@@ -15,7 +15,7 @@
     short-summary: Manage Azure Location Based Services accounts.
 """
 
-helps['locationbasedservices account key'] = """
+helps['locationbasedservices account keys'] = """
     type: group
     short-summary: Manage Azure Location Based Services account keys.
 """
@@ -42,16 +42,16 @@
     short-summary: Delete a Location Based Services account.
 """
 
-helps['locationbasedservices account key list'] = """
+helps['locationbasedservices account keys list'] = """
     type: command
     short-summary: List the keys to use with the Location Based Services APIs.
     long-summary: |
         List the keys to use with the Location Based Services APIs. A key is used to authenticate and authorize access to the Location Based Services REST APIs. Only one key is needed at a time; two are given to provide seamless key regeneration.
 """
 
-helps['locationbasedservices account key regenerate'] = """
+helps['locationbasedservices account keys renew'] = """
     type: command
-    short-summary: Regenerate either the primary or secondary key for use with the Location Based Services APIs.
+    short-summary: Renew either the primary or secondary key for use with the Location Based Services APIs.
     long-summary: |
-        Regenerate either the primary or secondary key for use with the Location Based Services APIs. The old key will stop working immediately.
+        Renew either the primary or secondary key for use with the Location Based Services APIs. The old key will stop working immediately.
 """

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

@@ -44,7 +44,7 @@ def load_arguments(self, _):
                    help='You agree to the Preview Terms. Ignore prompt for confirmation.',
                    action='store_true')
 
-    with self.argument_context('locationbasedservices account key regenerate') as c:
+    with self.argument_context('locationbasedservices account keys regenerate') as c:
         c.argument('key_type',
-                   options_list=['--type', '-t'],
+                   options_list=['--key'],
                    arg_type=get_enum_type(KeyType))

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/commands.py

@@ -18,6 +18,6 @@ def load_command_table(self, _):
         g.custom_command('create', 'create')
         g.command('delete', 'delete')
 
-    with self.command_group('locationbasedservices account key', mgmt_type) as g:
-        g.command('regenerate', 'regenerate_keys')
+    with self.command_group('locationbasedservices account keys', mgmt_type) as g:
+        g.command('renew', 'regenerate_keys')
         g.command('list', 'list_keys')

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/tests/latest/test_lbs_commands.py

@@ -103,7 +103,7 @@ def test_create_locationbasedservices_account(self, resource_group):
 
         # Test 'az locationbasedservices account key list'.
         # Test to list keys for an LocationBasedServices account.
-        account_key_list = self.cmd('az locationbasedservices account key list -n {name} -g {rg}', checks=[
+        account_key_list = self.cmd('az locationbasedservices account keys list -n {name} -g {rg}', checks=[
             self.check('id', account['id']),
             self.check('resourceGroup', '{rg}')
         ]).get_output_in_json()
@@ -117,7 +117,7 @@ def test_create_locationbasedservices_account(self, resource_group):
         # Test 'az locationbasedservices account key regenerate'.
         # Test to change primary and secondary keys for an LocationBasedServices account.
         key_regenerated = self.cmd(
-            'az locationbasedservices account key regenerate -n {name} -g {rg} -t {key_type_primary}', checks=[
+            'az locationbasedservices account keys renew -n {name} -g {rg} -t {key_type_primary}', checks=[
                 self.check('id', account['id']),
                 self.check('resourceGroup', '{rg}')
             ]).get_output_in_json()
@@ -129,7 +129,7 @@ def test_create_locationbasedservices_account(self, resource_group):
         # Save the new primary key, and regenerate the secondary key.
         primary_key_old = key_regenerated['primaryKey']
         key_regenerated = self.cmd(
-            'az locationbasedservices account key regenerate -n {name} -g {rg} -t {key_type_secondary}') \
+            'az locationbasedservices account keys renew -n {name} -g {rg} -t {key_type_secondary}') \
             .get_output_in_json()
         self.assertEqual(primary_key_old, key_regenerated['primaryKey'])
         self.assertNotEqual(secondary_key_old, key_regenerated['secondaryKey'])