From 25e38d1114cd4a606d7785800b4476dc7e82be8b Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Fri, 15 Sep 2023 11:41:37 +0200
Subject: [PATCH] Wait for guest OS ready after starting a VM

test_3_activate_server shuts off and on a VM. With this patch, the test
will wait until the guest OS is ready after starting it.

Change-Id: I0350aec46c937d18e1188d2103c2059237005f92
---
 tobiko/openstack/stacks/_nova.py          | 13 ++++++++++---
 tobiko/tests/scenario/nova/test_server.py |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tobiko/openstack/stacks/_nova.py b/tobiko/openstack/stacks/_nova.py
index f0e4ef0ac..81684ea1c 100644
--- a/tobiko/openstack/stacks/_nova.py
+++ b/tobiko/openstack/stacks/_nova.py
@@ -288,6 +288,10 @@ class ServerStackFixture(heat.HeatStackFixture, abc.ABC):
             if hypervisor in hypervisors:
                 self.migrate_server(live=True, wait_for_guest_os=True)
 
+    def wait_for_guest_os_ready(self, timeout=None):
+        nova.wait_for_guest_os_ready(server_id=self.server_id,
+                                     timeout=timeout)
+
     def migrate_server(self,
                        live=False,
                        host: str = None,
@@ -296,7 +300,7 @@ class ServerStackFixture(heat.HeatStackFixture, abc.ABC):
             -> nova.NovaServer:
         server = nova.activate_server(server=self.server_id)
         if wait_for_guest_os:
-            nova.wait_for_guest_os_ready(server)
+            self.wait_for_guest_os_ready()
         if live:
             nova.live_migrate_server(server,
                                      host=host,
@@ -434,12 +438,15 @@ class CloudInitServerStackFixture(ServerStackFixture, ABC):
         external=True, lock_path=tobiko.LOCK_DIR)
     def setup_fixture(self):
         super(CloudInitServerStackFixture, self).setup_fixture()
-        nova.wait_for_guest_os_ready(server_id=self.server_id,
-                                     timeout=900.)
+        self.wait_for_guest_os_ready()
         if self.has_floating_ip:
             self.assert_is_reachable()
             self.wait_for_cloud_init_done()
 
+    def wait_for_guest_os_ready(self, timeout=900.):
+        super(CloudInitServerStackFixture, self).wait_for_guest_os_ready(
+            timeout=timeout)
+
     @property
     def is_reachable_timeout(self) -> tobiko.Seconds:
         # I expect cloud-init based servers to be slow to boot
diff --git a/tobiko/tests/scenario/nova/test_server.py b/tobiko/tests/scenario/nova/test_server.py
index 17ab0287a..0791e9711 100644
--- a/tobiko/tests/scenario/nova/test_server.py
+++ b/tobiko/tests/scenario/nova/test_server.py
@@ -58,6 +58,7 @@ class BaseServerTest(testtools.TestCase):
         self.assert_is_unreachable()
 
         self.ensure_server(status='ACTIVE')
+        self.stack.wait_for_guest_os_ready()
         self.assert_is_reachable()
 
     @pytest.mark.server_migrate