openstack/nova
Code Issues Proposed changes

Merge "VMware: serial console log (completed)"

Browse Source
This commit is contained in:
Zuul
2017-11-21 10:57:14 +00:00
committed by Gerrit Code Review
parent 497da9f90f d9c03b1ecb
commit 9633ebdf37
5 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nova/tests/unit/virt/vmwareapi/test_driver_api.py
View File

@@ -1671,10 +1671,6 @@ class VMwareAPIVMTestCase(test.NoDBTestCase,
actual = self.conn.get_instance_diagnostics(instance)
self.assertDiagnosticsEqual(expected, actual)
def test_get_console_output(self):
self.assertRaises(NotImplementedError, self.conn.get_console_output,
None, None)
def test_get_vnc_console_non_existent(self):
self._create_instance()
self.assertRaises(exception.InstanceNotFound,
@@ -1702,6 +1698,24 @@ class VMwareAPIVMTestCase(test.NoDBTestCase,
self.context,
self.instance)
def test_get_console_output(self):
self.flags(serial_log_dir='/opt/vspc', group='vmware')
self._create_instance()
with test.nested(
mock.patch('os.path.exists', return_value=True),
mock.patch('{}.open'.format(driver.__name__), create=True),
mock.patch('nova.privsep.path.last_bytes')
) as (fake_exists, fake_open, fake_last_bytes):
fake_open.return_value = mock.MagicMock()
fake_fd = fake_open.return_value.__enter__.return_value
fake_last_bytes.return_value = b'fira', 0
output = self.conn.get_console_output(self.context, self.instance)
fname = self.instance.uuid.replace('-', '')
fake_exists.assert_called_once_with('/opt/vspc/{}'.format(fname))
fake_last_bytes.assert_called_once_with(fake_fd,
driver.MAX_CONSOLE_BYTES)
self.assertEqual(b'fira', output)
def test_get_volume_connector(self):
self._create_vm()
connector_dict = self.conn.get_volume_connector(self.instance)