diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2015-12-18 08:54:31 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2016-01-27 09:56:01 +0530 |
| commit | 29692ee4f57a8ad961bd227b13583149906eec55 (patch) | |
| tree | c6599a11d5cb73d80c85671e5491da2e9854de9d /contrib | |
| parent | 939865d007a2c8f2ab53982ab749fdfa1b8181ce (diff) | |
| download | heat-29692ee4f57a8ad961bd227b13583149906eec55.tar.gz | |
Use custom find functions for image lookup
Use get interface and custom find functions to look for
images by id/name. Find interface is now implemented in
the client plugin itslef, as glanceclient v2 does not
support it. Once it's implemented in galnceclient v2,
we can leverage images.find interface directly.
This also leverges openstack.common.apicient.exceptions.
Change-Id: Ibf85495b9d5533c759c4e63284806f11e6e45413
Diffstat (limited to 'contrib')
3 files changed, 7 insertions, 6 deletions
diff --git a/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py index 068500fc8..3230f01be 100644 --- a/contrib/rackspace/rackspace/resources/auto_scale.py +++ b/contrib/rackspace/rackspace/resources/auto_scale.py @@ -309,7 +309,7 @@ class Group(resource.Resource): user_data = server_args.get(self.LAUNCH_CONFIG_ARGS_SERVER_USER_DATA) cdrive = (server_args.get(self.LAUNCH_CONFIG_ARGS_SERVER_CDRIVE) or bool(user_data is not None and len(user_data.strip()))) - image_id = self.client_plugin('glance').get_image_id( + image_id = self.client_plugin('glance').find_image_by_name_or_id( server_args[self.LAUNCH_CONFIG_ARGS_SERVER_IMAGE_REF]) flavor_id = self.client_plugin('nova').find_flavor_by_name_or_id( server_args[self.LAUNCH_CONFIG_ARGS_SERVER_FLAVOR_REF]) diff --git a/contrib/rackspace/rackspace/tests/test_auto_scale.py b/contrib/rackspace/rackspace/tests/test_auto_scale.py index 2104fe5fe..bd8343c7b 100644 --- a/contrib/rackspace/rackspace/tests/test_auto_scale.py +++ b/contrib/rackspace/rackspace/tests/test_auto_scale.py @@ -215,7 +215,8 @@ class ScalingGroupTest(common.HeatTestCase): self.patchobject(auto_scale.Group, 'auto_scale', return_value=self.fake_auto_scale) # mock nova and glance client methods to satisfy contraints - mock_im = self.patchobject(glance.GlanceClientPlugin, 'get_image_id') + mock_im = self.patchobject(glance.GlanceClientPlugin, + 'find_image_by_name_or_id') mock_im.return_value = 'image-ref' mock_fl = self.patchobject(nova.NovaClientPlugin, 'find_flavor_by_name_or_id') diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py index 6bdfe4fdd..54a013683 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -76,15 +76,15 @@ class CloudServersTest(common.HeatTestCase): resource._register_class("OS::Nova::Server", cloud_server.CloudServer) - def _mock_get_image_id_success(self, imageId): + def _mock_find_image_by_name_or_id_success(self, imageId): self.mock_get_image = mock.Mock() self.ctx.clients.client_plugin( - 'glance').get_image_id = self.mock_get_image + 'glance').find_image_by_name_or_id = self.mock_get_image self.mock_get_image.return_value = imageId def _stub_server_validate(self, server, imageId_input, image_id): # stub glance image validate - self._mock_get_image_id_success(image_id) + self._mock_find_image_by_name_or_id_success(image_id) def _setup_test_stack(self, stack_name): t = template_format.parse(wp_template) @@ -472,7 +472,7 @@ class CloudServersTest(common.HeatTestCase): mock_servers_create = mock.Mock(return_value=return_server) self.fc.servers.create = mock_servers_create image_id = mock.ANY - self._mock_get_image_id_success(image_id) + self._mock_find_image_by_name_or_id_success(image_id) self.m.StubOutWithMock(self.fc.servers, 'get') self.fc.servers.get(return_server.id).MultipleTimes( ).AndReturn(return_server) |