From f328b812edf8a75c498584b98348b6558baa2db0 Mon Sep 17 00:00:00 2001 From: Gerorge Liao Date: Mon, 6 May 2024 18:23:47 +0200 Subject: [PATCH] [vm image] improve one function parameter name. --- include/multipass/vm_image_vault.h | 2 +- src/daemon/default_vm_image_vault.cpp | 12 +++++++----- src/daemon/default_vm_image_vault.h | 2 +- src/platform/backends/lxd/lxd_vm_image_vault.h | 2 +- tests/stub_vm_image_vault.h | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/multipass/vm_image_vault.h b/include/multipass/vm_image_vault.h index 645f6dfbaa..d458880b61 100644 --- a/include/multipass/vm_image_vault.h +++ b/include/multipass/vm_image_vault.h @@ -93,7 +93,7 @@ class VMImageVault : private DisabledCopyMove virtual void update_images(const FetchType& fetch_type, const PrepareAction& prepare, const ProgressMonitor& monitor) = 0; virtual MemorySize minimum_image_size_for(const std::string& id) = 0; - virtual void clone(const std::string& source_instance_name, const std::string& dist_instance_name) = 0; + virtual void clone(const std::string& source_instance_name, const std::string& destination_instance_name) = 0; virtual VMImageHost* image_host_for(const std::string& remote_name) const = 0; virtual std::vector> all_info_for(const Query& query) const = 0; diff --git a/src/daemon/default_vm_image_vault.cpp b/src/daemon/default_vm_image_vault.cpp index 6c98f4a08a..8bfea1043f 100644 --- a/src/daemon/default_vm_image_vault.cpp +++ b/src/daemon/default_vm_image_vault.cpp @@ -582,7 +582,8 @@ mp::MemorySize mp::DefaultVMImageVault::minimum_image_size_for(const std::string throw std::runtime_error(fmt::format("Cannot determine minimum image size for id \'{}\'", id)); } -void mp::DefaultVMImageVault::clone(const std::string& source_instance_name, const std::string& dist_instance_name) +void mp::DefaultVMImageVault::clone(const std::string& source_instance_name, + const std::string& destination_instance_name) { const auto source_iter = instance_image_records.find(source_instance_name); @@ -591,13 +592,14 @@ void mp::DefaultVMImageVault::clone(const std::string& source_instance_name, con throw std::runtime_error(source_instance_name + " does not exist in the image records"); } - if (instance_image_records.find(dist_instance_name) != instance_image_records.end()) + if (instance_image_records.find(destination_instance_name) != instance_image_records.end()) { - throw std::runtime_error(dist_instance_name + " already exists in the image records"); + throw std::runtime_error(destination_instance_name + " already exists in the image records"); } - auto& dest_vault_record = instance_image_records[dist_instance_name] = instance_image_records[source_instance_name]; - dest_vault_record.image.image_path.replace(source_instance_name.c_str(), dist_instance_name.c_str()); + auto& dest_vault_record = instance_image_records[destination_instance_name] = + instance_image_records[source_instance_name]; + dest_vault_record.image.image_path.replace(source_instance_name.c_str(), destination_instance_name.c_str()); // change last accessed? persist_instance_records(); } diff --git a/src/daemon/default_vm_image_vault.h b/src/daemon/default_vm_image_vault.h index b8a28f55d4..37db7c653d 100644 --- a/src/daemon/default_vm_image_vault.h +++ b/src/daemon/default_vm_image_vault.h @@ -65,7 +65,7 @@ class DefaultVMImageVault final : public BaseVMImageVault void update_images(const FetchType& fetch_type, const PrepareAction& prepare, const ProgressMonitor& monitor) override; MemorySize minimum_image_size_for(const std::string& id) override; - void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override; + void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override; private: VMImage image_instance_from(const VMImage& prepared_image, const Path& dest_dir); diff --git a/src/platform/backends/lxd/lxd_vm_image_vault.h b/src/platform/backends/lxd/lxd_vm_image_vault.h index c247710f0b..4c515d2c12 100644 --- a/src/platform/backends/lxd/lxd_vm_image_vault.h +++ b/src/platform/backends/lxd/lxd_vm_image_vault.h @@ -52,7 +52,7 @@ class LXDVMImageVault final : public BaseVMImageVault void update_images(const FetchType& fetch_type, const PrepareAction& prepare, const ProgressMonitor& monitor) override; MemorySize minimum_image_size_for(const std::string& id) override; - void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override + void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override { throw std::runtime_error("Clone methond is not supported in LXDVMImageVault yet."); } diff --git a/tests/stub_vm_image_vault.h b/tests/stub_vm_image_vault.h index dfa984140e..2e363decc6 100644 --- a/tests/stub_vm_image_vault.h +++ b/tests/stub_vm_image_vault.h @@ -64,7 +64,7 @@ struct StubVMImageVault final : public multipass::VMImageVault return {}; } - void clone(const std::string& source_instance_name, const std::string& dist_instance_name) override + void clone(const std::string& source_instance_name, const std::string& destination_instance_name) override { }