Merge "Avoid lazy-loads in resize"
This commit is contained in:
commit
fbbfda315d
@ -1049,7 +1049,9 @@ class ServersController(wsgi.Controller):
|
||||
instance = self._get_server(context, req, instance_id,
|
||||
columns_to_join=['services', 'resources',
|
||||
'pci_requests',
|
||||
'pci_devices'])
|
||||
'pci_devices',
|
||||
'trusted_certs',
|
||||
'vcpu_model'])
|
||||
context.can(server_policies.SERVERS % 'resize',
|
||||
target={'user_id': instance.user_id,
|
||||
'project_id': instance.project_id})
|
||||
|
@ -135,7 +135,8 @@ class ServerActionsControllerTestV21(test.TestCase):
|
||||
expected_attrs = ['flavor', 'numa_topology']
|
||||
if method == 'resize':
|
||||
expected_attrs.extend(['services', 'resources',
|
||||
'pci_requests', 'pci_devices'])
|
||||
'pci_requests', 'pci_devices',
|
||||
'trusted_certs', 'vcpu_model'])
|
||||
elif method == 'rebuild':
|
||||
expected_attrs.extend(['trusted_certs', 'pci_requests',
|
||||
'pci_devices', 'resources',
|
||||
|
Loading…
x
Reference in New Issue
Block a user