Let the soft reboot really happen in the minimum scenario

The cirros image can support the soft reboot, but we reboot the machine
before the acpid started, it leads to additional 120 second wait before
nova falls back to the hard reboot.
As a solution we will ssh the machine before reboot, because the ssh
server starts after the acpid, so we will send the ACPI event, only
when the acpid is really running.

Change-Id: I3700a374dc937086518c5c843a288e935ab458bf
This commit is contained in:
Attila Fazekas 2014-02-08 18:51:38 +01:00
parent 8ee0079b8f
commit 28c2520dc9

View File

@ -130,6 +130,7 @@ class TestMinimumBasicScenario(manager.OfficialClientTest):
def ssh_to_server(self):
try:
self.linux_client = self.get_remote_client(self.floating_ip.ip)
self.linux_client.validate_authentication()
except Exception:
LOG.exception('ssh to server failed')
self._log_console_output()
@ -160,10 +161,11 @@ class TestMinimumBasicScenario(manager.OfficialClientTest):
self.nova_volume_attach()
self.addCleanup(self.nova_volume_detach)
self.cinder_show()
self.nova_reboot()
self.nova_floating_ip_create()
self.nova_floating_ip_add()
self._create_loginable_secgroup_rule_nova()
self.ssh_to_server()
self.nova_reboot()
self.ssh_to_server()
self.check_partitions()