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
57 lines
1.7 KiB
Python
57 lines
1.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.
|
|
|
|
from oslo import messaging
|
|
from oslo.messaging import rpc
|
|
from oslo.messaging import target
|
|
|
|
from murano.common import config
|
|
|
|
TRANSPORT = None
|
|
|
|
|
|
class ApiClient(object):
|
|
def __init__(self, transport):
|
|
client_target = target.Target('murano', 'results')
|
|
self._client = rpc.RPCClient(transport, client_target, timeout=15)
|
|
|
|
def process_result(self, result, environment_id):
|
|
return self._client.call({}, 'process_result', result=result,
|
|
environment_id=environment_id)
|
|
|
|
|
|
class EngineClient(object):
|
|
def __init__(self, transport):
|
|
client_target = target.Target('murano', 'tasks')
|
|
self._client = rpc.RPCClient(transport, client_target, timeout=15)
|
|
|
|
def handle_task(self, task):
|
|
return self._client.cast({}, 'handle_task', task=task)
|
|
|
|
|
|
def api():
|
|
global TRANSPORT
|
|
if TRANSPORT is None:
|
|
TRANSPORT = messaging.get_transport(config.CONF)
|
|
|
|
return ApiClient(TRANSPORT)
|
|
|
|
|
|
def engine():
|
|
global TRANSPORT
|
|
if TRANSPORT is None:
|
|
TRANSPORT = messaging.get_transport(config.CONF)
|
|
|
|
return EngineClient(TRANSPORT)
|