← Back to branch summary

~rackspace-titan/nova/empty-network-lp835242

« back to all changes in this revision

Viewing changes to nova/api/openstack/create_instance_helper.py

  • Committer: Brian Lamar
  • Date: 2011-09-07 18:18:45 UTC
  • mfrom: (1521.2.5 nova)
  • Revision ID: brian.lamar@rackspace.com-20110907181845-d32v3ynkfzf6izv5
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/create_instance_helper.py
94
94
        try:
95
95
            image_service, image_id = nova.image.get_image_service(image_href)
96
96
            kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
97
 
                                                req, image_id)
 
97
                                                req, image_service, image_id)
98
98
            images = set([str(x['id']) for x in image_service.index(context)])
99
99
            assert str(image_id) in images
100
100
        except Exception, e:
247
247
            msg = _("Server name is an empty string")
248
248
            raise exc.HTTPBadRequest(explanation=msg)
249
249
 
250
 
    def _get_kernel_ramdisk_from_image(self, req, image_id):
 
250
    def _get_kernel_ramdisk_from_image(self, req, image_service, image_id):
251
251
        """Fetch an image from the ImageService, then if present, return the
252
252
        associated kernel and ramdisk image IDs.
253
253
        """
254
254
        context = req.environ['nova.context']
255
 
        image_meta = self._image_service.show(context, image_id)
 
255
        image_meta = image_service.show(context, image_id)
256
256
        # NOTE(sirp): extracted to a separate method to aid unit-testing, the
257
257
        # new method doesn't need a request obj or an ImageService stub
258
258
        kernel_id, ramdisk_id = self._do_get_kernel_ramdisk_from_image(