[snapshots] resolve instance dir in vm

src/platform/backends/libvirt/libvirt_virtual_machine_factory.cpp

@@ -143,13 +143,11 @@ mp::LibVirtVirtualMachineFactory::~LibVirtVirtualMachineFactory()
     }
 }
 
-void mp::LibVirtVirtualMachineFactory::remove_resources_for(const std::string& name)
+void mp::LibVirtVirtualMachineFactory::remove_resources_for_impl(const std::string& name)
 {
     auto connection = LibVirtVirtualMachine::open_libvirt_connection(libvirt_wrapper);
 
     libvirt_wrapper->virDomainUndefine(libvirt_wrapper->virDomainLookupByName(connection.get(), name.c_str()));
-
-    BaseVirtualMachineFactory::remove_resources_for(name);
 }
 
 mp::VMImage mp::LibVirtVirtualMachineFactory::prepare_source_image(const VMImage& source_image)

src/platform/backends/libvirt/libvirt_virtual_machine_factory.h

@@ -37,7 +37,6 @@ class LibVirtVirtualMachineFactory final : public BaseVirtualMachineFactory
 
     VirtualMachine::UPtr create_virtual_machine(const VirtualMachineDescription& desc,
                                                 VMStatusMonitor& monitor) override;
-    void remove_resources_for(const std::string& name) override;
     VMImage prepare_source_image(const VMImage& source_image) override;
     void prepare_instance_image(const VMImage& instance_image, const VirtualMachineDescription& desc) override;
     void hypervisor_health_check() override;
@@ -46,6 +45,9 @@ class LibVirtVirtualMachineFactory final : public BaseVirtualMachineFactory
     // Making this public makes this modifiable which is necessary for testing
     LibvirtWrapper::UPtr libvirt_wrapper;
 
+protected:
+    void remove_resources_for_impl(const std::string& name) override;
+
 private:
     const Path data_dir;
     std::string bridge_name;

src/platform/backends/lxd/lxd_virtual_machine_factory.cpp

@@ -106,10 +106,9 @@ mp::VirtualMachine::UPtr mp::LXDVirtualMachineFactory::create_virtual_machine(co
                                                    MP_UTILS.make_dir(get_instance_directory_name(desc.vm_name)));
 }
 
-void mp::LXDVirtualMachineFactory::remove_resources_for(const std::string& name)
+void mp::LXDVirtualMachineFactory::remove_resources_for_impl(const std::string& name)
 {
     mpl::log(mpl::Level::trace, category, fmt::format("No resources to remove for \"{}\"", name));
-    BaseVirtualMachineFactory::remove_resources_for(name);
 }
 
 auto mp::LXDVirtualMachineFactory::prepare_source_image(const VMImage& source_image) -> VMImage

src/platform/backends/lxd/lxd_virtual_machine_factory.h

@@ -37,7 +37,6 @@ class LXDVirtualMachineFactory : public BaseVirtualMachineFactory
     void prepare_networking(std::vector<NetworkInterface>& extra_interfaces) override;
     VirtualMachine::UPtr create_virtual_machine(const VirtualMachineDescription& desc,
                                                 VMStatusMonitor& monitor) override;
-    void remove_resources_for(const std::string& name) override;
     VMImage prepare_source_image(const VMImage& source_image) override;
     void prepare_instance_image(const VMImage& instance_image, const VirtualMachineDescription& desc) override;
     void hypervisor_health_check() override;
@@ -53,6 +52,9 @@ class LXDVirtualMachineFactory : public BaseVirtualMachineFactory
 
     std::vector<NetworkInterfaceInfo> networks() const override;
 
+protected:
+    void remove_resources_for_impl(const std::string& name) override;
+
 protected:
     std::string create_bridge_with(const NetworkInterfaceInfo& interface) override;
 

src/platform/backends/qemu/qemu_virtual_machine_factory.cpp

@@ -49,10 +49,9 @@ mp::VirtualMachine::UPtr mp::QemuVirtualMachineFactory::create_virtual_machine(c
                                                     MP_UTILS.make_dir(get_instance_directory_name(desc.vm_name)));
 }
 
-void mp::QemuVirtualMachineFactory::remove_resources_for(const std::string& name)
+void mp::QemuVirtualMachineFactory::remove_resources_for_impl(const std::string& name)
 {
     qemu_platform->remove_resources_for(name);
-    BaseVirtualMachineFactory::remove_resources_for(name);
 }
 
 mp::VMImage mp::QemuVirtualMachineFactory::prepare_source_image(const mp::VMImage& source_image)

src/platform/backends/qemu/qemu_virtual_machine_factory.h

@@ -35,14 +35,16 @@ class QemuVirtualMachineFactory final : public BaseVirtualMachineFactory
 
     VirtualMachine::UPtr create_virtual_machine(const VirtualMachineDescription& desc,
                                                 VMStatusMonitor& monitor) override;
-    void remove_resources_for(const std::string& name) override;
     VMImage prepare_source_image(const VMImage& source_image) override;
     void prepare_instance_image(const VMImage& instance_image, const VirtualMachineDescription& desc) override;
     void hypervisor_health_check() override;
     QString get_backend_version_string() const override;
     QString get_backend_directory_name() const override;
     std::vector<NetworkInterfaceInfo> networks() const override;
 
+protected:
+    void remove_resources_for_impl(const std::string& name) override;
+
 private:
     explicit QemuVirtualMachineFactory(QemuPlatform::UPtr qemu_platform, const Path& data_dir);
 

src/platform/backends/shared/base_virtual_machine_factory.cpp

@@ -41,12 +41,6 @@ auto find_bridge_with(const NetworkContainer& networks, const std::string& membe
 
 mp::BaseVirtualMachineFactory::BaseVirtualMachineFactory(const Path& instances_dir) : instances_dir{instances_dir} {};
 
-void mp::BaseVirtualMachineFactory::remove_resources_for(const std::string& name)
-{
-    QDir instance_dir{get_instance_directory_name(name)};
-    instance_dir.removeRecursively();
-}
-
 void mp::BaseVirtualMachineFactory::configure(VirtualMachineDescription& vm_desc)
 {
     auto instance_dir{mpu::base_dir(vm_desc.image.image_path)};

src/platform/backends/shared/base_virtual_machine_factory.h

@@ -37,7 +37,7 @@ class BaseVirtualMachineFactory : public VirtualMachineFactory
     BaseVirtualMachineFactory() = default;
     explicit BaseVirtualMachineFactory(const Path& instances_dir);
 
-    void remove_resources_for(const std::string& name) override;
+    void remove_resources_for(const std::string& name) final;
 
     FetchType fetch_type() override
     {
@@ -86,8 +86,17 @@ class BaseVirtualMachineFactory : public VirtualMachineFactory
     virtual void prepare_interface(NetworkInterface& net, std::vector<NetworkInterfaceInfo>& host_nets,
                                    const std::string& bridge_type);
 
+    virtual void remove_resources_for_impl(const std::string& name) = 0;
+
     Path instances_dir;
 };
 } // namespace multipass
 
+inline void multipass::BaseVirtualMachineFactory::remove_resources_for(const std::string& name)
+{
+    remove_resources_for_impl(name);
+    QDir instance_dir{get_instance_directory_name(name)};
+    instance_dir.removeRecursively();
+}
+
 #endif // MULTIPASS_BASE_VIRTUAL_MACHINE_FACTORY_H

tests/stub_virtual_machine_factory.h

@@ -35,7 +35,7 @@ struct StubVirtualMachineFactory : public multipass::BaseVirtualMachineFactory
         return std::make_unique<StubVirtualMachine>();
     }
 
-    void remove_resources_for(const std::string& name) override
+    void remove_resources_for_impl(const std::string& name) override
     {
     }
 

tests/test_base_virtual_machine_factory.cpp

@@ -39,7 +39,6 @@ struct MockBaseFactory : mp::BaseVirtualMachineFactory
 {
     MOCK_METHOD(mp::VirtualMachine::UPtr, create_virtual_machine,
                 (const mp::VirtualMachineDescription&, mp::VMStatusMonitor&), (override));
-    MOCK_METHOD(void, remove_resources_for, (const std::string&), (override));
     MOCK_METHOD(mp::VMImage, prepare_source_image, (const mp::VMImage&), (override));
     MOCK_METHOD(void, prepare_instance_image, (const mp::VMImage&, const mp::VirtualMachineDescription&), (override));
     MOCK_METHOD(void, hypervisor_health_check, (), (override));
@@ -51,6 +50,7 @@ struct MockBaseFactory : mp::BaseVirtualMachineFactory
                 (mp::NetworkInterface & net, std::vector<mp::NetworkInterfaceInfo>& host_nets,
                  const std::string& bridge_type),
                 (override));
+    MOCK_METHOD(void, remove_resources_for_impl, (const std::string&), (override));
 
     std::string base_create_bridge_with(const mp::NetworkInterfaceInfo& interface)
     {