From a444f5148d22d4b2986515f58d47838b6a30914c Mon Sep 17 00:00:00 2001
From: Andrei Toterman <andrei.toterman@canonical.com>
Date: Thu, 23 Jan 2025 17:21:03 +0100
Subject: [PATCH 01/12] [tests] Make and use stub az classes

---
 tests/mock_virtual_machine_factory.h     |  8 ++++++--
 tests/stub_availability_zone.h           |  6 ++++++
 tests/stub_virtual_machine.h             |  2 +-
 tests/stub_virtual_machine_factory.h     |  3 ++-
 tests/test_alias_dict.cpp                |  3 +++
 tests/test_base_snapshot.cpp             |  4 +++-
 tests/test_base_virtual_machine.cpp      |  1 +
 tests/test_daemon_authenticate.cpp       |  3 +++
 tests/test_daemon_find.cpp               |  3 +++
 tests/test_daemon_snapshot_restore.cpp   |  6 +++++-
 tests/test_daemon_start.cpp              | 17 +++++++++++------
 tests/test_daemon_suspend.cpp            |  6 +++++-
 tests/test_daemon_umount.cpp             | 12 ++++++++----
 tests/test_delayed_shutdown.cpp          |  5 +++--
 tests/test_instance_settings_handler.cpp |  4 +++-
 tests/unix/test_daemon_rpc.cpp           |  2 ++
 16 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/tests/mock_virtual_machine_factory.h b/tests/mock_virtual_machine_factory.h
index 974fdb58445..99cd14d4db5 100644
--- a/tests/mock_virtual_machine_factory.h
+++ b/tests/mock_virtual_machine_factory.h
@@ -32,7 +32,10 @@ struct MockVirtualMachineFactory : public VirtualMachineFactory
 {
     MOCK_METHOD(VirtualMachine::UPtr,
                 create_virtual_machine,
-                (const VirtualMachineDescription&, const SSHKeyProvider&, VMStatusMonitor&),
+                (const VirtualMachineDescription&,
+                 const SSHKeyProvider&,
+                 VMStatusMonitor&,
+                 AvailabilityZoneManager& az_manager),
                 (override));
     MOCK_METHOD(VirtualMachine::UPtr,
                 clone_bare_vm,
@@ -42,7 +45,8 @@ struct MockVirtualMachineFactory : public VirtualMachineFactory
                  const std::string&,
                  const VMImage&,
                  const SSHKeyProvider&,
-                 VMStatusMonitor&),
+                 VMStatusMonitor&,
+                 AvailabilityZoneManager& az_manager),
                 (override));
     MOCK_METHOD(void, remove_resources_for, (const std::string&), (override));
 
diff --git a/tests/stub_availability_zone.h b/tests/stub_availability_zone.h
index d779d1c8f3e..4aedac1bd81 100644
--- a/tests/stub_availability_zone.h
+++ b/tests/stub_availability_zone.h
@@ -26,6 +26,12 @@ namespace test
 {
 struct StubAvailabilityZone final : public AvailabilityZone
 {
+    static AvailabilityZone& instance()
+    {
+        static StubAvailabilityZone zone{};
+        return zone;
+    }
+
     StubAvailabilityZone()
     {
     }
diff --git a/tests/stub_virtual_machine.h b/tests/stub_virtual_machine.h
index b538a125f2b..777df8e19f0 100644
--- a/tests/stub_virtual_machine.h
+++ b/tests/stub_virtual_machine.h
@@ -40,7 +40,7 @@ struct StubVirtualMachine final : public multipass::VirtualMachine
     }
 
     StubVirtualMachine(const std::string& name, std::unique_ptr<TempDir> tmp_dir)
-        : VirtualMachine{name, tmp_dir->path()}, tmp_dir{std::move(tmp_dir)}
+        : VirtualMachine{name, StubAvailabilityZone::instance(), tmp_dir->path()}, tmp_dir{std::move(tmp_dir)}
     {
     }
 
diff --git a/tests/stub_virtual_machine_factory.h b/tests/stub_virtual_machine_factory.h
index 7e546bb4b50..3a12ab8d3e6 100644
--- a/tests/stub_virtual_machine_factory.h
+++ b/tests/stub_virtual_machine_factory.h
@@ -42,7 +42,8 @@ struct StubVirtualMachineFactory : public multipass::BaseVirtualMachineFactory
 
     VirtualMachine::UPtr create_virtual_machine(const VirtualMachineDescription&,
                                                 const SSHKeyProvider&,
-                                                VMStatusMonitor&) override
+                                                VMStatusMonitor&,
+                                                AvailabilityZoneManager& az_manager) override
     {
         return std::make_unique<StubVirtualMachine>();
     }
diff --git a/tests/test_alias_dict.cpp b/tests/test_alias_dict.cpp
index 8d1f96ffca1..9cd79d82f82 100644
--- a/tests/test_alias_dict.cpp
+++ b/tests/test_alias_dict.cpp
@@ -34,6 +34,7 @@
 #include "mock_settings.h"
 #include "mock_utils.h"
 #include "mock_vm_image_vault.h"
+#include "stub_availability_zone_manager.h"
 #include "stub_terminal.h"
 
 #include "src/daemon/daemon.h"
@@ -624,6 +625,8 @@ struct DaemonAliasTestsuite
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::winterm_key))).WillRepeatedly(Return("none"));
+
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockSettings::GuardedMock mock_settings_injection =
diff --git a/tests/test_base_snapshot.cpp b/tests/test_base_snapshot.cpp
index 6eb972360ba..8424a6b0f70 100644
--- a/tests/test_base_snapshot.cpp
+++ b/tests/test_base_snapshot.cpp
@@ -22,6 +22,7 @@
 #include "mock_json_utils.h"
 #include "mock_virtual_machine.h"
 #include "path.h"
+#include "stub_availability_zone.h"
 
 #include <multipass/json_utils.h>
 #include <multipass/memory_size.h>
@@ -138,7 +139,8 @@ struct TestBaseSnapshot : public Test
     static constexpr auto* test_json_filename = "test_snapshot.json";
     mp::VMSpecs specs = stub_specs();
     mp::VirtualMachineDescription desc = stub_desc();
-    NiceMock<mpt::MockVirtualMachine> vm{"a-vm"};
+    mpt::StubAvailabilityZone zone{};
+    NiceMock<mpt::MockVirtualMachine> vm{"a-vm", zone};
     const mpt::MockCloudInitFileOps::GuardedMock mock_cloud_init_file_ops_injection =
         mpt::MockCloudInitFileOps::inject<NiceMock>();
     const mpt::MockJsonUtils::GuardedMock mock_json_utils_injection =
diff --git a/tests/test_base_virtual_machine.cpp b/tests/test_base_virtual_machine.cpp
index 6d3136a68ab..db896e078de 100644
--- a/tests/test_base_virtual_machine.cpp
+++ b/tests/test_base_virtual_machine.cpp
@@ -258,6 +258,7 @@ struct BaseVM : public Test
     mpt::MockSSHTestFixture mock_ssh_test_fixture;
     const mpt::DummyKeyProvider key_provider{"keeper of the seven keys"};
     NiceMock<MockBaseVirtualMachine> vm{"mock-vm", key_provider, zone};
+    mpt::StubAvailabilityZone zone{};
     std::vector<std::shared_ptr<mpt::MockSnapshot>> snapshot_album;
     QString head_path = vm.tmp_dir->filePath(head_filename);
     QString count_path = vm.tmp_dir->filePath(count_filename);
diff --git a/tests/test_daemon_authenticate.cpp b/tests/test_daemon_authenticate.cpp
index c2623bfd575..c3aebe91e45 100644
--- a/tests/test_daemon_authenticate.cpp
+++ b/tests/test_daemon_authenticate.cpp
@@ -22,6 +22,7 @@
 #include "mock_server_reader_writer.h"
 #include "mock_settings.h"
 #include "mock_utils.h"
+#include "stub_availability_zone_manager.h"
 
 #include <multipass/constants.h>
 
@@ -42,6 +43,8 @@ struct TestDaemonAuthenticate : public mpt::DaemonTestFixture
     {
         EXPECT_CALL(mock_settings, register_handler(_)).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
+
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockUtils::GuardedMock utils_attr{mpt::MockUtils::inject<NiceMock>()};
diff --git a/tests/test_daemon_find.cpp b/tests/test_daemon_find.cpp
index e963fb3e1c7..08bd109d92f 100644
--- a/tests/test_daemon_find.cpp
+++ b/tests/test_daemon_find.cpp
@@ -24,6 +24,7 @@
 #include "mock_settings.h"
 #include "mock_utils.h"
 #include "mock_vm_image_vault.h"
+#include "stub_availability_zone_manager.h"
 
 #include <src/daemon/daemon.h>
 
@@ -43,6 +44,8 @@ struct DaemonFind : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::winterm_key))).WillRepeatedly(Return("none"));
         ON_CALL(mock_utils, contents_of(_)).WillByDefault(Return(mpt::root_cert));
+
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockPlatform::GuardedMock attr{mpt::MockPlatform::inject<NiceMock>()};
diff --git a/tests/test_daemon_snapshot_restore.cpp b/tests/test_daemon_snapshot_restore.cpp
index 0e176c7e826..da8c1146de0 100644
--- a/tests/test_daemon_snapshot_restore.cpp
+++ b/tests/test_daemon_snapshot_restore.cpp
@@ -25,6 +25,8 @@
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
 #include "multipass/exceptions/snapshot_exceptions.h"
+#include "stub_availability_zone.h"
+#include "stub_availability_zone_manager.h"
 
 #include <multipass/exceptions/not_implemented_on_this_backend_exception.h>
 
@@ -42,6 +44,7 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     auto build_daemon_with_mock_instance()
@@ -49,7 +52,7 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
         const auto [temp_dir, filename] =
             plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-        auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+        auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
         auto* ret_instance = instance_ptr.get();
 
         EXPECT_CALL(*instance_ptr, current_state)
@@ -78,6 +81,7 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
     std::vector<mp::NetworkInterface> extra_interfaces;
     const std::string mac_addr{"52:54:00:73:76:28"};
     const std::string mock_instance_name{"real-zebraphant"};
+    mpt::StubAvailabilityZone zone{};
 };
 
 struct TestDaemonSnapshot : public TestDaemonSnapshotRestoreBase
diff --git a/tests/test_daemon_start.cpp b/tests/test_daemon_start.cpp
index e2faec58ab4..eacce4a9704 100644
--- a/tests/test_daemon_start.cpp
+++ b/tests/test_daemon_start.cpp
@@ -27,6 +27,8 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
+#include "stub_availability_zone.h"
+#include "stub_availability_zone_manager.h"
 
 #include <src/daemon/daemon.h>
 
@@ -44,6 +46,8 @@ struct TestDaemonStart : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::mounts_key))).WillRepeatedly(Return("true"));
+
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     const std::string mock_instance_name{"real-zebraphant"};
@@ -60,6 +64,7 @@ struct TestDaemonStart : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
+    mpt::StubAvailabilityZone zone{};
 };
 
 TEST_F(TestDaemonStart, successfulStartOkStatus)
@@ -68,7 +73,7 @@ TEST_F(TestDaemonStart, successfulStartOkStatus)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -104,7 +109,7 @@ TEST_F(TestDaemonStart, exitlessSshProcessExceptionDoesNotShowMessage)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -140,7 +145,7 @@ TEST_F(TestDaemonStart, unknownStateDoesNotStart)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -171,7 +176,7 @@ TEST_F(TestDaemonStart, suspendingStateDoesNotStartHasError)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -217,7 +222,7 @@ TEST_F(TestDaemonStart, definedMountsInitializedDuringStart)
     auto mock_mount_handler = std::make_unique<mpt::MockMountHandler>();
     EXPECT_CALL(*mock_mount_handler, activate_impl).Times(1);
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).WillRepeatedly(Return());
     EXPECT_CALL(*mock_vm, current_state).WillRepeatedly(Return(mp::VirtualMachine::State::off));
     EXPECT_CALL(*mock_vm, start).Times(1);
@@ -260,7 +265,7 @@ TEST_F(TestDaemonStart, removingMountOnFailedStart)
     auto mock_mount_handler = std::make_unique<mpt::MockMountHandler>();
     EXPECT_CALL(*mock_mount_handler, activate_impl).WillOnce(Throw(std::runtime_error{error}));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).WillRepeatedly(Return());
     EXPECT_CALL(*mock_vm, current_state).WillRepeatedly(Return(mp::VirtualMachine::State::off));
     EXPECT_CALL(*mock_vm, start).Times(1);
diff --git a/tests/test_daemon_suspend.cpp b/tests/test_daemon_suspend.cpp
index 2ea248ce92e..fe321623b87 100644
--- a/tests/test_daemon_suspend.cpp
+++ b/tests/test_daemon_suspend.cpp
@@ -24,6 +24,8 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
+#include "stub_availability_zone.h"
+#include "stub_availability_zone_manager.h"
 
 #include <multipass/exceptions/not_implemented_on_this_backend_exception.h>
 
@@ -42,6 +44,7 @@ struct TestDaemonSuspend : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
 
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     const std::string mock_instance_name{"real-zebraphant"};
@@ -59,6 +62,7 @@ struct TestDaemonSuspend : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
+    mpt::StubAvailabilityZone zone{};
 };
 } // namespace
 
@@ -76,7 +80,7 @@ TEST_F(TestDaemonSuspend, suspendStopsMounts)
     EXPECT_CALL(*mock_mount_handler, is_active).WillOnce(Return(true));
     EXPECT_CALL(*mock_mount_handler, deactivate_impl);
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
 
diff --git a/tests/test_daemon_umount.cpp b/tests/test_daemon_umount.cpp
index dbc7607aee9..da3c80e2e41 100644
--- a/tests/test_daemon_umount.cpp
+++ b/tests/test_daemon_umount.cpp
@@ -25,6 +25,8 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
+#include "stub_availability_zone.h"
+#include "stub_availability_zone_manager.h"
 
 namespace mp = multipass;
 namespace mpt = multipass::test;
@@ -41,6 +43,7 @@ struct TestDaemonUmount : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
 
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
 
         mock_factory = use_a_mock_vm_factory();
     }
@@ -62,6 +65,7 @@ struct TestDaemonUmount : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
+    mpt::StubAvailabilityZone zone{};
 };
 } // namespace
 
@@ -102,7 +106,7 @@ TEST_F(TestDaemonUmount, noTargetsUnmountsAll)
     EXPECT_CALL(*mock_mount_handler, deactivate_impl(false));
     EXPECT_CALL(*mock_mount_handler2, deactivate_impl(false));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path + "2", _))
@@ -146,7 +150,7 @@ TEST_F(TestDaemonUmount, umountWithTargetOnlyStopsItsHandlers)
     EXPECT_CALL(*mock_mount_handler2, deactivate_impl(false)).Times(0);
     EXPECT_CALL(*mock_mount_handler3, deactivate_impl(false));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path + "2", _))
@@ -182,7 +186,7 @@ TEST_F(TestDaemonUmount, mountNotFound)
     config_builder.data_directory = temp_dir->path();
 
     EXPECT_CALL(*mock_factory, create_virtual_machine)
-        .WillOnce(Return(std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name)));
+        .WillOnce(Return(std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone)));
 
     mp::Daemon daemon{config_builder.build()};
 
@@ -219,7 +223,7 @@ TEST_F(TestDaemonUmount, stoppingMountFails)
     EXPECT_CALL(*mock_mount_handler, deactivate_impl(false))
         .WillOnce(Throw(std::runtime_error{error}));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
 
diff --git a/tests/test_delayed_shutdown.cpp b/tests/test_delayed_shutdown.cpp
index ca2359b38d1..972f5d29aea 100644
--- a/tests/test_delayed_shutdown.cpp
+++ b/tests/test_delayed_shutdown.cpp
@@ -45,6 +45,7 @@ struct DelayedShutdown : public Test
     mp::VirtualMachine::UPtr vm;
     QEventLoop loop;
     ssh_channel_callbacks callbacks{nullptr};
+    mpt::StubAvailabilityZone zone{};
 };
 
 TEST_F(DelayedShutdown, emitsFinishedAfterTimerExpires)
@@ -73,7 +74,7 @@ TEST_F(DelayedShutdown, wallsImpendingShutdown)
     static const auto upcoming_cmd_matcher = AllOf(HasSubstr("wall"), HasSubstr(msg_upcoming));
     static const auto now_cmd_matcher = AllOf(HasSubstr("wall"), HasSubstr(msg_now));
 
-    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock"};
+    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock", zone};
     mp::DelayedShutdownTimer delayed_shutdown_timer{&vm, [](const std::string&) {}};
 
     EXPECT_CALL(vm, ssh_exec(upcoming_cmd_matcher, _)).Times(1); // as we start
@@ -89,7 +90,7 @@ TEST_F(DelayedShutdown, wallsImpendingShutdown)
 
 TEST_F(DelayedShutdown, handlesExceptionWhenAttemptingToWall)
 {
-    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock"};
+    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock", zone};
     mp::DelayedShutdownTimer delayed_shutdown_timer{&vm, [](const std::string&) {}};
 
     EXPECT_CALL(vm, ssh_exec(HasSubstr("wall"), _))
diff --git a/tests/test_instance_settings_handler.cpp b/tests/test_instance_settings_handler.cpp
index 42d2d9aa43c..4741ae965c3 100644
--- a/tests/test_instance_settings_handler.cpp
+++ b/tests/test_instance_settings_handler.cpp
@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "mock_virtual_machine.h"
+#include "stub_availability_zone.h"
 
 #include <multipass/constants.h>
 #include <multipass/utils.h>
@@ -124,7 +125,8 @@ struct TestInstanceSettingsHandler : public Test
     template <template <typename /*MockClass*/> typename MockCharacter = ::testing::NiceMock>
     mpt::MockVirtualMachine& mock_vm(const std::string& name, bool deleted = false)
     {
-        auto ret = std::make_shared<MockCharacter<mpt::MockVirtualMachine>>(name);
+        mpt::StubAvailabilityZone zone{};
+        auto ret = std::make_shared<MockCharacter<mpt::MockVirtualMachine>>(name, zone);
 
         auto& vm_collection = deleted ? deleted_vms : vms;
         vm_collection.emplace(name, ret);
diff --git a/tests/unix/test_daemon_rpc.cpp b/tests/unix/test_daemon_rpc.cpp
index 402ace408b9..6fc08884f30 100644
--- a/tests/unix/test_daemon_rpc.cpp
+++ b/tests/unix/test_daemon_rpc.cpp
@@ -24,6 +24,7 @@
 #include <tests/mock_permission_utils.h>
 #include <tests/mock_platform.h>
 #include <tests/mock_utils.h>
+#include <tests/stub_availability_zone_manager.h>
 
 #include <src/daemon/daemon_rpc.h>
 
@@ -44,6 +45,7 @@ struct TestDaemonRpc : public mpt::DaemonTestFixture
             .Times(AnyNumber())
             .WillRepeatedly(Return(QString()));
         EXPECT_CALL(*mock_utils, contents_of(_)).WillRepeatedly(Return(mpt::root_cert));
+        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mp::Rpc::Stub make_secure_stub()

From 94648e1c4873a24f1bf696e51c5374d0fba69355 Mon Sep 17 00:00:00 2001
From: Andrei Toterman <andrei.toterman@canonical.com>
Date: Tue, 1 Apr 2025 20:40:40 +0200
Subject: [PATCH 02/12] [az] Add az manager into vm factory ctors

---
 src/platform/platform_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/platform_linux.cpp b/src/platform/platform_linux.cpp
index d2bdba6c810..a553edf9902 100644
--- a/src/platform/platform_linux.cpp
+++ b/src/platform/platform_linux.cpp
@@ -408,7 +408,7 @@ mp::VirtualMachineFactory::UPtr mp::platform::vm_backend(const mp::Path& data_di
 
 #if VIRTUALBOX_ENABLED
     if (driver == QStringLiteral("virtualbox"))
-        return std::make_unique<VirtualBoxVirtualMachineFactory>(data_dir);
+        return std::make_unique<VirtualBoxVirtualMachineFactory>(data_dir, az_manager);
 #endif
 
     throw std::runtime_error(fmt::format("Unsupported virtualization driver: {}", driver));

From 4cdd38dd8149bafde4c49b47431f0b5f1e9ced35 Mon Sep 17 00:00:00 2001
From: Andrei Toterman <andrei.toterman@canonical.com>
Date: Tue, 1 Apr 2025 20:47:39 +0200
Subject: [PATCH 03/12] [tests] Make tests compile with azs

---
 tests/mock_virtual_machine_factory.h     |  8 ++------
 tests/stub_availability_zone.h           |  6 ------
 tests/stub_virtual_machine.h             |  2 +-
 tests/stub_virtual_machine_factory.h     |  3 +--
 tests/test_alias_dict.cpp                |  3 ---
 tests/test_base_snapshot.cpp             |  4 +---
 tests/test_daemon_authenticate.cpp       |  3 ---
 tests/test_daemon_find.cpp               |  3 ---
 tests/test_daemon_snapshot_restore.cpp   |  6 +-----
 tests/test_daemon_start.cpp              | 17 ++++++-----------
 tests/test_daemon_suspend.cpp            |  6 +-----
 tests/test_daemon_umount.cpp             | 12 ++++--------
 tests/test_delayed_shutdown.cpp          |  5 ++---
 tests/test_instance_settings_handler.cpp |  4 +---
 tests/unix/test_daemon_rpc.cpp           |  2 --
 15 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/tests/mock_virtual_machine_factory.h b/tests/mock_virtual_machine_factory.h
index 99cd14d4db5..974fdb58445 100644
--- a/tests/mock_virtual_machine_factory.h
+++ b/tests/mock_virtual_machine_factory.h
@@ -32,10 +32,7 @@ struct MockVirtualMachineFactory : public VirtualMachineFactory
 {
     MOCK_METHOD(VirtualMachine::UPtr,
                 create_virtual_machine,
-                (const VirtualMachineDescription&,
-                 const SSHKeyProvider&,
-                 VMStatusMonitor&,
-                 AvailabilityZoneManager& az_manager),
+                (const VirtualMachineDescription&, const SSHKeyProvider&, VMStatusMonitor&),
                 (override));
     MOCK_METHOD(VirtualMachine::UPtr,
                 clone_bare_vm,
@@ -45,8 +42,7 @@ struct MockVirtualMachineFactory : public VirtualMachineFactory
                  const std::string&,
                  const VMImage&,
                  const SSHKeyProvider&,
-                 VMStatusMonitor&,
-                 AvailabilityZoneManager& az_manager),
+                 VMStatusMonitor&),
                 (override));
     MOCK_METHOD(void, remove_resources_for, (const std::string&), (override));
 
diff --git a/tests/stub_availability_zone.h b/tests/stub_availability_zone.h
index 4aedac1bd81..d779d1c8f3e 100644
--- a/tests/stub_availability_zone.h
+++ b/tests/stub_availability_zone.h
@@ -26,12 +26,6 @@ namespace test
 {
 struct StubAvailabilityZone final : public AvailabilityZone
 {
-    static AvailabilityZone& instance()
-    {
-        static StubAvailabilityZone zone{};
-        return zone;
-    }
-
     StubAvailabilityZone()
     {
     }
diff --git a/tests/stub_virtual_machine.h b/tests/stub_virtual_machine.h
index 777df8e19f0..b538a125f2b 100644
--- a/tests/stub_virtual_machine.h
+++ b/tests/stub_virtual_machine.h
@@ -40,7 +40,7 @@ struct StubVirtualMachine final : public multipass::VirtualMachine
     }
 
     StubVirtualMachine(const std::string& name, std::unique_ptr<TempDir> tmp_dir)
-        : VirtualMachine{name, StubAvailabilityZone::instance(), tmp_dir->path()}, tmp_dir{std::move(tmp_dir)}
+        : VirtualMachine{name, tmp_dir->path()}, tmp_dir{std::move(tmp_dir)}
     {
     }
 
diff --git a/tests/stub_virtual_machine_factory.h b/tests/stub_virtual_machine_factory.h
index 3a12ab8d3e6..7e546bb4b50 100644
--- a/tests/stub_virtual_machine_factory.h
+++ b/tests/stub_virtual_machine_factory.h
@@ -42,8 +42,7 @@ struct StubVirtualMachineFactory : public multipass::BaseVirtualMachineFactory
 
     VirtualMachine::UPtr create_virtual_machine(const VirtualMachineDescription&,
                                                 const SSHKeyProvider&,
-                                                VMStatusMonitor&,
-                                                AvailabilityZoneManager& az_manager) override
+                                                VMStatusMonitor&) override
     {
         return std::make_unique<StubVirtualMachine>();
     }
diff --git a/tests/test_alias_dict.cpp b/tests/test_alias_dict.cpp
index 9cd79d82f82..8d1f96ffca1 100644
--- a/tests/test_alias_dict.cpp
+++ b/tests/test_alias_dict.cpp
@@ -34,7 +34,6 @@
 #include "mock_settings.h"
 #include "mock_utils.h"
 #include "mock_vm_image_vault.h"
-#include "stub_availability_zone_manager.h"
 #include "stub_terminal.h"
 
 #include "src/daemon/daemon.h"
@@ -625,8 +624,6 @@ struct DaemonAliasTestsuite
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::winterm_key))).WillRepeatedly(Return("none"));
-
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockSettings::GuardedMock mock_settings_injection =
diff --git a/tests/test_base_snapshot.cpp b/tests/test_base_snapshot.cpp
index 8424a6b0f70..6eb972360ba 100644
--- a/tests/test_base_snapshot.cpp
+++ b/tests/test_base_snapshot.cpp
@@ -22,7 +22,6 @@
 #include "mock_json_utils.h"
 #include "mock_virtual_machine.h"
 #include "path.h"
-#include "stub_availability_zone.h"
 
 #include <multipass/json_utils.h>
 #include <multipass/memory_size.h>
@@ -139,8 +138,7 @@ struct TestBaseSnapshot : public Test
     static constexpr auto* test_json_filename = "test_snapshot.json";
     mp::VMSpecs specs = stub_specs();
     mp::VirtualMachineDescription desc = stub_desc();
-    mpt::StubAvailabilityZone zone{};
-    NiceMock<mpt::MockVirtualMachine> vm{"a-vm", zone};
+    NiceMock<mpt::MockVirtualMachine> vm{"a-vm"};
     const mpt::MockCloudInitFileOps::GuardedMock mock_cloud_init_file_ops_injection =
         mpt::MockCloudInitFileOps::inject<NiceMock>();
     const mpt::MockJsonUtils::GuardedMock mock_json_utils_injection =
diff --git a/tests/test_daemon_authenticate.cpp b/tests/test_daemon_authenticate.cpp
index c3aebe91e45..c2623bfd575 100644
--- a/tests/test_daemon_authenticate.cpp
+++ b/tests/test_daemon_authenticate.cpp
@@ -22,7 +22,6 @@
 #include "mock_server_reader_writer.h"
 #include "mock_settings.h"
 #include "mock_utils.h"
-#include "stub_availability_zone_manager.h"
 
 #include <multipass/constants.h>
 
@@ -43,8 +42,6 @@ struct TestDaemonAuthenticate : public mpt::DaemonTestFixture
     {
         EXPECT_CALL(mock_settings, register_handler(_)).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
-
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockUtils::GuardedMock utils_attr{mpt::MockUtils::inject<NiceMock>()};
diff --git a/tests/test_daemon_find.cpp b/tests/test_daemon_find.cpp
index 08bd109d92f..e963fb3e1c7 100644
--- a/tests/test_daemon_find.cpp
+++ b/tests/test_daemon_find.cpp
@@ -24,7 +24,6 @@
 #include "mock_settings.h"
 #include "mock_utils.h"
 #include "mock_vm_image_vault.h"
-#include "stub_availability_zone_manager.h"
 
 #include <src/daemon/daemon.h>
 
@@ -44,8 +43,6 @@ struct DaemonFind : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::winterm_key))).WillRepeatedly(Return("none"));
         ON_CALL(mock_utils, contents_of(_)).WillByDefault(Return(mpt::root_cert));
-
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mpt::MockPlatform::GuardedMock attr{mpt::MockPlatform::inject<NiceMock>()};
diff --git a/tests/test_daemon_snapshot_restore.cpp b/tests/test_daemon_snapshot_restore.cpp
index da8c1146de0..0e176c7e826 100644
--- a/tests/test_daemon_snapshot_restore.cpp
+++ b/tests/test_daemon_snapshot_restore.cpp
@@ -25,8 +25,6 @@
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
 #include "multipass/exceptions/snapshot_exceptions.h"
-#include "stub_availability_zone.h"
-#include "stub_availability_zone_manager.h"
 
 #include <multipass/exceptions/not_implemented_on_this_backend_exception.h>
 
@@ -44,7 +42,6 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     auto build_daemon_with_mock_instance()
@@ -52,7 +49,7 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
         const auto [temp_dir, filename] =
             plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-        auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+        auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
         auto* ret_instance = instance_ptr.get();
 
         EXPECT_CALL(*instance_ptr, current_state)
@@ -81,7 +78,6 @@ struct TestDaemonSnapshotRestoreBase : public mpt::DaemonTestFixture
     std::vector<mp::NetworkInterface> extra_interfaces;
     const std::string mac_addr{"52:54:00:73:76:28"};
     const std::string mock_instance_name{"real-zebraphant"};
-    mpt::StubAvailabilityZone zone{};
 };
 
 struct TestDaemonSnapshot : public TestDaemonSnapshotRestoreBase
diff --git a/tests/test_daemon_start.cpp b/tests/test_daemon_start.cpp
index eacce4a9704..e2faec58ab4 100644
--- a/tests/test_daemon_start.cpp
+++ b/tests/test_daemon_start.cpp
@@ -27,8 +27,6 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
-#include "stub_availability_zone.h"
-#include "stub_availability_zone_manager.h"
 
 #include <src/daemon/daemon.h>
 
@@ -46,8 +44,6 @@ struct TestDaemonStart : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, register_handler).WillRepeatedly(Return(nullptr));
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
         EXPECT_CALL(mock_settings, get(Eq(mp::mounts_key))).WillRepeatedly(Return("true"));
-
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     const std::string mock_instance_name{"real-zebraphant"};
@@ -64,7 +60,6 @@ struct TestDaemonStart : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
-    mpt::StubAvailabilityZone zone{};
 };
 
 TEST_F(TestDaemonStart, successfulStartOkStatus)
@@ -73,7 +68,7 @@ TEST_F(TestDaemonStart, successfulStartOkStatus)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -109,7 +104,7 @@ TEST_F(TestDaemonStart, exitlessSshProcessExceptionDoesNotShowMessage)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -145,7 +140,7 @@ TEST_F(TestDaemonStart, unknownStateDoesNotStart)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -176,7 +171,7 @@ TEST_F(TestDaemonStart, suspendingStateDoesNotStartHasError)
     const auto [temp_dir, filename] =
         plant_instance_json(fake_json_contents(mac_addr, extra_interfaces));
 
-    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto instance_ptr = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_factory, create_virtual_machine).WillOnce([&instance_ptr](auto&&...) {
         return std::move(instance_ptr);
     });
@@ -222,7 +217,7 @@ TEST_F(TestDaemonStart, definedMountsInitializedDuringStart)
     auto mock_mount_handler = std::make_unique<mpt::MockMountHandler>();
     EXPECT_CALL(*mock_mount_handler, activate_impl).Times(1);
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).WillRepeatedly(Return());
     EXPECT_CALL(*mock_vm, current_state).WillRepeatedly(Return(mp::VirtualMachine::State::off));
     EXPECT_CALL(*mock_vm, start).Times(1);
@@ -265,7 +260,7 @@ TEST_F(TestDaemonStart, removingMountOnFailedStart)
     auto mock_mount_handler = std::make_unique<mpt::MockMountHandler>();
     EXPECT_CALL(*mock_mount_handler, activate_impl).WillOnce(Throw(std::runtime_error{error}));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).WillRepeatedly(Return());
     EXPECT_CALL(*mock_vm, current_state).WillRepeatedly(Return(mp::VirtualMachine::State::off));
     EXPECT_CALL(*mock_vm, start).Times(1);
diff --git a/tests/test_daemon_suspend.cpp b/tests/test_daemon_suspend.cpp
index fe321623b87..2ea248ce92e 100644
--- a/tests/test_daemon_suspend.cpp
+++ b/tests/test_daemon_suspend.cpp
@@ -24,8 +24,6 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
-#include "stub_availability_zone.h"
-#include "stub_availability_zone_manager.h"
 
 #include <multipass/exceptions/not_implemented_on_this_backend_exception.h>
 
@@ -44,7 +42,6 @@ struct TestDaemonSuspend : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
 
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     const std::string mock_instance_name{"real-zebraphant"};
@@ -62,7 +59,6 @@ struct TestDaemonSuspend : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
-    mpt::StubAvailabilityZone zone{};
 };
 } // namespace
 
@@ -80,7 +76,7 @@ TEST_F(TestDaemonSuspend, suspendStopsMounts)
     EXPECT_CALL(*mock_mount_handler, is_active).WillOnce(Return(true));
     EXPECT_CALL(*mock_mount_handler, deactivate_impl);
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
 
diff --git a/tests/test_daemon_umount.cpp b/tests/test_daemon_umount.cpp
index da3c80e2e41..dbc7607aee9 100644
--- a/tests/test_daemon_umount.cpp
+++ b/tests/test_daemon_umount.cpp
@@ -25,8 +25,6 @@
 #include "mock_settings.h"
 #include "mock_virtual_machine.h"
 #include "mock_vm_image_vault.h"
-#include "stub_availability_zone.h"
-#include "stub_availability_zone_manager.h"
 
 namespace mp = multipass;
 namespace mpt = multipass::test;
@@ -43,7 +41,6 @@ struct TestDaemonUmount : public mpt::DaemonTestFixture
         EXPECT_CALL(mock_settings, unregister_handler).Times(AnyNumber());
 
         config_builder.vault = std::make_unique<NiceMock<mpt::MockVMImageVault>>();
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
 
         mock_factory = use_a_mock_vm_factory();
     }
@@ -65,7 +62,6 @@ struct TestDaemonUmount : public mpt::DaemonTestFixture
     const mpt::MockPermissionUtils::GuardedMock mock_permission_utils_injection =
         mpt::MockPermissionUtils::inject<NiceMock>();
     mpt::MockPermissionUtils& mock_permission_utils = *mock_permission_utils_injection.first;
-    mpt::StubAvailabilityZone zone{};
 };
 } // namespace
 
@@ -106,7 +102,7 @@ TEST_F(TestDaemonUmount, noTargetsUnmountsAll)
     EXPECT_CALL(*mock_mount_handler, deactivate_impl(false));
     EXPECT_CALL(*mock_mount_handler2, deactivate_impl(false));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path + "2", _))
@@ -150,7 +146,7 @@ TEST_F(TestDaemonUmount, umountWithTargetOnlyStopsItsHandlers)
     EXPECT_CALL(*mock_mount_handler2, deactivate_impl(false)).Times(0);
     EXPECT_CALL(*mock_mount_handler3, deactivate_impl(false));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path + "2", _))
@@ -186,7 +182,7 @@ TEST_F(TestDaemonUmount, mountNotFound)
     config_builder.data_directory = temp_dir->path();
 
     EXPECT_CALL(*mock_factory, create_virtual_machine)
-        .WillOnce(Return(std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone)));
+        .WillOnce(Return(std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name)));
 
     mp::Daemon daemon{config_builder.build()};
 
@@ -223,7 +219,7 @@ TEST_F(TestDaemonUmount, stoppingMountFails)
     EXPECT_CALL(*mock_mount_handler, deactivate_impl(false))
         .WillOnce(Throw(std::runtime_error{error}));
 
-    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name, zone);
+    auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(mock_instance_name);
     EXPECT_CALL(*mock_vm, make_native_mount_handler(fake_target_path, _))
         .WillOnce(Return(std::move(mock_mount_handler)));
 
diff --git a/tests/test_delayed_shutdown.cpp b/tests/test_delayed_shutdown.cpp
index 972f5d29aea..ca2359b38d1 100644
--- a/tests/test_delayed_shutdown.cpp
+++ b/tests/test_delayed_shutdown.cpp
@@ -45,7 +45,6 @@ struct DelayedShutdown : public Test
     mp::VirtualMachine::UPtr vm;
     QEventLoop loop;
     ssh_channel_callbacks callbacks{nullptr};
-    mpt::StubAvailabilityZone zone{};
 };
 
 TEST_F(DelayedShutdown, emitsFinishedAfterTimerExpires)
@@ -74,7 +73,7 @@ TEST_F(DelayedShutdown, wallsImpendingShutdown)
     static const auto upcoming_cmd_matcher = AllOf(HasSubstr("wall"), HasSubstr(msg_upcoming));
     static const auto now_cmd_matcher = AllOf(HasSubstr("wall"), HasSubstr(msg_now));
 
-    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock", zone};
+    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock"};
     mp::DelayedShutdownTimer delayed_shutdown_timer{&vm, [](const std::string&) {}};
 
     EXPECT_CALL(vm, ssh_exec(upcoming_cmd_matcher, _)).Times(1); // as we start
@@ -90,7 +89,7 @@ TEST_F(DelayedShutdown, wallsImpendingShutdown)
 
 TEST_F(DelayedShutdown, handlesExceptionWhenAttemptingToWall)
 {
-    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock", zone};
+    mpt::MockVirtualMachine vm{mp::VirtualMachine::State::running, "mock"};
     mp::DelayedShutdownTimer delayed_shutdown_timer{&vm, [](const std::string&) {}};
 
     EXPECT_CALL(vm, ssh_exec(HasSubstr("wall"), _))
diff --git a/tests/test_instance_settings_handler.cpp b/tests/test_instance_settings_handler.cpp
index 4741ae965c3..42d2d9aa43c 100644
--- a/tests/test_instance_settings_handler.cpp
+++ b/tests/test_instance_settings_handler.cpp
@@ -17,7 +17,6 @@
 
 #include "common.h"
 #include "mock_virtual_machine.h"
-#include "stub_availability_zone.h"
 
 #include <multipass/constants.h>
 #include <multipass/utils.h>
@@ -125,8 +124,7 @@ struct TestInstanceSettingsHandler : public Test
     template <template <typename /*MockClass*/> typename MockCharacter = ::testing::NiceMock>
     mpt::MockVirtualMachine& mock_vm(const std::string& name, bool deleted = false)
     {
-        mpt::StubAvailabilityZone zone{};
-        auto ret = std::make_shared<MockCharacter<mpt::MockVirtualMachine>>(name, zone);
+        auto ret = std::make_shared<MockCharacter<mpt::MockVirtualMachine>>(name);
 
         auto& vm_collection = deleted ? deleted_vms : vms;
         vm_collection.emplace(name, ret);
diff --git a/tests/unix/test_daemon_rpc.cpp b/tests/unix/test_daemon_rpc.cpp
index 6fc08884f30..402ace408b9 100644
--- a/tests/unix/test_daemon_rpc.cpp
+++ b/tests/unix/test_daemon_rpc.cpp
@@ -24,7 +24,6 @@
 #include <tests/mock_permission_utils.h>
 #include <tests/mock_platform.h>
 #include <tests/mock_utils.h>
-#include <tests/stub_availability_zone_manager.h>
 
 #include <src/daemon/daemon_rpc.h>
 
@@ -45,7 +44,6 @@ struct TestDaemonRpc : public mpt::DaemonTestFixture
             .Times(AnyNumber())
             .WillRepeatedly(Return(QString()));
         EXPECT_CALL(*mock_utils, contents_of(_)).WillRepeatedly(Return(mpt::root_cert));
-        config_builder.az_manager = std::make_unique<mpt::StubAvailabilityZoneManager>();
     }
 
     mp::Rpc::Stub make_secure_stub()

From 5ec148f756e9169bfa93cc94d08b32cb8c6630ce Mon Sep 17 00:00:00 2001
From: Trevor Shoe <trevor.schupbach@canonical.com>
Date: Thu, 17 Apr 2025 16:55:46 -0400
Subject: [PATCH 04/12] [az] Implement set_available

---
 include/multipass/virtual_machine.h           |  1 +
 src/daemon/daemon.cpp                         |  5 ++++
 .../backends/shared/base_virtual_machine.cpp  | 27 +++++++++++++++++--
 .../backends/shared/base_virtual_machine.h    |  7 +----
 src/rpc/multipass.proto                       |  1 +
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/include/multipass/virtual_machine.h b/include/multipass/virtual_machine.h
index f2c1b94a4b6..e688f7afd3b 100644
--- a/include/multipass/virtual_machine.h
+++ b/include/multipass/virtual_machine.h
@@ -137,6 +137,7 @@ class VirtualMachine : private DisabledCopyMove
 
 protected:
     const QDir instance_dir;
+    bool was_running{false};
 
     VirtualMachine(VirtualMachine::State state,
                    const std::string& vm_name,
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index df956254a1c..027734fabb3 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -1034,6 +1034,8 @@ mp::InstanceStatus::Status grpc_instance_status_for(const mp::VirtualMachine::St
         return mp::InstanceStatus::SUSPENDING;
     case mp::VirtualMachine::State::suspended:
         return mp::InstanceStatus::SUSPENDED;
+    case mp::VirtualMachine::State::unavailable:
+        return mp::InstanceStatus::UNAVAILABLE;
     case mp::VirtualMachine::State::unknown:
     default:
         return mp::InstanceStatus::UNKNOWN;
@@ -2263,6 +2265,9 @@ try
                            "Cannot start the instance '{}' while suspending.",
                            name);
             continue;
+        case VirtualMachine::State::unavailable:
+            fmt::format_to(std::back_inserter(start_errors), "Cannot start the instance '{}' while unavailable.", name);
+            continue;
         case VirtualMachine::State::delayed_shutdown:
             delayed_shutdown_instances.erase(name);
             continue;
diff --git a/src/platform/backends/shared/base_virtual_machine.cpp b/src/platform/backends/shared/base_virtual_machine.cpp
index b45e4013774..3397e293e47 100644
--- a/src/platform/backends/shared/base_virtual_machine.cpp
+++ b/src/platform/backends/shared/base_virtual_machine.cpp
@@ -59,7 +59,7 @@ constexpr auto yes_overwrite = true;
 
 void assert_vm_stopped(St state)
 {
-    assert(state == St::off || state == St::stopped);
+    assert(state == St::off || state == St::stopped || state == St::unavailable);
 }
 
 mp::Path derive_head_path(const QDir& snapshot_dir)
@@ -200,7 +200,7 @@ std::string mp::BaseVirtualMachine::get_instance_id_from_the_cloud_init() const
 void mp::BaseVirtualMachine::check_state_for_shutdown(ShutdownPolicy shutdown_policy)
 {
     // A mutex should already be locked by the caller here
-    if (state == State::off || state == State::stopped)
+    if (state == State::off || state == State::stopped || state == State::unavailable)
     {
         throw VMStateIdempotentException{"Ignoring shutdown since instance is already stopped."};
     }
@@ -238,6 +238,29 @@ void mp::BaseVirtualMachine::check_state_for_shutdown(ShutdownPolicy shutdown_po
     }
 }
 
+void mp::BaseVirtualMachine::set_available(bool available)
+{
+    if (available)
+    {
+        state = State::off;
+        update_state();
+        if (was_running)
+        {
+            start();
+
+            // normally the daemon sets the state to running...
+            state = State::running;
+            update_state();
+        }
+        return;
+    }
+
+    was_running = state == State::running || state == State::starting;
+    shutdown(ShutdownPolicy::Poweroff);
+    state = State::unavailable;
+    update_state();
+}
+
 std::string mp::BaseVirtualMachine::ssh_exec(const std::string& cmd, bool whisper)
 {
     std::unique_lock lock{state_mutex};
diff --git a/src/platform/backends/shared/base_virtual_machine.h b/src/platform/backends/shared/base_virtual_machine.h
index bea848dd3d2..4723edf8968 100644
--- a/src/platform/backends/shared/base_virtual_machine.h
+++ b/src/platform/backends/shared/base_virtual_machine.h
@@ -54,12 +54,7 @@ class BaseVirtualMachine : public VirtualMachine
 
     virtual std::string ssh_exec(const std::string& cmd, bool whisper = false) override;
 
-    void set_available(bool available) override
-    {
-        // TODO make vm unavailable by force stopping if running or available by starting again if
-        // it was running
-        throw NotImplementedOnThisBackendException("unavailability");
-    }
+    void set_available(bool available) override;
 
     void wait_until_ssh_up(std::chrono::milliseconds timeout) override;
     void wait_for_cloud_init(std::chrono::milliseconds timeout) override;
diff --git a/src/rpc/multipass.proto b/src/rpc/multipass.proto
index d634d004d99..2c2aed41bcf 100644
--- a/src/rpc/multipass.proto
+++ b/src/rpc/multipass.proto
@@ -208,6 +208,7 @@ message InstanceStatus {
         DELAYED_SHUTDOWN = 6;
         SUSPENDING = 7;
         SUSPENDED = 8;
+        UNAVAILABLE = 9;
     }
     Status status = 1;
 }

From aeab9a5ed42d9bcac79996c34e1d576f1064880f Mon Sep 17 00:00:00 2001
From: Trevor Shoe <trevor.schupbach@canonical.com>
Date: Thu, 24 Apr 2025 09:47:53 -0400
Subject: [PATCH 05/12] [az] Handle unavailable state in daemon

---
 src/daemon/daemon.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 027734fabb3..144df3997f3 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -2085,6 +2085,12 @@ try
             continue;
         }
 
+        if (vm->current_state() == VirtualMachine::State::unavailable)
+        {
+            mpl::log(mpl::Level::info, name, "Ignoring mount since instance unavailable.");
+            continue;
+        }
+
         auto& vm_mounts = mounts[name];
         if (vm_mounts.find(target_path) != vm_mounts.end())
         {
@@ -2335,6 +2341,16 @@ try
             operation = [this, delay_minutes = std::chrono::minutes(request->time_minutes())](
                             VirtualMachine& vm) { return this->shutdown_vm(vm, delay_minutes); };
 
+        operation = [op = std::move(operation)](VirtualMachine& vm) {
+            if (vm.current_state() == VirtualMachine::State::unavailable)
+            {
+                mpl::log(mpl::Level::info, vm.vm_name, "Ignoring stop since instance is unavailable.");
+                return grpc::Status::OK;
+            }
+
+            return op(vm);
+        };
+
         status = cmd_vms(instance_selection.operative_selection, operation);
     }
 
@@ -2369,6 +2385,12 @@ try
     if (status.ok())
     {
         status = cmd_vms(instance_selection.operative_selection, [this](auto& vm) {
+            if (vm.current_state() == VirtualMachine::State::unavailable)
+            {
+                mpl::log(mpl::Level::info, vm.vm_name, "Ignoring suspend since instance is unavailable.");
+                return grpc::Status::OK;
+            }
+
             stop_mounts(vm.vm_name);
 
             vm.suspend();
@@ -2410,6 +2432,12 @@ try
 
     const auto& instance_targets = instance_selection.operative_selection;
     status = cmd_vms(instance_targets, [this](auto& vm) {
+        if (vm.current_state() == VirtualMachine::State::unavailable)
+        {
+            mpl::log(mpl::Level::info, vm.vm_name, "Ignoring restart since instance is unavailable.");
+            return grpc::Status::OK;
+        }
+
         stop_mounts(vm.vm_name);
 
         return reboot_vm(vm);
@@ -2490,6 +2518,12 @@ try
             {
                 const auto& instance_name = vm_it->first;
 
+                if (vm_it->second->current_state() == VirtualMachine::State::unavailable)
+                {
+                    mpl::log(mpl::Level::info, instance_name, "Ignoring delete since instance is unavailable.");
+                    continue;
+                }
+
                 auto snapshot_pick_it = instance_snapshots_map.find(instance_name);
                 const auto& [pick, all] = snapshot_pick_it == instance_snapshots_map.end()
                                               ? SnapshotPick{{}, true}
@@ -2538,12 +2572,19 @@ try
         const auto target_path =
             QDir::cleanPath(QString::fromStdString(path_entry.target_path())).toStdString();
 
-        if (operative_instances.find(name) == operative_instances.end())
+        auto vm = operative_instances.find(name);
+        if (vm == operative_instances.end())
         {
             add_fmt_to(errors, "instance '{}' does not exist", name);
             continue;
         }
 
+        if (vm->second->current_state() == VirtualMachine::State::unavailable)
+        {
+            mpl::log(mpl::Level::info, name, "Ignoring umount since instance unavailable.");
+            continue;
+        }
+
         auto& vm_spec_mounts = vm_instance_specs[name].mounts;
         auto& vm_mounts = mounts[name];
 
@@ -3735,6 +3776,12 @@ error_string mp::Daemon::async_wait_for_ssh_and_start_mounts_for(
             return fmt::to_string(errors);
         }
         const auto vm = it->second;
+
+        if (vm->current_state() == VirtualMachine::State::unavailable)
+        {
+            return fmt::to_string(errors);
+        }
+
         vm->wait_until_ssh_up(timeout);
 
         if (std::is_same<Reply, LaunchReply>::value)

From bc3e81cb3072dfbd0f11f23f1475e1c4164ad281 Mon Sep 17 00:00:00 2001
From: Trevor Shoe <trevor.schupbach@canonical.com>
Date: Thu, 24 Apr 2025 12:20:44 -0400
Subject: [PATCH 06/12] [az] Handle set_available failures

---
 .../shared/base_availability_zone.cpp         | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/platform/backends/shared/base_availability_zone.cpp b/src/platform/backends/shared/base_availability_zone.cpp
index 4c983af15c3..d58c60b48a0 100644
--- a/src/platform/backends/shared/base_availability_zone.cpp
+++ b/src/platform/backends/shared/base_availability_zone.cpp
@@ -117,8 +117,32 @@ void BaseAvailabilityZone::set_available(const bool new_available)
     m.available = new_available;
     serialize();
 
-    for (auto& vm : m.vms)
-        vm.get().set_available(m.available);
+    try
+    {
+        for (auto& vm : m.vms)
+            vm.get().set_available(new_available);
+    }
+    catch (...)
+    {
+        // if an error occurs fallback to available.
+        m.available = true;
+        serialize();
+
+        // make sure nothing is still unavailable.
+        for (auto& vm : m.vms)
+        {
+            // setting the state here breaks encapsulation, but it's already broken.
+            std::unique_lock vm_lock{vm.get().state_mutex};
+            if (vm.get().current_state() == VirtualMachine::State::unavailable)
+            {
+                vm.get().state = VirtualMachine::State::off;
+                vm.get().update_state();
+            }
+        }
+
+        // rethrow the error so something else can deal with it.
+        throw;
+    }
 }
 
 void BaseAvailabilityZone::add_vm(VirtualMachine& vm)

From 59dc73279c68a86f1040e830d1777476a933715d Mon Sep 17 00:00:00 2001
From: Trevor Shoe <trevor.schupbach@canonical.com>
Date: Thu, 8 May 2025 17:07:13 -0400
Subject: [PATCH 07/12] [az] Handle merger rebase

---
 tests/test_base_virtual_machine.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_base_virtual_machine.cpp b/tests/test_base_virtual_machine.cpp
index db896e078de..6d3136a68ab 100644
--- a/tests/test_base_virtual_machine.cpp
+++ b/tests/test_base_virtual_machine.cpp
@@ -258,7 +258,6 @@ struct BaseVM : public Test
     mpt::MockSSHTestFixture mock_ssh_test_fixture;
     const mpt::DummyKeyProvider key_provider{"keeper of the seven keys"};
     NiceMock<MockBaseVirtualMachine> vm{"mock-vm", key_provider, zone};
-    mpt::StubAvailabilityZone zone{};
     std::vector<std::shared_ptr<mpt::MockSnapshot>> snapshot_album;
     QString head_path = vm.tmp_dir->filePath(head_filename);
     QString count_path = vm.tmp_dir->filePath(count_filename);

From 48d6ec748133b2e3cd5abf0259e93abf493ba20a Mon Sep 17 00:00:00 2001
From: Sploder12 <trevorschupbach@gmail.com>
Date: Wed, 14 May 2025 05:08:38 -0400
Subject: [PATCH 08/12] [az] Fix on_restart tests

---
 tests/test_daemon.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_daemon.cpp b/tests/test_daemon.cpp
index 133c64a2639..edbb314a3de 100644
--- a/tests/test_daemon.cpp
+++ b/tests/test_daemon.cpp
@@ -438,7 +438,7 @@ TEST_F(Daemon, ensureThatOnRestartFutureCompletes)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>("yakety-yak");
-    EXPECT_CALL(*mock_vm, current_state).WillOnce(Return(mp::VirtualMachine::State::stopped));
+    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
 
     mp::Signal sig;
@@ -471,7 +471,7 @@ TEST_F(Daemon, startsPreviouslyRunningVmsBack)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).WillOnce(Return(mp::VirtualMachine::State::stopped));
+    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);
@@ -492,7 +492,7 @@ TEST_F(Daemon, callsOnRestartForAlreadyRunningVmsOnConstruction)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).WillOnce(Return(mp::VirtualMachine::State::running));
+    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::running));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);
@@ -513,7 +513,7 @@ TEST_F(Daemon, callsOnRestartForAlreadyStartingVmsOnConstruction)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).WillOnce(Return(mp::VirtualMachine::State::starting));
+    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::starting));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);

From acc2e046171b7ffc4a079f91ca98ff79c59778a3 Mon Sep 17 00:00:00 2001
From: Trevor Shoe <trevor.schupbach@canonical.com>
Date: Mon, 18 Aug 2025 19:43:43 -0400
Subject: [PATCH 09/12] [az] Cleanup rebase

---
 src/daemon/daemon.cpp | 20 +++++++++++++++-----
 tests/test_daemon.cpp | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 144df3997f3..bb5533328c6 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -2272,7 +2272,9 @@ try
                            name);
             continue;
         case VirtualMachine::State::unavailable:
-            fmt::format_to(std::back_inserter(start_errors), "Cannot start the instance '{}' while unavailable.", name);
+            fmt::format_to(std::back_inserter(start_errors),
+                           "Cannot start the instance '{}' while unavailable.",
+                           name);
             continue;
         case VirtualMachine::State::delayed_shutdown:
             delayed_shutdown_instances.erase(name);
@@ -2344,7 +2346,9 @@ try
         operation = [op = std::move(operation)](VirtualMachine& vm) {
             if (vm.current_state() == VirtualMachine::State::unavailable)
             {
-                mpl::log(mpl::Level::info, vm.vm_name, "Ignoring stop since instance is unavailable.");
+                mpl::log(mpl::Level::info,
+                         vm.vm_name,
+                         "Ignoring stop since instance is unavailable.");
                 return grpc::Status::OK;
             }
 
@@ -2387,7 +2391,9 @@ try
         status = cmd_vms(instance_selection.operative_selection, [this](auto& vm) {
             if (vm.current_state() == VirtualMachine::State::unavailable)
             {
-                mpl::log(mpl::Level::info, vm.vm_name, "Ignoring suspend since instance is unavailable.");
+                mpl::log(mpl::Level::info,
+                         vm.vm_name,
+                         "Ignoring suspend since instance is unavailable.");
                 return grpc::Status::OK;
             }
 
@@ -2434,7 +2440,9 @@ try
     status = cmd_vms(instance_targets, [this](auto& vm) {
         if (vm.current_state() == VirtualMachine::State::unavailable)
         {
-            mpl::log(mpl::Level::info, vm.vm_name, "Ignoring restart since instance is unavailable.");
+            mpl::log(mpl::Level::info,
+                     vm.vm_name,
+                     "Ignoring restart since instance is unavailable.");
             return grpc::Status::OK;
         }
 
@@ -2520,7 +2528,9 @@ try
 
                 if (vm_it->second->current_state() == VirtualMachine::State::unavailable)
                 {
-                    mpl::log(mpl::Level::info, instance_name, "Ignoring delete since instance is unavailable.");
+                    mpl::log(mpl::Level::info,
+                             instance_name,
+                             "Ignoring delete since instance is unavailable.");
                     continue;
                 }
 
diff --git a/tests/test_daemon.cpp b/tests/test_daemon.cpp
index edbb314a3de..b9410240b16 100644
--- a/tests/test_daemon.cpp
+++ b/tests/test_daemon.cpp
@@ -438,7 +438,9 @@ TEST_F(Daemon, ensureThatOnRestartFutureCompletes)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>("yakety-yak");
-    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
+    EXPECT_CALL(*mock_vm, current_state)
+        .Times(2)
+        .WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
 
     mp::Signal sig;
@@ -471,7 +473,9 @@ TEST_F(Daemon, startsPreviouslyRunningVmsBack)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
+    EXPECT_CALL(*mock_vm, current_state)
+        .Times(2)
+        .WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);
@@ -492,7 +496,9 @@ TEST_F(Daemon, callsOnRestartForAlreadyRunningVmsOnConstruction)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::running));
+    EXPECT_CALL(*mock_vm, current_state)
+        .Times(2)
+        .WillRepeatedly(Return(mp::VirtualMachine::State::running));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);
@@ -513,7 +519,9 @@ TEST_F(Daemon, callsOnRestartForAlreadyStartingVmsOnConstruction)
 
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
-    EXPECT_CALL(*mock_vm, current_state).Times(2).WillRepeatedly(Return(mp::VirtualMachine::State::starting));
+    EXPECT_CALL(*mock_vm, current_state)
+        .Times(2)
+        .WillRepeatedly(Return(mp::VirtualMachine::State::starting));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
     EXPECT_CALL(*mock_vm, wait_until_ssh_up).Times(1);

From f000acf7de5c1dcad5b3704edb1f96c8b1f31ea7 Mon Sep 17 00:00:00 2001
From: trevor-shoe <trevor.schupbach@canonical.com>
Date: Mon, 15 Sep 2025 03:46:34 -0400
Subject: [PATCH 10/12] [az] Address review comments

---
 include/multipass/virtual_machine.h               |  1 -
 src/daemon/daemon.cpp                             | 15 +--------------
 .../backends/shared/base_virtual_machine.cpp      |  2 +-
 .../backends/shared/base_virtual_machine.h        |  1 +
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/include/multipass/virtual_machine.h b/include/multipass/virtual_machine.h
index e688f7afd3b..f2c1b94a4b6 100644
--- a/include/multipass/virtual_machine.h
+++ b/include/multipass/virtual_machine.h
@@ -137,7 +137,6 @@ class VirtualMachine : private DisabledCopyMove
 
 protected:
     const QDir instance_dir;
-    bool was_running{false};
 
     VirtualMachine(VirtualMachine::State state,
                    const std::string& vm_name,
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index bb5533328c6..8f0bf9782e6 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -2087,7 +2087,7 @@ try
 
         if (vm->current_state() == VirtualMachine::State::unavailable)
         {
-            mpl::log(mpl::Level::info, name, "Ignoring mount since instance unavailable.");
+            add_fmt_to(errors, "instance '{}' is not available", name);
             continue;
         }
 
@@ -2438,14 +2438,6 @@ try
 
     const auto& instance_targets = instance_selection.operative_selection;
     status = cmd_vms(instance_targets, [this](auto& vm) {
-        if (vm.current_state() == VirtualMachine::State::unavailable)
-        {
-            mpl::log(mpl::Level::info,
-                     vm.vm_name,
-                     "Ignoring restart since instance is unavailable.");
-            return grpc::Status::OK;
-        }
-
         stop_mounts(vm.vm_name);
 
         return reboot_vm(vm);
@@ -3787,11 +3779,6 @@ error_string mp::Daemon::async_wait_for_ssh_and_start_mounts_for(
         }
         const auto vm = it->second;
 
-        if (vm->current_state() == VirtualMachine::State::unavailable)
-        {
-            return fmt::to_string(errors);
-        }
-
         vm->wait_until_ssh_up(timeout);
 
         if (std::is_same<Reply, LaunchReply>::value)
diff --git a/src/platform/backends/shared/base_virtual_machine.cpp b/src/platform/backends/shared/base_virtual_machine.cpp
index 3397e293e47..9dfb9ede16b 100644
--- a/src/platform/backends/shared/base_virtual_machine.cpp
+++ b/src/platform/backends/shared/base_virtual_machine.cpp
@@ -59,7 +59,7 @@ constexpr auto yes_overwrite = true;
 
 void assert_vm_stopped(St state)
 {
-    assert(state == St::off || state == St::stopped || state == St::unavailable);
+    assert(state == St::off || state == St::stopped);
 }
 
 mp::Path derive_head_path(const QDir& snapshot_dir)
diff --git a/src/platform/backends/shared/base_virtual_machine.h b/src/platform/backends/shared/base_virtual_machine.h
index 4723edf8968..33ad0c66f34 100644
--- a/src/platform/backends/shared/base_virtual_machine.h
+++ b/src/platform/backends/shared/base_virtual_machine.h
@@ -176,6 +176,7 @@ class BaseVirtualMachine : public VirtualMachine
     std::shared_ptr<Snapshot> head_snapshot = nullptr;
     int snapshot_count = 0; // tracks the number of snapshots ever taken (regardless of deletes)
     mutable std::recursive_mutex snapshot_mutex;
+    bool was_running{false};
 };
 
 } // namespace multipass

From 6739f0b70da2647b608e1bbc407f569c9902aa3f Mon Sep 17 00:00:00 2001
From: trevor-shoe <trevor.schupbach@canonical.com>
Date: Mon, 15 Sep 2025 04:46:53 -0400
Subject: [PATCH 11/12] [az] Add base vm tests for set_available

---
 tests/test_base_virtual_machine.cpp | 34 +++++++++++++++++++++++++++++
 tests/test_daemon.cpp               |  8 +++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/tests/test_base_virtual_machine.cpp b/tests/test_base_virtual_machine.cpp
index 6d3136a68ab..12e86a636d7 100644
--- a/tests/test_base_virtual_machine.cpp
+++ b/tests/test_base_virtual_machine.cpp
@@ -82,6 +82,10 @@ struct MockBaseVirtualMachine : public mpt::MockVirtualMachineT<mp::BaseVirtualM
                                                      get_snapshot,
                                                      mp::BaseVirtualMachine,
                                                      (A<const std::string&>()));
+        MP_DELEGATE_MOCK_CALLS_ON_BASE_WITH_MATCHERS(*this,
+                                                     set_available,
+                                                     mp::BaseVirtualMachine,
+                                                     (A<bool>()));
     }
 
     MOCK_METHOD(std::shared_ptr<mp::Snapshot>,
@@ -1441,4 +1445,34 @@ TEST_F(BaseVM, sshExecRethrowsSSHExceptionsWhenConnected)
                          mpt::match_what(HasSubstr("intentional")));
 }
 
+TEST_F(BaseVM, setUnavailableShutsdownRunning)
+{
+    ON_CALL(vm, current_state).WillByDefault(Return(St::running));
+    EXPECT_CALL(vm, shutdown(mp::VirtualMachine::ShutdownPolicy::Poweroff)).Times(1);
+
+    vm.set_available(false);
+}
+
+TEST_F(BaseVM, setAvailableRestartsRunning)
+{
+    StubBaseVirtualMachine base_vm(zone, St::running);
+
+    base_vm.set_available(false);
+    ASSERT_EQ(base_vm.current_state(), St::unavailable);
+
+    base_vm.set_available(true);
+    EXPECT_EQ(base_vm.current_state(), St::running);
+}
+
+TEST_F(BaseVM, setAvailableKeepsOffOff)
+{
+    StubBaseVirtualMachine base_vm(zone, St::off);
+
+    base_vm.set_available(false);
+    ASSERT_EQ(base_vm.current_state(), St::unavailable);
+
+    base_vm.set_available(true);
+    EXPECT_EQ(base_vm.current_state(), St::off);
+}
+
 } // namespace
diff --git a/tests/test_daemon.cpp b/tests/test_daemon.cpp
index b9410240b16..8b812b8f694 100644
--- a/tests/test_daemon.cpp
+++ b/tests/test_daemon.cpp
@@ -439,7 +439,7 @@ TEST_F(Daemon, ensureThatOnRestartFutureCompletes)
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>("yakety-yak");
     EXPECT_CALL(*mock_vm, current_state)
-        .Times(2)
+        .Times(1)
         .WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
 
@@ -474,7 +474,7 @@ TEST_F(Daemon, startsPreviouslyRunningVmsBack)
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
     EXPECT_CALL(*mock_vm, current_state)
-        .Times(2)
+        .Times(1)
         .WillRepeatedly(Return(mp::VirtualMachine::State::stopped));
     EXPECT_CALL(*mock_vm, start).Times(1);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
@@ -497,7 +497,7 @@ TEST_F(Daemon, callsOnRestartForAlreadyRunningVmsOnConstruction)
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
     EXPECT_CALL(*mock_vm, current_state)
-        .Times(2)
+        .Times(1)
         .WillRepeatedly(Return(mp::VirtualMachine::State::running));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);
@@ -520,7 +520,7 @@ TEST_F(Daemon, callsOnRestartForAlreadyStartingVmsOnConstruction)
     // This VM was running before, but not now.
     auto mock_vm = std::make_unique<NiceMock<mpt::MockVirtualMachine>>(vm_props.name);
     EXPECT_CALL(*mock_vm, current_state)
-        .Times(2)
+        .Times(1)
         .WillRepeatedly(Return(mp::VirtualMachine::State::starting));
     EXPECT_CALL(*mock_vm, start).Times(0);
     EXPECT_CALL(*mock_vm, update_state).Times(1);

From f00a058c46391b6408541c0a09382e9b0d02057a Mon Sep 17 00:00:00 2001
From: trevor-shoe <trevor.schupbach@canonical.com>
Date: Tue, 21 Oct 2025 13:39:43 -0400
Subject: [PATCH 12/12] [az] Cleanup logging logic

---
 src/daemon/daemon.cpp                         | 22 ++++---------------
 .../hyperv/hyperv_virtual_machine.cpp         |  4 ++++
 .../backends/qemu/qemu_virtual_machine.cpp    |  6 +++--
 .../backends/shared/base_virtual_machine.cpp  |  8 +++++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 8f0bf9782e6..fb9bc63b700 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -2267,14 +2267,12 @@ try
             continue;
         }
         case VirtualMachine::State::suspending:
-            fmt::format_to(std::back_inserter(start_errors),
-                           "Cannot start the instance '{}' while suspending.",
-                           name);
-            continue;
         case VirtualMachine::State::unavailable:
             fmt::format_to(std::back_inserter(start_errors),
-                           "Cannot start the instance '{}' while unavailable.",
-                           name);
+                           "Cannot start the instance '{}' while {}.",
+                           name,
+                           vm.current_state() == VirtualMachine::State::suspending ? "suspending"
+                                                                                   : "unavailable");
             continue;
         case VirtualMachine::State::delayed_shutdown:
             delayed_shutdown_instances.erase(name);
@@ -2343,18 +2341,6 @@ try
             operation = [this, delay_minutes = std::chrono::minutes(request->time_minutes())](
                             VirtualMachine& vm) { return this->shutdown_vm(vm, delay_minutes); };
 
-        operation = [op = std::move(operation)](VirtualMachine& vm) {
-            if (vm.current_state() == VirtualMachine::State::unavailable)
-            {
-                mpl::log(mpl::Level::info,
-                         vm.vm_name,
-                         "Ignoring stop since instance is unavailable.");
-                return grpc::Status::OK;
-            }
-
-            return op(vm);
-        };
-
         status = cmd_vms(instance_selection.operative_selection, operation);
     }
 
diff --git a/src/platform/backends/hyperv/hyperv_virtual_machine.cpp b/src/platform/backends/hyperv/hyperv_virtual_machine.cpp
index f0dca2c39b4..a41df3718d1 100644
--- a/src/platform/backends/hyperv/hyperv_virtual_machine.cpp
+++ b/src/platform/backends/hyperv/hyperv_virtual_machine.cpp
@@ -412,6 +412,10 @@ void mp::HyperVVirtualMachine::suspend()
     {
         mpl::info(vm_name, "Ignoring suspend issued while stopped");
     }
+    else if (present_state == State::unavailable)
+    {
+        mpl::log(mpl::Level::info, vm_name, "Ignoring suspend since instance is unavailable");
+    }
 
     monitor->on_suspend();
 }
diff --git a/src/platform/backends/qemu/qemu_virtual_machine.cpp b/src/platform/backends/qemu/qemu_virtual_machine.cpp
index ed53cf6ab60..77d8879b3ce 100644
--- a/src/platform/backends/qemu/qemu_virtual_machine.cpp
+++ b/src/platform/backends/qemu/qemu_virtual_machine.cpp
@@ -426,9 +426,11 @@ void mp::QemuVirtualMachine::suspend()
 
         vm_process.reset(nullptr);
     }
-    else if (state == State::off || state == State::suspended)
+    else if (state == State::off || state == State::suspended || state == State::unavailable)
     {
-        mpl::info(vm_name, "Ignoring suspend issued while stopped/suspended");
+        mpl::log(mpl::Level::info,
+                 vm_name,
+                 "Ignoring suspend issued while stopped/suspended/unavailable");
         monitor->on_suspend();
     }
 }
diff --git a/src/platform/backends/shared/base_virtual_machine.cpp b/src/platform/backends/shared/base_virtual_machine.cpp
index 9dfb9ede16b..93f252c210e 100644
--- a/src/platform/backends/shared/base_virtual_machine.cpp
+++ b/src/platform/backends/shared/base_virtual_machine.cpp
@@ -200,10 +200,14 @@ std::string mp::BaseVirtualMachine::get_instance_id_from_the_cloud_init() const
 void mp::BaseVirtualMachine::check_state_for_shutdown(ShutdownPolicy shutdown_policy)
 {
     // A mutex should already be locked by the caller here
-    if (state == State::off || state == State::stopped || state == State::unavailable)
+    if (state == State::off || state == State::stopped)
     {
         throw VMStateIdempotentException{"Ignoring shutdown since instance is already stopped."};
     }
+    if (state == State::unavailable)
+    {
+        throw VMStateIdempotentException{"Ignoring shutdown since instance is unavailable."};
+    }
 
     if (shutdown_policy == ShutdownPolicy::Poweroff)
     {
@@ -255,7 +259,7 @@ void mp::BaseVirtualMachine::set_available(bool available)
         return;
     }
 
-    was_running = state == State::running || state == State::starting;
+    was_running = state == State::running || state == State::starting || state == State::restarting;
     shutdown(ShutdownPolicy::Poweroff);
     state = State::unavailable;
     update_state();