AzCli support for checkpoint operations and added deleteFromHost flag for VM delete

src/scvmm/azext_scvmm/_help.py

@@ -608,6 +608,11 @@
         text: |-
                 az scvmm vm delete --subscription contoso-sub \
 --resource-group contoso-rg --name contoso-avset --force
+
+      - name: Delete the VM from SCVMM
+        text: |-
+                az scvmm vm delete --subscription contoso-sub \
+--resource-group contoso-rg --name contoso-avset --deleteFromHost
 """
 
 helps[
@@ -684,6 +689,43 @@
 --resource-group contoso-rg --name contoso-vm
 """
 
+helps[
+    'scvmm vm create-checkpoint'
+] = """
+    type: command
+    short-summary: Create a VM checkpoint
+    examples:
+      - name: Create VM checkpoint
+        text: |-
+               az scvmm vm create-checkpoint --subscription contoso-sub \
+--resource-group contoso-rg --name contoso-vm --checkpoint-name contoso-chkpt-name \
+--checkpoint-description contoso-chkpt-description
+"""
+
+helps[
+    'scvmm vm delete-checkpoint'
+] = """
+    type: command
+    short-summary: Deletes the specified VM checkpoint
+    examples:
+      - name: Delete VM checkpoint
+        text: |-
+               az scvmm vm delete-checkpoint --subscription contoso-sub \
+--resource-group contoso-rg --name contoso-vm --checkpoint-id checkpoint-guid
+"""
+
+helps[
+    'scvmm vm restore-checkpoint'
+] = """
+    type: command
+    short-summary: Restores to VM checkpoint
+    examples:
+      - name: Restores VM checkpoint
+        text: |-
+               az scvmm vm restore-checkpoint --subscription contoso-sub \
+--resource-group contoso-rg --name contoso-vm --checkpoint-id checkpoint-guid
+"""
+
 helps[
     'scvmm vm update'
 ] = """

src/scvmm/azext_scvmm/_params.py

@@ -170,6 +170,33 @@ def load_arguments(self: AzCommandsLoader, _):
             help="Skip shutdown and power-off immediately.",
         )
 
+    with self.argument_context('scvmm vm create-checkpoint') as c:
+        c.argument(
+            'checkpoint_name',
+            options_list=['--checkpoint-name'],
+            help="Name of the checkpoint to be created.",
+        )
+
+        c.argument(
+            'checkpoint_description',
+            options_list=['--checkpoint-description'],
+            help="Description of the checkpoint to be created.",
+        )
+
+    with self.argument_context('scvmm vm delete-checkpoint') as c:
+        c.argument(
+            'checkpoint_id',
+            options_list=['--checkpoint-id'],
+            help="Checkpoint UUID.",
+        )
+
+    with self.argument_context('scvmm vm restore-checkpoint') as c:
+        c.argument(
+            'checkpoint_id',
+            options_list=['--checkpoint-id'],
+            help="Checkpoint UUID.",
+        )
+
     with self.argument_context('scvmm vm nic') as c:
         c.argument('nic_name', options_list=['--name', '-n'], help="Name of the NIC.")
         c.argument('nic_id', options_list=['--nic-id'], help="UUID of the NIC.")
@@ -255,6 +282,11 @@ def load_arguments(self: AzCommandsLoader, _):
             action='store_true',
             help='Disable the VM from azure but retain the VM in VMM.',
         )
+        c.argument(
+            'deleteFromHost',
+            action='store_true',
+            help='Delete the VM from the SCVMM.',
+        )
 
     with self.argument_context('scvmm avset') as c:
         c.argument(

src/scvmm/azext_scvmm/commands.py

@@ -146,6 +146,9 @@ def load_command_table(self: AzCommandsLoader, _):
         g.custom_command('start', 'start_vm', supports_no_wait=True)
         g.custom_command('stop', 'stop_vm', supports_no_wait=True)
         g.custom_command('restart', 'restart_vm', supports_no_wait=True)
+        g.custom_command('create-checkpoint', 'create_vm_checkpoint', supports_no_wait=True)
+        g.custom_command('delete-checkpoint', 'delete_vm_checkpoint', supports_no_wait=True)
+        g.custom_command('restore-checkpoint', 'restore_vm_checkpoint', supports_no_wait=True)
         g.wait_command('wait')
 
     with self.command_group(

src/scvmm/azext_scvmm/custom.py

@@ -43,6 +43,9 @@
     HardwareProfileUpdate,
     OsProfile,
     VirtualMachine,
+    VirtualMachineCreateCheckpoint,
+    VirtualMachineDeleteCheckpoint,
+    VirtualMachineRestoreCheckpoint,
     VirtualMachineUpdate,
     VirtualMachineUpdateProperties,
     VirtualMachineTemplate,
@@ -607,6 +610,7 @@ def delete_vm(
     resource_name,
     retain=None,
     force=None,
+    deleteFromHost=None,
     no_wait=False,
 ):
     return sdk_no_wait(
@@ -616,6 +620,7 @@ def delete_vm(
         resource_name,
         retain,
         force,
+        deleteFromHost,
     )
 
 
@@ -665,6 +670,49 @@ def restart_vm(
     )
 
 
+def create_vm_checkpoint(
+    cmd,
+    client: VirtualMachinesOperations,
+    resource_group_name,
+    resource_name,
+    checkpoint_name,
+    checkpoint_description,
+    no_wait=False,
+):
+    body = VirtualMachineCreateCheckpoint(name=checkpoint_name, description=checkpoint_description)
+    return sdk_no_wait(
+        no_wait, client.begin_create_checkpoint, resource_group_name, resource_name, body
+    )
+
+
+def delete_vm_checkpoint(
+    cmd,
+    client: VirtualMachinesOperations,
+    resource_group_name,
+    resource_name,
+    checkpoint_id,
+    no_wait=False,
+):
+    body = VirtualMachineDeleteCheckpoint(id=checkpoint_id)
+    return sdk_no_wait(
+        no_wait, client.begin_delete_checkpoint, resource_group_name, resource_name, body
+    )
+
+
+def restore_vm_checkpoint(
+    cmd,
+    client: VirtualMachinesOperations,
+    resource_group_name,
+    resource_name,
+    checkpoint_id,
+    no_wait=False,
+):
+    body = VirtualMachineRestoreCheckpoint(id=checkpoint_id)
+    return sdk_no_wait(
+        no_wait, client.begin_restore_checkpoint, resource_group_name, resource_name, body
+    )
+
+
 def get_network_interfaces(
     cmd, client: VirtualMachinesOperations, resource_group_name, input_nics
 ):

src/scvmm/azext_scvmm/vendored_sdks/aio/operations/_virtual_machines_operations.py

@@ -241,6 +241,7 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
         virtual_machine_name: str,
         retain: Optional[bool] = None,
         force: Optional[bool] = None,
+        delete_from_host: Optional[bool] = None,
         **kwargs: Any
     ) -> None:
         cls = kwargs.pop('cls', None)  # type: ClsType[None]
@@ -259,6 +260,7 @@ async def _delete_initial(  # pylint: disable=inconsistent-return-statements
             api_version=api_version,
             retain=retain,
             force=force,
+            delete_from_host=delete_from_host,
             template_url=self._delete_initial.metadata['url'],
         )
         request = _convert_request(request)
@@ -288,6 +290,7 @@ async def begin_delete(  # pylint: disable=inconsistent-return-statements
         virtual_machine_name: str,
         retain: Optional[bool] = None,
         force: Optional[bool] = None,
+        delete_from_host: Optional[bool] = None,
         **kwargs: Any
     ) -> AsyncLROPoller[None]:
         """Implements VirtualMachine DELETE method.
@@ -304,6 +307,8 @@ async def begin_delete(  # pylint: disable=inconsistent-return-statements
         :param force: Forces the resource to be deleted from azure. The corresponding CR would be
          attempted to be deleted too. Default value is None.
         :type force: bool
+        :param delete_from_host: Delete the VM from SCVMM. Default value is None.
+        :type delete_from_host: bool
         :keyword callable cls: A custom type or function that will be passed the direct response
         :keyword str continuation_token: A continuation token to restart a poller from a saved state.
         :keyword polling: By default, your polling method will be AsyncARMPolling. Pass in False for
@@ -330,6 +335,7 @@ async def begin_delete(  # pylint: disable=inconsistent-return-statements
                 virtual_machine_name=virtual_machine_name,
                 retain=retain,
                 force=force,
+                delete_from_host=delete_from_host,
                 api_version=api_version,
                 cls=lambda x,y,z: x,
                 **kwargs

src/scvmm/azext_scvmm/vendored_sdks/operations/_virtual_machines_operations.py

@@ -120,6 +120,7 @@ def build_delete_request_initial(
     api_version = kwargs.pop('api_version', "2020-06-05-preview")  # type: str
     retain = kwargs.pop('retain', None)  # type: Optional[bool]
     force = kwargs.pop('force', None)  # type: Optional[bool]
+    deleteFromHost = kwargs.pop('deleteFromHost', None)  # type: Optional[bool]
 
     accept = "application/json"
     # Construct URL
@@ -139,6 +140,8 @@ def build_delete_request_initial(
         _query_parameters['retain'] = _SERIALIZER.query("retain", retain, 'bool')
     if force is not None:
         _query_parameters['force'] = _SERIALIZER.query("force", force, 'bool')
+    if deleteFromHost is not None:
+        _query_parameters['deleteFromHost'] = _SERIALIZER.query("deleteFromHost", deleteFromHost, 'bool')
 
     # Construct headers
     _header_parameters = kwargs.pop("headers", {})  # type: Dict[str, Any]
@@ -714,6 +717,7 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
         virtual_machine_name,  # type: str
         retain=None,  # type: Optional[bool]
         force=None,  # type: Optional[bool]
+        deleteFromHost=None,  # type: Optional[bool]
         **kwargs  # type: Any
     ):
         # type: (...) -> None
@@ -733,6 +737,7 @@ def _delete_initial(  # pylint: disable=inconsistent-return-statements
             api_version=api_version,
             retain=retain,
             force=force,
+            deleteFromHost=deleteFromHost,
             template_url=self._delete_initial.metadata['url'],
         )
         request = _convert_request(request)
@@ -762,6 +767,7 @@ def begin_delete(  # pylint: disable=inconsistent-return-statements
         virtual_machine_name,  # type: str
         retain=None,  # type: Optional[bool]
         force=None,  # type: Optional[bool]
+        deleteFromHost=None,  # type: Optional[bool]
         **kwargs  # type: Any
     ):
         # type: (...) -> LROPoller[None]
@@ -779,6 +785,8 @@ def begin_delete(  # pylint: disable=inconsistent-return-statements
         :param force: Forces the resource to be deleted from azure. The corresponding CR would be
          attempted to be deleted too. Default value is None.
         :type force: bool
+        :param deleteFromHost: Deletes the VM from the SCVMM. Default value is None.
+        :type deleteFromHost: bool
         :keyword callable cls: A custom type or function that will be passed the direct response
         :keyword str continuation_token: A continuation token to restart a poller from a saved state.
         :keyword polling: By default, your polling method will be ARMPolling. Pass in False for this
@@ -805,6 +813,7 @@ def begin_delete(  # pylint: disable=inconsistent-return-statements
                 virtual_machine_name=virtual_machine_name,
                 retain=retain,
                 force=force,
+                deleteFromHost=deleteFromHost,
                 api_version=api_version,
                 cls=lambda x,y,z: x,
                 **kwargs