openstack
/
heat
Code Issues Proposed changes

Merge "Correct the filter attribute of db model 'ResourcePropertiesData'" into stable/pike

This commit is contained in:
Zuul 2017-10-23 06:04:50 +00:00 committed by Gerrit Code Review
parent bc0ea8930a 95ed444fbb
commit be1e2e9fa5
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/db/sqlalchemy/api.py
View File

@ -299,7 +299,7 @@ def resource_attr_id_set(context, resource_id, atomic_key, attr_id):
{'rid': resource_id, 'aid': attr_id})
session.query(
models.ResourcePropertiesData).filter(
models.ResourcePropertiesData.attr_id == attr_id).delete()
models.ResourcePropertiesData.id == attr_id).delete()
return False

21
heat/tests/test_resource.py
View File

@ -655,6 +655,27 @@ class ResourceTest(common.HeatTestCase):
self.assertEqual('word', res.attributes['string'])
self.assertEqual(0, res_attr.call_count)
def test_store_attributes_fail(self):
res_def = rsrc_defn.ResourceDefinition('test_resource',
'ResWithStringPropAndAttr')
res = generic_rsrc.ResWithStringPropAndAttr(
'test_res_attr_store', res_def, self.stack)
res.action = res.UPDATE
res.status = res.COMPLETE
res.store()
attr_data = {'string': 'word'}
# set the attr_data_id first
resource_objects.Resource.update_by_id(res.context, res.id,
{'attr_data_id': 99})
new_attr_data_id = resource_objects.Resource.store_attributes(
res.context, res.id, res._atomic_key, attr_data, None)
# fail to store new attr data
self.assertIsNone(new_attr_data_id)
res._load_data(resource_objects.Resource.get_obj(
res.context, res.id))
self.assertEqual({}, res.attributes._resolved_values)
def test_resource_object_resource_properties_data(self):
cfg.CONF.set_override('encrypt_parameters_and_properties', True)
data = {'p1': 'i see',