update code

Author: cxznmhdcxz

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

@@ -161,7 +161,3 @@ def cf_capacity_reservations(cli_ctx, *_):
 
 def cf_restore_point(cli_ctx, *_):
     return cf_vm_cl(cli_ctx).restore_points
-
-
-def cf_restore_point_collection(cli_ctx, *_):
-    return cf_vm_cl(cli_ctx).restore_point_collections

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

@@ -3015,23 +3015,6 @@
                az restore-point collection show --resource-group "myResourceGroup" --collection-name "rpcName"
 """
 
-helps['restore-point collection create'] = """
-    type: command
-    short-summary: "Create the restore point collection. Please refer to https://aka.ms/RestorePoints \
-for more details. When updating a restore point collection, only tags may be modified."
-    examples:
-      - name: Create or update a restore point collection.
-        text: |-
-               az restore-point collection create --location "norwayeast" --source-id "/subscriptions/{subscription-id}\
-/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachines/myVM" --tags myTag1="tagValue1" \
---resource-group "myResourceGroup" --collection-name "myRpc"
-"""
-
-helps['restore-point collection update'] = """
-    type: command
-    short-summary: "Update the restore point collection."
-"""
-
 helps['restore-point collection wait'] = """
     type: command
     short-summary: Place the CLI in a waiting state until a condition of the restore-point-collection is met.

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

@@ -1516,16 +1516,6 @@ def load_arguments(self, _):
     # endRegion
 
     # region Restore point collection
-    with self.argument_context('restore-point collection create') as c:
-        c.argument('location', arg_type=get_location_type(self.cli_ctx), required=False,
-                   validator=get_default_location_from_resource_group)
-        c.argument('tags', tags_type)
-        c.argument('source_id', help='Resource Id of the source resource used to create this restore point collection',
-                   arg_group='Source')
-
-    with self.argument_context('restore-point collection update') as c:
-        c.argument('tags', tags_type)
-
     with self.argument_context('restore-point collection show') as c:
         c.argument('expand', help='The expand expression to apply on the operation.',
                    deprecate_info=c.deprecate(hide=True))

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

@@ -14,7 +14,7 @@
                                                           cf_log_analytics_data_plane,
                                                           cf_capacity_reservation_groups, cf_capacity_reservations,
                                                           cf_restore_point,
-                                                          cf_restore_point_collection, cf_community_gallery)
+                                                          cf_community_gallery)
 from azure.cli.command_modules.vm._format import (
     transform_ip_addresses, transform_vm, transform_vm_create_output, transform_vm_usage_list, transform_vm_list,
     transform_disk_create_table_output, transform_sku_for_table_output, transform_disk_show_table_output,
@@ -199,8 +199,7 @@ def load_command_table(self, _):
     )
 
     restore_point_collection = CliCommandType(
-        operations_tmpl='azure.mgmt.compute.operations#RestorePointCollectionsOperations.{}',
-        client_factory=cf_restore_point_collection
+        operations_tmpl='azure.mgmt.compute.operations#RestorePointCollectionsOperations.{}'
     )
 
     community_gallery_sdk = CliCommandType(
@@ -562,9 +561,6 @@ def load_command_table(self, _):
         g.custom_command('create', 'restore_point_create', supports_no_wait=True)
         g.wait_command('wait')
 
-    with self.command_group('restore-point collection', restore_point_collection, min_api='2021-03-01',
-                            client_factory=cf_restore_point_collection) as g:
+    with self.command_group('restore-point collection', restore_point_collection) as g:
         g.custom_show_command('show', 'restore_point_collection_show')
-        g.custom_command('create', 'restore_point_collection_create')
-        g.custom_command('update', 'restore_point_collection_update')
         g.wait_command('wait')

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

@@ -5962,46 +5962,19 @@ def restore_point_show(client,
 
 
 # region Restore point collection
-def restore_point_collection_show(client,
+def restore_point_collection_show(cmd,
                                   resource_group_name,
                                   restore_point_collection_name,
                                   expand=None,
                                   restore_points=None):
+    from .aaz.latest.restore_point.collection import Show
+    args = {
+        "resource_group": resource_group_name,
+        "restore_point_collection_name": restore_point_collection_name,
+    }
     if restore_points is not None:
-        expand = 'restorePoints'
-    return client.get(resource_group_name=resource_group_name,
-                      restore_point_collection_name=restore_point_collection_name,
-                      expand=expand)
-
-
-def restore_point_collection_create(client,
-                                    resource_group_name,
-                                    restore_point_collection_name,
-                                    location,
-                                    source_id,
-                                    tags=None):
-    parameters = {}
-    properties = {}
-    parameters['location'] = location
-    if tags is not None:
-        parameters['tags'] = tags
-    properties['source'] = {'id': source_id}
-    parameters['properties'] = properties
-    return client.create_or_update(resource_group_name=resource_group_name,
-                                   restore_point_collection_name=restore_point_collection_name,
-                                   parameters=parameters)
-
-
-def restore_point_collection_update(client,
-                                    resource_group_name,
-                                    restore_point_collection_name,
-                                    tags=None):
-    parameters = {}
-    if tags is not None:
-        parameters['tags'] = tags
-    return client.update(resource_group_name=resource_group_name,
-                         restore_point_collection_name=restore_point_collection_name,
-                         parameters=parameters)
+        args.expand = 'restorePoints'
+    return Show(cli_ctx=cmd.cli_ctx)(command_args=args)
 
 # endRegion