openstack
/
nova
Code Issues Proposed changes

Merge "Fix using targeted cell context when finding services in cells"

This commit is contained in:
Jenkins 2017-06-20 18:46:48 +00:00 committed by Gerrit Code Review
parent 6dabf10815 afa7a22f55
commit 51898b2e34
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/api.py
View File

@ -4383,8 +4383,8 @@ def _find_service_in_cell(context, service_id=None, service_host=None):
for cell in CELLS:
# NOTE(danms): Services can be in cell0, so don't skip it here
try:
with nova_context.target_cell(context, cell):
cell_service = lookup_fn(context)
with nova_context.target_cell(context, cell) as cctxt:
cell_service = lookup_fn(cctxt)
except exception.NotFound:
# NOTE(danms): Keep looking in other cells
continue

19
nova/tests/unit/compute/test_compute_api.py
View File

@ -5136,6 +5136,25 @@ class ComputeAPIUnitTestCase(_ComputeAPIUnitTestMixIn, test.NoDBTestCase):
self.assertRaises(exception.NovaException,
compute_api._find_service_in_cell, self.context)
@mock.patch('nova.objects.Service.get_by_id')
def test_find_service_in_cell_targets(self, mock_get_service):
mock_get_service.side_effect = [exception.NotFound(),
mock.sentinel.service]
compute_api.CELLS = [mock.sentinel.cell0, mock.sentinel.cell1]
@contextlib.contextmanager
def fake_target(context, cell):
yield 'context-for-%s' % cell
with mock.patch('nova.context.target_cell') as mock_target:
mock_target.side_effect = fake_target
s = compute_api._find_service_in_cell(self.context, service_id=123)
self.assertEqual(mock.sentinel.service, s)
cells = [call[0][0]
for call in mock_get_service.call_args_list]
self.assertEqual(['context-for-%s' % c for c in compute_api.CELLS],
cells)
def test_validate_and_build_base_options_translate_neutron_secgroup(self):
"""Tests that _check_requested_secgroups will return a uuid for a
requested Neutron security group and that will be returned from