openstack
/
nova
Code Issues Proposed changes

Merge "Remove a lazy load on every server show"

This commit is contained in:
Zuul 2023-08-24 02:50:24 +00:00 committed by Gerrit Code Review
parent 17b46bae84 9ae9d77b03
commit a9b1e024eb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/api/openstack/compute/servers.py
View File

@ -469,6 +469,7 @@ class ServersController(wsgi.Controller):
instance = self._get_server(
context, req, id, is_detail=True,
columns_to_join=['services'],
cell_down_support=cell_down_support)
context.can(server_policies.SERVERS % 'show',
target={'project_id': instance.project_id})

9
nova/tests/unit/api/openstack/compute/test_servers.py
View File

@ -437,7 +437,8 @@ class ServersControllerTest(_ServersControllerTest):
def fake_get(*args, **kwargs):
expected_attrs = kwargs['expected_attrs']
self.assertEqual(['flavor', 'info_cache', 'metadata',
'numa_topology'], expected_attrs)
'numa_topology', 'services'],
expected_attrs)
ctxt = context.RequestContext('fake', self.project_id)
return fake_instance.fake_instance_obj(
ctxt, expected_attrs=expected_attrs,
@ -512,7 +513,8 @@ class ServersControllerTest(_ServersControllerTest):
self.mock_get.assert_called_once_with(
self.request.environ['nova.context'], FAKE_UUID,
expected_attrs=['flavor', 'info_cache', 'metadata',
'numa_topology'], cell_down_support=False)
'numa_topology', 'services'],
cell_down_support=False)
def test_get_server_with_id_image_ref_by_id(self):
image_bookmark = "http://localhost/%s/images/%s" % (
@ -531,7 +533,8 @@ class ServersControllerTest(_ServersControllerTest):
self.mock_get.assert_called_once_with(
self.request.environ['nova.context'], FAKE_UUID,
expected_attrs=['flavor', 'info_cache', 'metadata',
'numa_topology'], cell_down_support=False)
'numa_topology', 'services'],
cell_down_support=False)
def _generate_nw_cache_info(self):
pub0 = ('172.19.0.1', '172.19.0.2',)