Merge lp:~tamura-yoshiaki/nova/boot-from-volume-os-api into lp:~hudson-openstack/nova/trunk

[Yoshiaki Tamura]

Add OpenStack API support for block_device_mapping.

This patch enables boot from volume feature already implemented in EC2
API, as an OpenStack API extension.

[Brian Waldon (bcwaldon)]

I'm pretty sure this should be added as an API extension, I'm just not sure what the best way is.

review: Needs Information

[Yoshiaki Tamura (tamura-yoshiaki)]

> I'm pretty sure this should be added as an API extension, I'm just not sure
> what the best way is.

Yes, I think it's a fair point.
My opinion would be not to make things too complicated, but if there is better way that Nova has been doing for similar cases, I would be happy to know it.

[Brian Waldon (bcwaldon)]

Could this live in the existing volumes extension?

[Matt Dietz (cerberus)]

Agree with Brian: This should exist in an extension instead

review: Needs Fixing

[Brian Waldon (bcwaldon)]

This can actually live in the OSAPI like you have it here, you just need to create an (essentially empty) extension to document it. We really just need the ExtensionDescriptor.

[Yoshiaki Tamura (tamura-yoshiaki)]

Sorry for my slow response again. Added a controller in volumes extension. Please let me know if this approach is acceptable.

[Devin Carlen (devcamcar)]

This approach is looking good...

review: Approve

[Josh Kearney (jk0)]

Looks good.

review: Approve

=== modified file 'nova/api/openstack/contrib/volumes.py'
--- nova/api/openstack/contrib/volumes.py	2011-07-20 17:52:22 +0000
+++ nova/api/openstack/contrib/volumes.py	2011-07-21 12:48:36 +0000
@@ -22,10 +22,12 @@
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import quota
 from nova import volume
 from nova.api.openstack import common
 from nova.api.openstack import extensions
 from nova.api.openstack import faults
+from nova.api.openstack import servers
 
 
 LOG = logging.getLogger("nova.api.volumes")
@@ -297,6 +299,53 @@
         return {'volumeAttachments': res}
 
 
+class BootFromVolumeController(servers.ControllerV11):
+    """The boot from volume API controller for the Openstack API."""
+
+    def _create_instance(self, context, instance_type, image_href, **kwargs):
+        try:
+            return self.compute_api.create(context, instance_type,
+                                           image_href, **kwargs)
+        except quota.QuotaError as error:
+            self.helper._handle_quota_error(error)
+        except exception.ImageNotFound as error:
+            msg = _("Can not find requested image")
+            raise faults.Fault(exc.HTTPBadRequest(explanation=msg))
+
+    def create(self, req, body):
+        """ Creates a new server for a given user """
+        extra_values = None
+        try:
+
+            def get_kwargs(context, instance_type, image_href, **kwargs):
+                kwargs['context'] = context
+                kwargs['instance_type'] = instance_type
+                kwargs['image_href'] = image_href
+                return kwargs
+
+            extra_values, kwargs = self.helper.create_instance(req, body,
+                                                               get_kwargs)
+
+            block_device_mapping = body['server'].get('block_device_mapping')
+            kwargs['block_device_mapping'] = block_device_mapping
+
+            instances = self._create_instance(**kwargs)
+        except faults.Fault, f:
+            return f
+
+        # We can only return 1 instance via the API, if we happen to
+        # build more than one...  instances is a list, so we'll just
+        # use the first one..
+        inst = instances[0]
+        for key in ['instance_type', 'image_ref']:
+            inst[key] = extra_values[key]
+
+        builder = self._get_view_builder(req)
+        server = builder.build(inst, is_detail=True)
+        server['server']['adminPass'] = extra_values['password']
+        return server
+
+
 class Volumes(extensions.ExtensionDescriptor):
     def get_name(self):
         return "Volumes"
@@ -330,4 +379,8 @@
                                                 collection_name='servers'))
         resources.append(res)
 
+        res = extensions.ResourceExtension('os-volumes_boot',
+                                           BootFromVolumeController())
+        resources.append(res)
+
         return resources