Revert "Check VM's console log before trying to SSH to it."
This reverts commit e3405ba808f97eae57f3a60991000afaa34cbe89.
AFAICT wait_for_sshable has never been wired up for any tests either
in-tree or within the wider opendev namespace:
https://codesearch.opendev.org/?q=wait_for_sshable
Remove this before introducing a fresh implementation overloading the
original wait_unil kwarg.
Change-Id: I15b5cdcda387e4868d4431c86ad087f3e3e2c8fe
diff --git a/tempest/common/compute.py b/tempest/common/compute.py
index a062f6f..04b67e4 100644
--- a/tempest/common/compute.py
+++ b/tempest/common/compute.py
@@ -57,7 +57,7 @@
def create_test_server(clients, validatable=False, validation_resources=None,
tenant_network=None, wait_until=None,
volume_backed=False, name=None, flavor=None,
- image_id=None, wait_for_sshable=True, **kwargs):
+ image_id=None, **kwargs):
"""Common wrapper utility returning a test server.
This method is a common wrapper returning a test server that can be
@@ -93,8 +93,6 @@
CONF.compute.flavor_ref will be used instead.
:param image_id: ID of the image to be used to provision the server. If not
defined, CONF.compute.image_ref will be used instead.
- :param wait_for_sshable: Check server's console log and wait until it will
- be ready to login.
:returns: a tuple
"""
@@ -265,10 +263,6 @@
LOG.exception('Server %s failed to delete in time',
server['id'])
- if (validatable and CONF.compute_feature_enabled.console_output and
- wait_for_sshable):
- waiters.wait_for_guest_os_boot(clients.servers_client, server['id'])
-
return body, servers
diff --git a/tempest/common/waiters.py b/tempest/common/waiters.py
index 1b69349..0b30ff3 100644
--- a/tempest/common/waiters.py
+++ b/tempest/common/waiters.py
@@ -526,23 +526,6 @@
raise lib_exc.TimeoutException(message)
-def wait_for_guest_os_boot(client, server_id):
- start_time = int(time.time())
- while True:
- console_output = client.get_console_output(server_id)['output']
- for line in console_output.split('\n'):
- if 'login:' in line.lower():
- return
- if int(time.time()) - start_time >= client.build_timeout:
- LOG.info("Guest OS on server %s probably isn't ready or its "
- "console log can't be parsed properly. If guest OS "
- "isn't ready, that may cause problems with SSH to "
- "the server.",
- server_id)
- return
- time.sleep(client.build_interval)
-
-
def wait_for_server_floating_ip(servers_client, server, floating_ip,
wait_for_disassociate=False):
"""Wait for floating IP association or disassociation.
diff --git a/tempest/tests/common/test_waiters.py b/tempest/tests/common/test_waiters.py
index b76a263..5b0acfa 100755
--- a/tempest/tests/common/test_waiters.py
+++ b/tempest/tests/common/test_waiters.py
@@ -276,36 +276,6 @@
)
sleep.assert_called_once_with(client.build_interval)
- def test_wait_for_guest_os_boot(self):
- get_console_output = mock.Mock(
- side_effect=[
- {'output': 'os not ready yet\n'},
- {'output': 'login:\n'}
- ])
- client = self.mock_client(get_console_output=get_console_output)
- self.patch('time.time', return_value=0.)
- sleep = self.patch('time.sleep')
-
- with mock.patch.object(waiters.LOG, "info") as log_info:
- waiters.wait_for_guest_os_boot(client, 'server_id')
-
- get_console_output.assert_has_calls([
- mock.call('server_id'), mock.call('server_id')])
- sleep.assert_called_once_with(client.build_interval)
- log_info.assert_not_called()
-
- def test_wait_for_guest_os_boot_timeout(self):
- get_console_output = mock.Mock(
- return_value={'output': 'os not ready yet\n'})
- client = self.mock_client(get_console_output=get_console_output)
- self.patch('time.time', side_effect=[0., client.build_timeout + 1.])
- self.patch('time.sleep')
-
- with mock.patch.object(waiters.LOG, "info") as log_info:
- waiters.wait_for_guest_os_boot(client, 'server_id')
-
- log_info.assert_called_once()
-
class TestVolumeWaiters(base.TestCase):
vol_migrating_src_host = {