115a78d452
Ports v2 volumes extension and adapts it to the v2.1/v3 API framework. API behaviour is identical with the exception that there is no support for XML. Also - unittest code modified to share testing with both v2/v2.1 where appropriate - Adds expected error decorators for API methods Note that there will be further code cleanup in the future but the code currently is mostly as-is from the v2 codebase. Partially implements blueprint v2-on-v3-api Change-Id: If2a9dd1f5233812a1177b54ded6f0ae115c54e97
357 lines
11 KiB
Python
357 lines
11 KiB
Python
# 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.
|
|
|
|
"""The volumes extension."""
|
|
|
|
import webob
|
|
from webob import exc
|
|
|
|
from nova.api.openstack import common
|
|
from nova.api.openstack import extensions
|
|
from nova.api.openstack import wsgi
|
|
from nova import exception
|
|
from nova.i18n import _
|
|
from nova.openstack.common import log as logging
|
|
from nova.openstack.common import strutils
|
|
from nova import volume
|
|
|
|
ALIAS = "os-volumes"
|
|
LOG = logging.getLogger(__name__)
|
|
authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
|
|
|
|
|
|
def _translate_volume_detail_view(context, vol):
|
|
"""Maps keys for volumes details view."""
|
|
|
|
d = _translate_volume_summary_view(context, vol)
|
|
|
|
# No additional data / lookups at the moment
|
|
|
|
return d
|
|
|
|
|
|
def _translate_volume_summary_view(context, vol):
|
|
"""Maps keys for volumes summary view."""
|
|
d = {}
|
|
|
|
d['id'] = vol['id']
|
|
d['status'] = vol['status']
|
|
d['size'] = vol['size']
|
|
d['availabilityZone'] = vol['availability_zone']
|
|
d['createdAt'] = vol['created_at']
|
|
|
|
if vol['attach_status'] == 'attached':
|
|
d['attachments'] = [_translate_attachment_detail_view(vol['id'],
|
|
vol['instance_uuid'],
|
|
vol['mountpoint'])]
|
|
else:
|
|
d['attachments'] = [{}]
|
|
|
|
d['displayName'] = vol['display_name']
|
|
d['displayDescription'] = vol['display_description']
|
|
|
|
if vol['volume_type_id'] and vol.get('volume_type'):
|
|
d['volumeType'] = vol['volume_type']['name']
|
|
else:
|
|
d['volumeType'] = vol['volume_type_id']
|
|
|
|
d['snapshotId'] = vol['snapshot_id']
|
|
LOG.audit(_("vol=%s"), vol, context=context)
|
|
|
|
if vol.get('volume_metadata'):
|
|
d['metadata'] = vol.get('volume_metadata')
|
|
else:
|
|
d['metadata'] = {}
|
|
|
|
return d
|
|
|
|
|
|
class VolumeController(wsgi.Controller):
|
|
"""The Volumes API controller for the OpenStack API."""
|
|
|
|
def __init__(self):
|
|
self.volume_api = volume.API()
|
|
super(VolumeController, self).__init__()
|
|
|
|
@extensions.expected_errors(404)
|
|
def show(self, req, id):
|
|
"""Return data about the given volume."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
try:
|
|
vol = self.volume_api.get(context, id)
|
|
except exception.NotFound as e:
|
|
raise exc.HTTPNotFound(explanation=e.format_message())
|
|
|
|
return {'volume': _translate_volume_detail_view(context, vol)}
|
|
|
|
@extensions.expected_errors(404)
|
|
def delete(self, req, id):
|
|
"""Delete a volume."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
LOG.audit(_("Delete volume with id: %s"), id, context=context)
|
|
|
|
try:
|
|
self.volume_api.delete(context, id)
|
|
except exception.NotFound as e:
|
|
raise exc.HTTPNotFound(explanation=e.format_message())
|
|
return webob.Response(status_int=202)
|
|
|
|
@extensions.expected_errors(())
|
|
def index(self, req):
|
|
"""Returns a summary list of volumes."""
|
|
return self._items(req, entity_maker=_translate_volume_summary_view)
|
|
|
|
@extensions.expected_errors(())
|
|
def detail(self, req):
|
|
"""Returns a detailed list of volumes."""
|
|
return self._items(req, entity_maker=_translate_volume_detail_view)
|
|
|
|
def _items(self, req, entity_maker):
|
|
"""Returns a list of volumes, transformed through entity_maker."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
volumes = self.volume_api.get_all(context)
|
|
limited_list = common.limited(volumes, req)
|
|
res = [entity_maker(context, vol) for vol in limited_list]
|
|
return {'volumes': res}
|
|
|
|
@extensions.expected_errors(400)
|
|
def create(self, req, body):
|
|
"""Creates a new volume."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
if not self.is_valid_body(body, 'volume'):
|
|
msg = _("volume not specified")
|
|
raise exc.HTTPBadRequest(explanation=msg)
|
|
|
|
vol = body['volume']
|
|
|
|
vol_type = vol.get('volume_type')
|
|
metadata = vol.get('metadata')
|
|
snapshot_id = vol.get('snapshot_id')
|
|
|
|
if snapshot_id is not None:
|
|
snapshot = self.volume_api.get_snapshot(context, snapshot_id)
|
|
else:
|
|
snapshot = None
|
|
|
|
size = vol.get('size', None)
|
|
if size is None and snapshot is not None:
|
|
size = snapshot['volume_size']
|
|
|
|
LOG.audit(_("Create volume of %s GB"), size, context=context)
|
|
|
|
availability_zone = vol.get('availability_zone')
|
|
|
|
try:
|
|
new_volume = self.volume_api.create(
|
|
context,
|
|
size,
|
|
vol.get('display_name'),
|
|
vol.get('display_description'),
|
|
snapshot=snapshot,
|
|
volume_type=vol_type,
|
|
metadata=metadata,
|
|
availability_zone=availability_zone
|
|
)
|
|
except exception.InvalidInput as err:
|
|
raise exc.HTTPBadRequest(explanation=err.format_message())
|
|
|
|
# TODO(vish): Instance should be None at db layer instead of
|
|
# trying to lazy load, but for now we turn it into
|
|
# a dict to avoid an error.
|
|
retval = _translate_volume_detail_view(context, dict(new_volume))
|
|
result = {'volume': retval}
|
|
|
|
location = '%s/%s' % (req.url, new_volume['id'])
|
|
|
|
return wsgi.ResponseObject(result, headers=dict(location=location))
|
|
|
|
|
|
def _translate_attachment_detail_view(volume_id, instance_uuid, mountpoint):
|
|
"""Maps keys for attachment details view."""
|
|
|
|
d = _translate_attachment_summary_view(volume_id,
|
|
instance_uuid,
|
|
mountpoint)
|
|
|
|
# No additional data / lookups at the moment
|
|
return d
|
|
|
|
|
|
def _translate_attachment_summary_view(volume_id, instance_uuid, mountpoint):
|
|
"""Maps keys for attachment summary view."""
|
|
d = {}
|
|
|
|
# NOTE(justinsb): We use the volume id as the id of the attachment object
|
|
d['id'] = volume_id
|
|
|
|
d['volumeId'] = volume_id
|
|
|
|
d['serverId'] = instance_uuid
|
|
if mountpoint:
|
|
d['device'] = mountpoint
|
|
|
|
return d
|
|
|
|
|
|
def _translate_snapshot_detail_view(context, vol):
|
|
"""Maps keys for snapshots details view."""
|
|
|
|
d = _translate_snapshot_summary_view(context, vol)
|
|
|
|
# NOTE(gagupta): No additional data / lookups at the moment
|
|
return d
|
|
|
|
|
|
def _translate_snapshot_summary_view(context, vol):
|
|
"""Maps keys for snapshots summary view."""
|
|
d = {}
|
|
|
|
d['id'] = vol['id']
|
|
d['volumeId'] = vol['volume_id']
|
|
d['status'] = vol['status']
|
|
# NOTE(gagupta): We map volume_size as the snapshot size
|
|
d['size'] = vol['volume_size']
|
|
d['createdAt'] = vol['created_at']
|
|
d['displayName'] = vol['display_name']
|
|
d['displayDescription'] = vol['display_description']
|
|
return d
|
|
|
|
|
|
class SnapshotController(wsgi.Controller):
|
|
"""The Snapshots API controller for the OpenStack API."""
|
|
|
|
def __init__(self):
|
|
self.volume_api = volume.API()
|
|
super(SnapshotController, self).__init__()
|
|
|
|
@extensions.expected_errors(404)
|
|
def show(self, req, id):
|
|
"""Return data about the given snapshot."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
try:
|
|
vol = self.volume_api.get_snapshot(context, id)
|
|
except exception.NotFound as e:
|
|
raise exc.HTTPNotFound(explanation=e.format_message())
|
|
|
|
return {'snapshot': _translate_snapshot_detail_view(context, vol)}
|
|
|
|
@extensions.expected_errors(404)
|
|
def delete(self, req, id):
|
|
"""Delete a snapshot."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
LOG.audit(_("Delete snapshot with id: %s"), id, context=context)
|
|
|
|
try:
|
|
self.volume_api.delete_snapshot(context, id)
|
|
except exception.NotFound as e:
|
|
raise exc.HTTPNotFound(explanation=e.format_message())
|
|
return webob.Response(status_int=202)
|
|
|
|
@extensions.expected_errors(())
|
|
def index(self, req):
|
|
"""Returns a summary list of snapshots."""
|
|
return self._items(req, entity_maker=_translate_snapshot_summary_view)
|
|
|
|
@extensions.expected_errors(())
|
|
def detail(self, req):
|
|
"""Returns a detailed list of snapshots."""
|
|
return self._items(req, entity_maker=_translate_snapshot_detail_view)
|
|
|
|
def _items(self, req, entity_maker):
|
|
"""Returns a list of snapshots, transformed through entity_maker."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
snapshots = self.volume_api.get_all_snapshots(context)
|
|
limited_list = common.limited(snapshots, req)
|
|
res = [entity_maker(context, snapshot) for snapshot in limited_list]
|
|
return {'snapshots': res}
|
|
|
|
@extensions.expected_errors(400)
|
|
def create(self, req, body):
|
|
"""Creates a new snapshot."""
|
|
context = req.environ['nova.context']
|
|
authorize(context)
|
|
|
|
if not self.is_valid_body(body, 'snapshot'):
|
|
msg = _("snapshot not specified")
|
|
raise exc.HTTPBadRequest(explanation=msg)
|
|
|
|
snapshot = body['snapshot']
|
|
volume_id = snapshot['volume_id']
|
|
|
|
LOG.audit(_("Create snapshot from volume %s"), volume_id,
|
|
context=context)
|
|
|
|
force = snapshot.get('force', False)
|
|
try:
|
|
force = strutils.bool_from_string(force, strict=True)
|
|
except ValueError:
|
|
msg = _("Invalid value '%s' for force.") % force
|
|
raise exc.HTTPBadRequest(explanation=msg)
|
|
|
|
if force:
|
|
create_func = self.volume_api.create_snapshot_force
|
|
else:
|
|
create_func = self.volume_api.create_snapshot
|
|
|
|
new_snapshot = create_func(context, volume_id,
|
|
snapshot.get('display_name'),
|
|
snapshot.get('display_description'))
|
|
|
|
retval = _translate_snapshot_detail_view(context, new_snapshot)
|
|
return {'snapshot': retval}
|
|
|
|
|
|
class Volumes(extensions.V3APIExtensionBase):
|
|
"""Volumes support."""
|
|
|
|
name = "Volumes"
|
|
alias = ALIAS
|
|
version = 1
|
|
|
|
def get_resources(self):
|
|
resources = []
|
|
|
|
res = extensions.ResourceExtension(
|
|
ALIAS, VolumeController(), collection_actions={'detail': 'GET'})
|
|
resources.append(res)
|
|
|
|
res = extensions.ResourceExtension('os-volumes_boot',
|
|
inherits='servers')
|
|
resources.append(res)
|
|
|
|
res = extensions.ResourceExtension(
|
|
'os-snapshots', SnapshotController(),
|
|
collection_actions={'detail': 'GET'})
|
|
resources.append(res)
|
|
|
|
return resources
|
|
|
|
def get_controller_extensions(self):
|
|
return []
|