diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-22 11:14:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-22 11:14:43 +0000 |
| commit | b53fa07c939e18ede2072f3b19f630600ca8d7b9 (patch) | |
| tree | f08de3fd21debf6fb445d19ea96e424129042738 /contrib | |
| parent | 2a0cc7cbd162bca56b537ca045ae9c54495372f8 (diff) | |
| parent | c3a8cc41976528eab338943a3f520e745d7b1ad1 (diff) | |
| download | heat-b53fa07c939e18ede2072f3b19f630600ca8d7b9.tar.gz | |
Merge "Use flavors.find interface to find flavors"
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): |