openstack
/
nova
Code Issues Proposed changes

Merge "Fix RequestLevelParams persistence handling in RequestSpec"

This commit is contained in:
Zuul 2021-06-04 10:19:35 +00:00 committed by Gerrit Code Review
parent cd084aeeb8 5c50a45a1e
commit 1a1a6a042c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/objects/request_spec.py
View File

@ -674,8 +674,7 @@ class RequestSpec(base.NovaObject):
spec.instance_group.hosts = None spec.instance_group.hosts = None
# NOTE(mriedem): Don't persist these since they are per-request # NOTE(mriedem): Don't persist these since they are per-request
for excluded in ('retry', 'requested_destination', for excluded in ('retry', 'requested_destination',
'requested_resources', 'ignore_hosts', 'requested_resources', 'ignore_hosts'):
'request_level_params'):
if excluded in spec and getattr(spec, excluded): if excluded in spec and getattr(spec, excluded):
setattr(spec, excluded, None) setattr(spec, excluded, None)
# NOTE(stephenfin): Don't persist network metadata since we have # NOTE(stephenfin): Don't persist network metadata since we have
@ -686,6 +685,10 @@ class RequestSpec(base.NovaObject):
# no need for it after scheduling # no need for it after scheduling
if 'requested_networks' in spec and spec.requested_networks: if 'requested_networks' in spec and spec.requested_networks:
del spec.requested_networks del spec.requested_networks
# NOTE(gibi): Don't persist requested_networks since we have
# no need for it after scheduling
if 'request_level_params' in spec and spec.request_level_params:
del spec.request_level_params
db_updates = {'spec': jsonutils.dumps(spec.obj_to_primitive())} db_updates = {'spec': jsonutils.dumps(spec.obj_to_primitive())}
if 'instance_uuid' in updates: if 'instance_uuid' in updates:

13
nova/tests/unit/objects/test_request_spec.py
View File

@ -674,6 +674,9 @@ class _TestRequestSpecObject(object):
req_obj.retry = expected_retry req_obj.retry = expected_retry
nr = objects.NetworkRequest() nr = objects.NetworkRequest()
req_obj.requested_networks = objects.NetworkRequestList(objects=[nr]) req_obj.requested_networks = objects.NetworkRequestList(objects=[nr])
req_lvl_params = objects.RequestLevelParams(
root_required={"CUSTOM_FOO"})
req_obj.request_level_params = req_lvl_params
orig_create_in_db = request_spec.RequestSpec._create_in_db orig_create_in_db = request_spec.RequestSpec._create_in_db
with mock.patch.object(request_spec.RequestSpec, '_create_in_db') \ with mock.patch.object(request_spec.RequestSpec, '_create_in_db') \
@ -688,13 +691,16 @@ class _TestRequestSpecObject(object):
# 3. requested_resources # 3. requested_resources
# 4. retry # 4. retry
# 5. requested_networks # 5. requested_networks
# 6. request_level_params
data = jsonutils.loads(updates['spec'])['nova_object.data'] data = jsonutils.loads(updates['spec'])['nova_object.data']
self.assertNotIn('network_metadata', data) self.assertNotIn('network_metadata', data)
self.assertIsNone(data['requested_destination']) self.assertIsNone(data['requested_destination'])
self.assertIsNone(data['requested_resources']) self.assertIsNone(data['requested_resources'])
self.assertIsNone(data['retry']) self.assertIsNone(data['retry'])
self.assertIsNotNone(data['instance_uuid'])
self.assertNotIn('requested_networks', data) self.assertNotIn('requested_networks', data)
self.assertNotIn('request_level_params', data)
self.assertIsNotNone(data['instance_uuid'])
# also we expect that the following fields are not reset after create # also we expect that the following fields are not reset after create
# 1. network_metadata # 1. network_metadata
@ -702,6 +708,7 @@ class _TestRequestSpecObject(object):
# 3. requested_resources # 3. requested_resources
# 4. retry # 4. retry
# 5. requested_networks # 5. requested_networks
# 6. request_level_params
self.assertIsNotNone(req_obj.network_metadata) self.assertIsNotNone(req_obj.network_metadata)
self.assertJsonEqual(expected_network_metadata.obj_to_primitive(), self.assertJsonEqual(expected_network_metadata.obj_to_primitive(),
req_obj.network_metadata.obj_to_primitive()) req_obj.network_metadata.obj_to_primitive())
@ -717,6 +724,10 @@ class _TestRequestSpecObject(object):
self.assertIsNotNone(req_obj.requested_networks) self.assertIsNotNone(req_obj.requested_networks)
self.assertJsonEqual(nr.obj_to_primitive(), self.assertJsonEqual(nr.obj_to_primitive(),
req_obj.requested_networks[0].obj_to_primitive()) req_obj.requested_networks[0].obj_to_primitive())
self.assertIsNotNone(req_obj.request_level_params)
self.assertJsonEqual(
req_lvl_params.obj_to_primitive(),
req_obj.request_level_params.obj_to_primitive())
def test_save_does_not_persist_requested_fields(self): def test_save_does_not_persist_requested_fields(self):
req_obj = fake_request_spec.fake_spec_obj(remove_id=True) req_obj = fake_request_spec.fake_spec_obj(remove_id=True)