From 4cd87e8c15563eb9790fbd1dcc0fc1d43a730b8e Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 30 Sep 2024 07:31:59 +0000 Subject: [PATCH 1/5] update eulerlauncher/backends/mac/instance_handler.py. Signed-off-by: xuyongliang_01 --- eulerlauncher/backends/mac/instance_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eulerlauncher/backends/mac/instance_handler.py b/eulerlauncher/backends/mac/instance_handler.py index 53152dc..2162852 100644 --- a/eulerlauncher/backends/mac/instance_handler.py +++ b/eulerlauncher/backends/mac/instance_handler.py @@ -166,7 +166,7 @@ class MacInstanceHandler(object): if instance_pid in psutil.pids() and \ psutil.Process(instance_pid).is_running(): psutil.Process(instance_pid).kill() - self.LOG.debug(f'Instance: {name} with PID {instance_pid} succesfully killed ...') + self.LOG.debug(f'Instance: {name} with PID {instance_pid} successfully killed ...') else: self.LOG.debug(f'Instance: {name} with PID {instance_pid} already stopped, skip ...') else: @@ -195,7 +195,7 @@ class MacInstanceHandler(object): shutil.copyfile(vm_root_disk_src_path, vm_root_disk_dst_path) self.delete_instance(name, instance_record, all_instances) self.driver.take_and_export_snapshot(snapshot_name, vm_root_disk_dst_path, snapshot_name, dest_path) - # a little hack here, since the running vm's image is already deleted, change the local image path to the copyed image path + # a little hack here, since the running vm's image is already deleted, change the local image path to the copied image path all_images['local'][vm_img_id]['path'] = vm_root_disk_dst_path self.create_instance(name, vm_img_id, instance_record, all_instances, all_images, True, mac_address, vm_uuid, 'x86') os.remove(vm_root_disk_dst_path) -- Gitee From 7b074ae189326b77176fb29404651f98c727c118 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 30 Sep 2024 07:32:22 +0000 Subject: [PATCH 2/5] update eulerlauncher/backends/mac/image_handler.py. Signed-off-by: xuyongliang_01 --- eulerlauncher/backends/mac/image_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulerlauncher/backends/mac/image_handler.py b/eulerlauncher/backends/mac/image_handler.py index 122ac76..8b022e2 100644 --- a/eulerlauncher/backends/mac/image_handler.py +++ b/eulerlauncher/backends/mac/image_handler.py @@ -48,7 +48,7 @@ class MacImageHandler(object): self.LOG.debug(' '.join(download_cmd)) subprocess.call(' '.join(download_cmd), shell=True) #wget.download(url=images['remote'][img_to_download]['path'], out=os.path.join(self.image_dir, img_name), bar=None) - self.LOG.debug(f'Image: {img_to_download} succesfully downloaded from remote repo ...') + self.LOG.debug(f'Image: {img_to_download} successfully downloaded from remote repo ...') # Decompress the image self.LOG.debug(f'Decompressing image file: {img_name} ...') -- Gitee From 5b27fed26bc4f47a90d02b31c322a275a05ecb88 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 30 Sep 2024 07:32:51 +0000 Subject: [PATCH 3/5] update eulerlauncher/backends/win/image_handler.py. Signed-off-by: xuyongliang_01 --- eulerlauncher/backends/win/image_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulerlauncher/backends/win/image_handler.py b/eulerlauncher/backends/win/image_handler.py index f0398a5..fe20238 100644 --- a/eulerlauncher/backends/win/image_handler.py +++ b/eulerlauncher/backends/win/image_handler.py @@ -46,7 +46,7 @@ class WinImageHandler(object): images['local'][img_to_download] = img_dict omni_utils.save_json_data(self.image_record_file, images) wget.download(url=images['remote'][img_to_download]['path'], out=os.path.join(self.image_dir, img_name), bar=progress_bar) - self.LOG.debug(f'Image: {img_to_download} succesfully downloaded from remote repo ...') + self.LOG.debug(f'Image: {img_to_download} successfully downloaded from remote repo ...') # Decompress the image self.LOG.debug(f'Decompressing image file: {img_name} ...') -- Gitee From d156fb623fa681700a706e7c87f2ccc823825b60 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 30 Sep 2024 07:33:13 +0000 Subject: [PATCH 4/5] update eulerlauncher/backends/win/instance_handler.py. Signed-off-by: xuyongliang_01 --- eulerlauncher/backends/win/instance_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulerlauncher/backends/win/instance_handler.py b/eulerlauncher/backends/win/instance_handler.py index 1eaf855..b21c98b 100644 --- a/eulerlauncher/backends/win/instance_handler.py +++ b/eulerlauncher/backends/win/instance_handler.py @@ -136,7 +136,7 @@ class WinInstanceHandler(object): if child.pid in psutil.pids() and \ child.is_running(): child.kill() - self.LOG.debug(f'Instance: {child.name()} with PID {child.pid} succesfully killed ...') + self.LOG.debug(f'Instance: {child.name()} with PID {child.pid} successfully killed ...') else: self.LOG.debug(f'Instance: {child.name()} with PID {child.pid} already stopped, skip ...') -- Gitee From 2a95d214f42667d960b2df6f0afb7e8b1e5e0d6d Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 30 Sep 2024 07:34:20 +0000 Subject: [PATCH 5/5] update eulerlauncher/services/instance_service.py. Signed-off-by: xuyongliang_01 --- eulerlauncher/services/instance_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulerlauncher/services/instance_service.py b/eulerlauncher/services/instance_service.py index 4489491..018063d 100644 --- a/eulerlauncher/services/instance_service.py +++ b/eulerlauncher/services/instance_service.py @@ -73,7 +73,7 @@ class InstanceService(instances_pb2_grpc.InstanceGrpcServiceServicer): check_result = self.backend.check_names(request.name, all_instances) if check_result == 1: - msg = f'Error: Instance with name {request.name} already exist in exixting Hyper-V or Qemu backend, please specify another name.' + msg = f'Error: Instance with name {request.name} already exist in existing Hyper-V or Qemu backend, please specify another name.' return instances_pb2.CreateInstanceResponse(ret=2, msg=msg) vm = self.backend.create_instance( -- Gitee