8fbe37c5e2
1. What is the problem In the current controller implementation in nova_apigw and cinder_apigw, pecan.abort is used to raise an exception when error occurs. The problem of using pecan.abort is that the response body doesn't have the same format with the error response body in nova api and cinder api. Thus python client may not correctly extract the error message, also, tempest test may fail. 2. What is the solution to the problem Replace pecan.abort with correct response body. 3. What the features need to be implemented to the Tricircle to realize the solution In this patch, we remove pecan.abort calls in controllers of nova and cinder resources and directly return the error response body with correct format. Controllers for the Tricircle api still keep pecan.abort calls since we don't have special requirement on the format of error response body. Change-Id: I0e6fe9ddfce3f001fee0be2160d24c9c628d0a88
97 lines
3.8 KiB
Python
97 lines
3.8 KiB
Python
# Copyright (c) 2015 Huawei Tech. Co., Ltd.
|
|
# 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 pecan import expose
|
|
from pecan import rest
|
|
import re
|
|
|
|
from oslo_log import log as logging
|
|
|
|
import tricircle.common.client as t_client
|
|
from tricircle.common import constants
|
|
import tricircle.common.context as t_context
|
|
from tricircle.common.i18n import _
|
|
from tricircle.common.i18n import _LE
|
|
from tricircle.common import utils
|
|
import tricircle.db.api as db_api
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class VolumeController(rest.RestController):
|
|
|
|
def __init__(self, project_id, server_id):
|
|
self.project_id = project_id
|
|
self.server_id = server_id
|
|
self.clients = {'top': t_client.Client()}
|
|
|
|
def _get_client(self, pod_name='top'):
|
|
if pod_name not in self.clients:
|
|
self.clients[pod_name] = t_client.Client(pod_name)
|
|
return self.clients[pod_name]
|
|
|
|
@expose(generic=True, template='json')
|
|
def post(self, **kw):
|
|
context = t_context.extract_context_from_environ()
|
|
|
|
if 'volumeAttachment' not in kw:
|
|
return utils.format_nova_error(
|
|
400, _('volumeAttachment is not set'))
|
|
body = kw['volumeAttachment']
|
|
if 'volumeId' not in body:
|
|
return utils.format_nova_error(
|
|
400, _('Invalid input for field/attribute volumeAttachment'))
|
|
|
|
server_mappings = db_api.get_bottom_mappings_by_top_id(
|
|
context, self.server_id, constants.RT_SERVER)
|
|
if not server_mappings:
|
|
return utils.format_nova_error(404, _('Instance %s could not be '
|
|
'found.') % self.server_id)
|
|
volume_mappings = db_api.get_bottom_mappings_by_top_id(
|
|
context, body['volumeId'], constants.RT_VOLUME)
|
|
if not volume_mappings:
|
|
return utils.format_nova_error(
|
|
404, _('Volume %s could not be found') % body['volumeId'])
|
|
|
|
server_pod_name = server_mappings[0][0]['pod_name']
|
|
volume_pod_name = volume_mappings[0][0]['pod_name']
|
|
if server_pod_name != volume_pod_name:
|
|
LOG.error(_LE('Server %(server)s is in pod %(server_pod)s and '
|
|
'volume %(volume)s is in pod %(volume_pod)s, which '
|
|
'are not the same.'),
|
|
{'server': self.server_id,
|
|
'server_pod': server_pod_name,
|
|
'volume': body['volumeId'],
|
|
'volume_pod': volume_pod_name})
|
|
return utils.format_nova_error(
|
|
400, _('Server and volume not in the same pod'))
|
|
|
|
device = None
|
|
if 'device' in body:
|
|
device = body['device']
|
|
# this regular expression is copied from nova/block_device.py
|
|
match = re.match('(^/dev/x{0,1}[a-z]{0,1}d{0,1})([a-z]+)[0-9]*$',
|
|
device)
|
|
if not match:
|
|
return utils.format_nova_error(
|
|
400, _('The supplied device path (%s) is '
|
|
'invalid.') % device)
|
|
|
|
client = self._get_client(server_pod_name)
|
|
volume = client.action_server_volumes(
|
|
context, 'create_server_volume',
|
|
server_mappings[0][1], volume_mappings[0][1], device)
|
|
return {'volumeAttachment': volume.to_dict()}
|