openstack
/
heat
Code Issues Proposed changes

make get_flavor_id to work if input is flavor id 

Current implementation of get_flavor_id throws exception if input
value is a flavor id. This method is used in couple of resources
where input flavor could be flavor id. This change is to avoid
throwing exception if the input is flavor id.

Fixes bug #1227255

Change-Id: I11054d5f3a34a7e2afea140f8f37a21cb8eba419
This commit is contained in:
Vijendar Komalla 2013-09-18 12:27:33 -05:00
parent 4ac9d247d2
commit b9cc7aba48
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/nova_utils.py
View File

@ -86,6 +86,7 @@ def get_image_id(nova_client, image_identifier):
def get_flavor_id(nova_client, flavor):
'''
Get the id for the specified flavor name.
If the specified value is flavor id, just return it.
:param nova_client: the nova client to use
:param flavor: the name of the flavor to find
@ -98,6 +99,9 @@ def get_flavor_id(nova_client, flavor):
if o.name == flavor:
flavor_id = o.id
break
if o.id == flavor:
flavor_id = o.id
break
if flavor_id is None:
raise exception.FlavorMissing(flavor_id=flavor)
return flavor_id

2
heat/tests/test_nova_utils.py
View File

@ -62,6 +62,8 @@ class NovaUtilsTests(HeatTestCase):
self.m.ReplayAll()
self.assertEqual(flav_id, nova_utils.get_flavor_id(self.nova_client,
flav_name))
self.assertEqual(flav_id, nova_utils.get_flavor_id(self.nova_client,
flav_id))
self.assertRaises(exception.FlavorMissing, nova_utils.get_flavor_id,
self.nova_client, 'noflavor')
self.m.VerifyAll()