Merge "Stop using mox stubs in test_remote_consoles.py"

This commit is contained in:
Jenkins 2017-07-19 16:30:37 +00:00 committed by Gerrit Code Review
commit e6d47a8fd0
1 changed files with 206 additions and 272 deletions

View File

@ -21,313 +21,264 @@ from nova.api.openstack.compute import remote_consoles \
as console_v21
from nova.compute import api as compute_api
from nova import exception
from nova import objects
from nova import test
from nova.tests.unit.api.openstack import fakes
def fake_get_vnc_console(self, _context, _instance, _console_type):
return {'url': 'http://fake'}
def fake_get_spice_console(self, _context, _instance, _console_type):
return {'url': 'http://fake'}
def fake_get_rdp_console(self, _context, _instance, _console_type):
return {'url': 'http://fake'}
def fake_get_serial_console(self, _context, _instance, _console_type):
return {'url': 'ws://fake'}
def fake_get_vnc_console_invalid_type(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeInvalid(console_type=_console_type)
def fake_get_spice_console_invalid_type(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeInvalid(console_type=_console_type)
def fake_get_rdp_console_invalid_type(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeInvalid(console_type=_console_type)
def fake_get_vnc_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_spice_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_rdp_console_type_unavailable(self, _context,
_instance, _console_type):
raise exception.ConsoleTypeUnavailable(console_type=_console_type)
def fake_get_vnc_console_not_ready(self, _context, instance, _console_type):
raise exception.InstanceNotReady(instance_id=instance["uuid"])
def fake_get_spice_console_not_ready(self, _context, instance, _console_type):
raise exception.InstanceNotReady(instance_id=instance["uuid"])
def fake_get_rdp_console_not_ready(self, _context, instance, _console_type):
raise exception.InstanceNotReady(instance_id=instance["uuid"])
def fake_get_vnc_console_not_found(self, _context, instance, _console_type):
raise exception.InstanceNotFound(instance_id=instance["uuid"])
def fake_get_spice_console_not_found(self, _context, instance, _console_type):
raise exception.InstanceNotFound(instance_id=instance["uuid"])
def fake_get_rdp_console_not_found(self, _context, instance, _console_type):
raise exception.InstanceNotFound(instance_id=instance["uuid"])
def fake_get(self, context, instance_uuid, expected_attrs=None):
return {'uuid': instance_uuid}
def fake_get_not_found(self, context, instance_uuid, expected_attrs=None):
raise exception.InstanceNotFound(instance_id=instance_uuid)
class ConsolesExtensionTestV21(test.NoDBTestCase):
controller_class = console_v21.RemoteConsolesController
validation_error = exception.ValidationError
def setUp(self):
super(ConsolesExtensionTestV21, self).setUp()
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console)
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console)
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console)
self.stubs.Set(compute_api.API, 'get_serial_console',
fake_get_serial_console)
self.stubs.Set(compute_api.API, 'get', fake_get)
self.instance = objects.Instance(uuid=fakes.FAKE_UUID)
self.stub_out('nova.compute.api.API.get',
lambda *a, **kw: self.instance)
self.controller = self.controller_class()
def _check_console_failure(self, func, exception, body):
def _check_console_failure(self, func, expected_exception, body,
mocked_method=None, raised_exception=None):
req = fakes.HTTPRequest.blank('')
self.assertRaises(exception,
eval(func),
req, fakes.FAKE_UUID, body=body)
def test_get_vnc_console(self):
if mocked_method:
@mock.patch.object(compute_api.API, mocked_method,
side_effect=raised_exception)
def _do_test(mock_method):
self.assertRaises(expected_exception,
func,
req, fakes.FAKE_UUID, body=body)
self.assertTrue(mock_method.called)
_do_test()
else:
self.assertRaises(expected_exception,
func,
req, fakes.FAKE_UUID, body=body)
@mock.patch.object(compute_api.API, 'get_vnc_console',
return_value={'url': 'http://fake'})
def test_get_vnc_console(self, mock_get_vnc_console):
body = {'os-getVNCConsole': {'type': 'novnc'}}
req = fakes.HTTPRequest.blank('')
output = self.controller.get_vnc_console(req, fakes.FAKE_UUID,
body=body)
self.assertEqual(output,
{u'console': {u'url': u'http://fake', u'type': u'novnc'}})
mock_get_vnc_console.assert_called_once_with(
req.environ['nova.context'], self.instance, 'novnc')
def test_get_vnc_console_not_ready(self):
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_not_ready)
body = {'os-getVNCConsole': {'type': 'novnc'}}
self._check_console_failure('self.controller.get_vnc_console',
webob.exc.HTTPConflict,
body)
self._check_console_failure(
self.controller.get_vnc_console,
webob.exc.HTTPConflict,
body,
'get_vnc_console',
exception.InstanceNotReady(instance_id=fakes.FAKE_UUID))
def test_get_vnc_console_no_type(self):
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_invalid_type)
body = {'os-getVNCConsole': {}}
self._check_console_failure('self.controller.get_vnc_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_vnc_console,
self.validation_error,
body)
def test_get_vnc_console_no_instance(self):
self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
body = {'os-getVNCConsole': {'type': 'novnc'}}
self._check_console_failure('self.controller.get_vnc_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_vnc_console,
webob.exc.HTTPNotFound,
body,
'get',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_vnc_console_no_instance_on_console_get(self):
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_not_found)
body = {'os-getVNCConsole': {'type': 'novnc'}}
self._check_console_failure('self.controller.get_vnc_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_vnc_console,
webob.exc.HTTPNotFound,
body,
'get_vnc_console',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_vnc_console_invalid_type(self):
body = {'os-getVNCConsole': {'type': 'invalid'}}
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_invalid_type)
self._check_console_failure('self.controller.get_vnc_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_vnc_console,
self.validation_error,
body)
def test_get_vnc_console_type_unavailable(self):
body = {'os-getVNCConsole': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_vnc_console',
fake_get_vnc_console_type_unavailable)
self._check_console_failure('self.controller.get_vnc_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_vnc_console,
self.validation_error,
body)
def test_get_vnc_console_not_implemented(self):
self.stubs.Set(compute_api.API, 'get_vnc_console',
fakes.fake_not_implemented)
body = {'os-getVNCConsole': {'type': 'novnc'}}
self._check_console_failure('self.controller.get_vnc_console',
webob.exc.HTTPNotImplemented,
body)
self._check_console_failure(
self.controller.get_vnc_console,
webob.exc.HTTPNotImplemented,
body,
'get_vnc_console',
NotImplementedError())
def test_get_spice_console(self):
@mock.patch.object(compute_api.API, 'get_spice_console',
return_value={'url': 'http://fake'})
def test_get_spice_console(self, mock_get_spice_console):
body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
req = fakes.HTTPRequest.blank('')
output = self.controller.get_spice_console(req, fakes.FAKE_UUID,
body=body)
self.assertEqual(output,
{u'console': {u'url': u'http://fake', u'type': u'spice-html5'}})
mock_get_spice_console.assert_called_once_with(
req.environ['nova.context'], self.instance, 'spice-html5')
def test_get_spice_console_not_ready(self):
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_not_ready)
body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
self._check_console_failure('self.controller.get_spice_console',
webob.exc.HTTPConflict,
body)
self._check_console_failure(
self.controller.get_spice_console,
webob.exc.HTTPConflict,
body,
'get_spice_console',
exception.InstanceNotReady(instance_id=fakes.FAKE_UUID))
def test_get_spice_console_no_type(self):
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_invalid_type)
body = {'os-getSPICEConsole': {}}
self._check_console_failure('self.controller.get_spice_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_spice_console,
self.validation_error,
body)
def test_get_spice_console_no_instance(self):
self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
self._check_console_failure('self.controller.get_spice_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_spice_console,
webob.exc.HTTPNotFound,
body,
'get',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_spice_console_no_instance_on_console_get(self):
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_not_found)
body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
self._check_console_failure('self.controller.get_spice_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_spice_console,
webob.exc.HTTPNotFound,
body,
'get_spice_console',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_spice_console_invalid_type(self):
body = {'os-getSPICEConsole': {'type': 'invalid'}}
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_invalid_type)
self._check_console_failure('self.controller.get_spice_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_spice_console,
self.validation_error,
body)
def test_get_spice_console_not_implemented(self):
body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
self.stubs.Set(compute_api.API, 'get_spice_console',
fakes.fake_not_implemented)
self._check_console_failure('self.controller.get_spice_console',
webob.exc.HTTPNotImplemented,
body)
self._check_console_failure(
self.controller.get_spice_console,
webob.exc.HTTPNotImplemented,
body,
'get_spice_console',
NotImplementedError())
def test_get_spice_console_type_unavailable(self):
body = {'os-getSPICEConsole': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_spice_console',
fake_get_spice_console_type_unavailable)
self._check_console_failure('self.controller.get_spice_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_spice_console,
self.validation_error,
body)
def test_get_rdp_console(self):
@mock.patch.object(compute_api.API, 'get_rdp_console',
return_value={'url': 'http://fake'})
def test_get_rdp_console(self, mock_get_rdp_console):
body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
req = fakes.HTTPRequest.blank('')
output = self.controller.get_rdp_console(req, fakes.FAKE_UUID,
body=body)
self.assertEqual(output,
{u'console': {u'url': u'http://fake', u'type': u'rdp-html5'}})
mock_get_rdp_console.assert_called_once_with(
req.environ['nova.context'], self.instance, 'rdp-html5')
def test_get_rdp_console_not_ready(self):
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_not_ready)
body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
self._check_console_failure('self.controller.get_rdp_console',
webob.exc.HTTPConflict,
body)
self._check_console_failure(
self.controller.get_rdp_console,
webob.exc.HTTPConflict,
body,
'get_rdp_console',
exception.InstanceNotReady(instance_id=fakes.FAKE_UUID))
def test_get_rdp_console_no_type(self):
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_invalid_type)
body = {'os-getRDPConsole': {}}
self._check_console_failure('self.controller.get_rdp_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_rdp_console,
self.validation_error,
body)
def test_get_rdp_console_no_instance(self):
self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
self._check_console_failure('self.controller.get_rdp_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_rdp_console,
webob.exc.HTTPNotFound,
body,
'get',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_rdp_console_no_instance_on_console_get(self):
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_not_found)
body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
self._check_console_failure('self.controller.get_rdp_console',
webob.exc.HTTPNotFound,
body)
self._check_console_failure(
self.controller.get_rdp_console,
webob.exc.HTTPNotFound,
body,
'get_rdp_console',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_rdp_console_invalid_type(self):
body = {'os-getRDPConsole': {'type': 'invalid'}}
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_invalid_type)
self._check_console_failure('self.controller.get_rdp_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_rdp_console,
self.validation_error,
body)
def test_get_rdp_console_type_unavailable(self):
body = {'os-getRDPConsole': {'type': 'unavailable'}}
self.stubs.Set(compute_api.API, 'get_rdp_console',
fake_get_rdp_console_type_unavailable)
self._check_console_failure('self.controller.get_rdp_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_rdp_console,
self.validation_error,
body)
def test_get_vnc_console_with_undefined_param(self):
body = {'os-getVNCConsole': {'type': 'novnc', 'undefined': 'foo'}}
self._check_console_failure('self.controller.get_vnc_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_vnc_console,
self.validation_error,
body)
def test_get_spice_console_with_undefined_param(self):
body = {'os-getSPICEConsole': {'type': 'spice-html5',
'undefined': 'foo'}}
self._check_console_failure('self.controller.get_spice_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_spice_console,
self.validation_error,
body)
def test_get_rdp_console_with_undefined_param(self):
body = {'os-getRDPConsole': {'type': 'rdp-html5', 'undefined': 'foo'}}
self._check_console_failure('self.controller.get_rdp_console',
self.validation_error,
body)
self._check_console_failure(
self.controller.get_rdp_console,
self.validation_error,
body)
def test_get_serial_console(self):
@mock.patch.object(compute_api.API, 'get_serial_console',
return_value={'url': 'ws://fake'})
def test_get_serial_console(self, mock_get_serial_console):
body = {'os-getSerialConsole': {'type': 'serial'}}
req = fakes.HTTPRequest.blank('')
output = self.controller.get_serial_console(req, fakes.FAKE_UUID,
@ -335,95 +286,78 @@ class ConsolesExtensionTestV21(test.NoDBTestCase):
self.assertEqual({u'console': {u'url': u'ws://fake',
u'type': u'serial'}},
output)
mock_get_serial_console.assert_called_once_with(
req.environ['nova.context'], self.instance, 'serial')
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_not_enable(self, get_serial_console):
get_serial_console.side_effect = exception.ConsoleTypeUnavailable(
console_type="serial")
def test_get_serial_console_not_enable(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPBadRequest,
body)
self.assertTrue(get_serial_console.called)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_invalid_type(self, get_serial_console):
get_serial_console.side_effect = (
exception.ConsoleTypeInvalid(console_type='invalid'))
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPBadRequest,
body,
'get_serial_console',
exception.ConsoleTypeUnavailable(console_type="serial"))
def test_get_serial_console_invalid_type(self):
body = {'os-getSerialConsole': {'type': 'invalid'}}
self._check_console_failure('self.controller.get_serial_console',
self.validation_error,
body)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_no_type(self, get_serial_console):
get_serial_console.side_effect = (
exception.ConsoleTypeInvalid(console_type=''))
self._check_console_failure(
self.controller.get_serial_console,
self.validation_error,
body)
def test_get_serial_console_no_type(self):
body = {'os-getSerialConsole': {}}
self._check_console_failure('self.controller.get_serial_console',
self.validation_error,
body)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_no_instance(self, get_serial_console):
get_serial_console.side_effect = (
exception.InstanceNotFound(instance_id='xxx'))
self._check_console_failure(
self.controller.get_serial_console,
self.validation_error,
body)
def test_get_serial_console_no_instance(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPNotFound,
body)
self.assertTrue(get_serial_console.called)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_instance_not_ready(self, get_serial_console):
get_serial_console.side_effect = (
exception.InstanceNotReady(instance_id='xxx'))
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPNotFound,
body,
'get_serial_console',
exception.InstanceNotFound(instance_id=fakes.FAKE_UUID))
def test_get_serial_console_instance_not_ready(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPConflict,
body)
self.assertTrue(get_serial_console.called)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_socket_exhausted(self, get_serial_console):
get_serial_console.side_effect = (
exception.SocketPortRangeExhaustedException(
host='127.0.0.1'))
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPConflict,
body,
'get_serial_console',
exception.InstanceNotReady(instance_id=fakes.FAKE_UUID))
def test_get_serial_console_socket_exhausted(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPBadRequest,
body)
self.assertTrue(get_serial_console.called)
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPBadRequest,
body,
'get_serial_console',
exception.SocketPortRangeExhaustedException(host='127.0.0.1'))
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_image_nport_invalid(self, get_serial_console):
get_serial_console.side_effect = (
def test_get_serial_console_image_nport_invalid(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPBadRequest,
body,
'get_serial_console',
exception.ImageSerialPortNumberInvalid(
num_ports='x', property="hw_serial_port_count"))
def test_get_serial_console_image_nport_exceed(self):
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPBadRequest,
body)
self.assertTrue(get_serial_console.called)
@mock.patch.object(compute_api.API, 'get_serial_console')
def test_get_serial_console_image_nport_exceed(self, get_serial_console):
get_serial_console.side_effect = (
self._check_console_failure(
self.controller.get_serial_console,
webob.exc.HTTPBadRequest,
body,
'get_serial_console',
exception.ImageSerialPortNumberExceedFlavorValue())
body = {'os-getSerialConsole': {'type': 'serial'}}
self._check_console_failure('self.controller.get_serial_console',
webob.exc.HTTPBadRequest,
body)
self.assertTrue(get_serial_console.called)
class ConsolesExtensionTestV26(test.NoDBTestCase):
def setUp(self):