56b2d5df27
Now environment deletion is done as a regular deployment that can fail. Environments that are deleted, but deletion process has failed remain in database and shown in dashboard with status 'delete failure'. Environments that are being deleted has status 'deleting' and do not disappear before they really got deleted on engine side Also improved status reporting for environments. Now it also reports status of last deployment - 'deploy failure', 'delete failure' P.S. Functional tests were slightly refactored and fixed to reflect changes in deletion logic Change-Id: I05625dd71f7ca9559bb88319b26b122214f15019 Closes-Bug: #1325101
76 lines
2.7 KiB
Python
76 lines
2.7 KiB
Python
# Copyright (c) 2013 Mirantis, Inc.
|
|
#
|
|
# 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.
|
|
|
|
import functools
|
|
|
|
from webob import exc
|
|
|
|
from murano.db import models
|
|
from murano.db.services import sessions
|
|
from murano.db import session as db_session
|
|
from murano.openstack.common.gettextutils import _ # noqa
|
|
from murano.openstack.common import log as logging
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def verify_env(func):
|
|
@functools.wraps(func)
|
|
def __inner(self, request, environment_id, *args, **kwargs):
|
|
unit = db_session.get_session()
|
|
environment = unit.query(models.Environment).get(environment_id)
|
|
if environment is None:
|
|
LOG.info(_("Environment with id '{0}'"
|
|
" not found").format(environment_id))
|
|
raise exc.HTTPNotFound()
|
|
|
|
if hasattr(request, 'context'):
|
|
if environment.tenant_id != request.context.tenant:
|
|
LOG.info(_('User is not authorized to access'
|
|
' this tenant resources'))
|
|
raise exc.HTTPUnauthorized()
|
|
|
|
return func(self, request, environment_id, *args, **kwargs)
|
|
return __inner
|
|
|
|
|
|
def verify_session(func):
|
|
@functools.wraps(func)
|
|
def __inner(self, request, *args, **kwargs):
|
|
if hasattr(request, 'context') and not request.context.session:
|
|
LOG.info(_('Session is required for this call'))
|
|
raise exc.HTTPForbidden()
|
|
|
|
session_id = request.context.session
|
|
|
|
unit = db_session.get_session()
|
|
session = unit.query(models.Session).get(session_id)
|
|
|
|
if session is None:
|
|
LOG.info(_('Session <SessionId {0}> '
|
|
'is not found').format(session_id))
|
|
raise exc.HTTPForbidden()
|
|
|
|
if not sessions.SessionServices.validate(session):
|
|
LOG.info(_('Session <SessionId {0}> '
|
|
'is invalid').format(session_id))
|
|
raise exc.HTTPForbidden()
|
|
|
|
if session.state == sessions.SessionState.DEPLOYING:
|
|
LOG.info(_('Session <SessionId {0}> is already in '
|
|
'deployment state').format(session_id))
|
|
raise exc.HTTPForbidden()
|
|
return func(self, request, *args, **kwargs)
|
|
return __inner
|