Added volume api from previous megapatch

2 files changed, 166 insertions, 0 deletions

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index ab9dbb780..a7b639669 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -34,6 +34,7 @@ from nova.api.openstack import flavors
 from nova.api.openstack import images
 from nova.api.openstack import servers
 from nova.api.openstack import shared_ip_groups
+from nova.api.openstack import volumes
 from nova.api.openstack import zones
 
 
@@ -111,6 +112,11 @@ class APIRouter(wsgi.Router):
                         collection={'detail': 'GET'},
                         controller=shared_ip_groups.Controller())
 
+        #NOTE(justinsb): volumes is not yet part of the official API
+        mapper.resource("volume", "volumes",
+                        controller=volumes.Controller(),
+                        collection={'detail': 'GET'})
+
         super(APIRouter, self).__init__(mapper)
 
 
diff --git a/nova/api/openstack/volumes.py b/nova/api/openstack/volumes.py
new file mode 100644
index 000000000..99300421e
--- /dev/null
+++ b/nova/api/openstack/volumes.py
@@ -0,0 +1,160 @@
+# Copyright 2011 Justin Santa Barbara
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from webob import exc
+
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import volume
+from nova import wsgi
+from nova.api.openstack import common
+from nova.api.openstack import faults
+
+
+LOG = logging.getLogger("nova.api.volumes")
+
+FLAGS = flags.FLAGS
+
+
+def _translate_detail_view(context, inst):
+    """ Maps keys for details view"""
+
+    inst_dict = _translate_summary_view(context, inst)
+
+    # No additional data / lookups at the moment
+
+    return inst_dict
+
+
+def _translate_summary_view(context, volume):
+    """ Maps keys for summary view"""
+    v = {}
+
+    instance_id = None
+    #    instance_data = None
+    attached_to = volume.get('instance')
+    if attached_to:
+        instance_id = attached_to['id']
+    #        instance_data = '%s[%s]' % (instance_ec2_id,
+    #                                    attached_to['host'])
+    v['id'] = volume['id']
+    v['status'] = volume['status']
+    v['size'] = volume['size']
+    v['availabilityZone'] = volume['availability_zone']
+    v['createdAt'] = volume['created_at']
+    #    if context.is_admin:
+    #        v['status'] = '%s (%s, %s, %s, %s)' % (
+    #            volume['status'],
+    #            volume['user_id'],
+    #            volume['host'],
+    #            instance_data,
+    #            volume['mountpoint'])
+    if volume['attach_status'] == 'attached':
+        v['attachments'] = [{'attachTime': volume['attach_time'],
+                             'deleteOnTermination': False,
+                             'mountpoint': volume['mountpoint'],
+                             'instanceId': instance_id,
+                             'status': 'attached',
+                             'volumeId': volume['id']}]
+    else:
+        v['attachments'] = [{}]
+
+    v['displayName'] = volume['display_name']
+    v['displayDescription'] = volume['display_description']
+    return v
+
+
+class Controller(wsgi.Controller):
+    """ The Volumes API controller for the OpenStack API """
+
+    _serialization_metadata = {
+        'application/xml': {
+            "attributes": {
+                "volume": [
+                    "id",
+                    "status",
+                    "size",
+                    "availabilityZone",
+                    "createdAt",
+                    "displayName",
+                    "displayDescription",
+                    ]}}}
+
+    def __init__(self):
+        self.volume_api = volume.API()
+        super(Controller, self).__init__()
+
+    def show(self, req, id):
+        """Return data about the given volume"""
+        context = req.environ['nova.context']
+
+        try:
+            volume = self.volume_api.get(context, id)
+        except exception.NotFound:
+            return faults.Fault(exc.HTTPNotFound())
+
+        return {'volume': _translate_detail_view(context, volume)}
+
+    def delete(self, req, id):
+        """ Delete a volume """
+        context = req.environ['nova.context']
+
+        LOG.audit(_("Delete volume with id: %s"), id, context=context)
+
+        try:
+            self.volume_api.delete(context, volume_id=id)
+        except exception.NotFound:
+            return faults.Fault(exc.HTTPNotFound())
+        return exc.HTTPAccepted()
+
+    def index(self, req):
+        """ Returns a summary list of volumes"""
+        return self._items(req, entity_maker=_translate_summary_view)
+
+    def detail(self, req):
+        """ Returns a detailed list of volumes """
+        return self._items(req, entity_maker=_translate_detail_view)
+
+    def _items(self, req, entity_maker):
+        """Returns a list of volumes, transformed through entity_maker"""
+        context = req.environ['nova.context']
+
+        volumes = self.volume_api.get_all(context)
+        limited_list = common.limited(volumes, req)
+        res = [entity_maker(context, inst) for inst in limited_list]
+        return {'volumes': res}
+
+    def create(self, req):
+        """Creates a new volume"""
+        context = req.environ['nova.context']
+
+        env = self._deserialize(req.body, req)
+        if not env:
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+
+        vol = env['volume']
+        size = vol['size']
+        LOG.audit(_("Create volume of %s GB"), size, context=context)
+        volume = self.volume_api.create(context, size,
+                                        vol.get('display_name'),
+                                        vol.get('display_description'))
+
+        # Work around problem that instance is lazy-loaded...
+        volume['instance'] = None
+
+        retval = _translate_detail_view(context, volume)
+
+        return {'volume': retval}