openstack
/
heat
Code Issues Proposed changes

Remove CinderVolume id attribute 

Using the id attribute can result in problems when validating a
template, as the resource_id is empty at that point, so we remove it to
prevent issues, as people ought to use Ref anyway.

Closes-Bug: #1230140
Change-Id: I16778d8036e7e2ccacf93caa4581ae0b0368b7c2
This commit is contained in:
Thomas Herve 2013-09-25 14:01:49 +02:00
parent f32339ecad
commit 1bf3dd39f3
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/volume.py
View File

@ -365,8 +365,6 @@ class CinderVolume(Volume):
return arguments
def FnGetAtt(self, key):
if key == 'id':
return self.resource_id
attributes = ['availability_zone', 'size', 'snapshot_id',
'display_name', 'display_description', 'volume_type',
'metadata', 'source_volid', 'status', 'created_at',

1
heat/tests/test_volume.py
View File

@ -722,7 +722,6 @@ class VolumeTest(HeatTestCase):
t['Resources']['DataVolume'],
stack)
scheduler.TaskRunner(rsrc.create)()
self.assertEqual(u'vol-123', rsrc.FnGetAtt('id'))
self.assertEqual(u'zone1', rsrc.FnGetAtt('availability_zone'))
self.assertEqual(u'1', rsrc.FnGetAtt('size'))
self.assertEqual(u'snap-123', rsrc.FnGetAtt('snapshot_id'))