diff options
author | Rabi Mishra <ramishra@redhat.com> | 2015-12-01 11:23:24 +0530 |
---|---|---|
committer | Rabi Mishra <ramishra@redhat.com> | 2015-12-16 17:14:29 +0530 |
commit | c3a8cc41976528eab338943a3f520e745d7b1ad1 (patch) | |
tree | aa3ad124331df7cae67939f4d232c9ba5519215e /contrib | |
parent | 4b53e073a27dac7b0aa2632a008310a2d3485134 (diff) | |
download | heat-c3a8cc41976528eab338943a3f520e745d7b1ad1.tar.gz |
Use flavors.find interface to find flavors
This patch uses 'flavors.find' to look for flavors rather than
finding them from 'flavors.list' output.
Change-Id: I48b058a6b01d941d2e0f362900d0c85bc7c71fbc
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/rackspace/rackspace/resources/auto_scale.py | 2 | ||||
-rw-r--r-- | contrib/rackspace/rackspace/tests/test_auto_scale.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py index d9a6b1eca..69d08f2a0 100644 --- a/contrib/rackspace/rackspace/resources/auto_scale.py +++ b/contrib/rackspace/rackspace/resources/auto_scale.py @@ -306,7 +306,7 @@ class Group(resource.Resource): bool(user_data is not None and len(user_data.strip()))) image_id = self.client_plugin('glance').get_image_id( server_args[self.LAUNCH_CONFIG_ARGS_SERVER_IMAGE_REF]) - flavor_id = self.client_plugin('nova').get_flavor_id( + flavor_id = self.client_plugin('nova').find_flavor_by_name_or_id( server_args[self.LAUNCH_CONFIG_ARGS_SERVER_FLAVOR_REF]) return dict( diff --git a/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py index a2e30060b..eda56c443 100644 --- a/contrib/rackspace/rackspace/tests/test_auto_scale.py +++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py @@ -212,7 +212,8 @@ class ScalingGroupTest(common.HeatTestCase): # mock nova and glance client methods to satisfy contraints mock_im = self.patchobject(glance.GlanceClientPlugin, 'get_image_id') mock_im.return_value = 'image-ref' - mock_fl = self.patchobject(nova.NovaClientPlugin, 'get_flavor_id') + mock_fl = self.patchobject(nova.NovaClientPlugin, + 'find_flavor_by_name_or_id') mock_fl.return_value = 'flavor-ref' def _setup_test_stack(self): |