58a5a0932d
- Convert the various functions that take a task detail into
ones that take atom details (since this is now the generic
type they should take).
- Don't expose the detail type strings as part of the atom
detail api, leave those as private hidden strings and provide
conversion functions from string<->class instead.
- Have the logbook objects contain the following new methods
to reduce the dependence on persistence_utils to do the same.
- to_dict() which converts the current object into a dict
- from_dict() which converts the provided dict into a object
- merge() which merges a incoming objects data with the current
objects
- Have the persistence backends + storage + action engine use these
new methods instead of there current usage.
- Don't compare to logbook.RETRY_DETAIL or logbook.TASK_DETAIL since
python has the isinstance function just use it (ideally we should
fix the code so that this isn't even needed, usage of isinstance
means something is not designed/structured right).
- In storage tests we can't assume that failures will be non-lossy
since under certain backends when a failure is stored information
about the internally held exc_info is lost, so take this into
account when testing by using matches() where applicable.
Change-Id: Ie8a274cfd4cb4e64e87c355dc99d466d74a4e82c
99 lines
3.2 KiB
Python
99 lines
3.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
|
|
# Copyright (C) 2013 Rackspace Hosting Inc. 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 sqlalchemy import Column, String, DateTime, Enum
|
|
from sqlalchemy.ext.declarative import declarative_base
|
|
from sqlalchemy import ForeignKey
|
|
from sqlalchemy.orm import backref
|
|
from sqlalchemy.orm import relationship
|
|
from sqlalchemy import types as types
|
|
|
|
from taskflow.openstack.common import jsonutils
|
|
from taskflow.openstack.common import timeutils
|
|
from taskflow.openstack.common import uuidutils
|
|
|
|
from taskflow.persistence import logbook
|
|
from taskflow import states
|
|
|
|
BASE = declarative_base()
|
|
|
|
|
|
# TODO(harlowja): remove when oslo.db exists
|
|
class TimestampMixin(object):
|
|
created_at = Column(DateTime, default=timeutils.utcnow)
|
|
updated_at = Column(DateTime, onupdate=timeutils.utcnow)
|
|
|
|
|
|
class Json(types.TypeDecorator):
|
|
impl = types.Text
|
|
|
|
def process_bind_param(self, value, dialect):
|
|
return jsonutils.dumps(value)
|
|
|
|
def process_result_value(self, value, dialect):
|
|
return jsonutils.loads(value)
|
|
|
|
|
|
class ModelBase(TimestampMixin):
|
|
"""Base model for all taskflow objects."""
|
|
uuid = Column(String, default=uuidutils.generate_uuid,
|
|
primary_key=True, nullable=False, unique=True)
|
|
name = Column(String, nullable=True)
|
|
meta = Column(Json, nullable=True)
|
|
|
|
|
|
class LogBook(BASE, ModelBase):
|
|
"""Represents a logbook for a set of flows."""
|
|
__tablename__ = 'logbooks'
|
|
|
|
# Relationships
|
|
flowdetails = relationship("FlowDetail",
|
|
single_parent=True,
|
|
backref=backref("logbooks",
|
|
cascade="save-update, delete, "
|
|
"merge"))
|
|
|
|
|
|
class FlowDetail(BASE, ModelBase):
|
|
__tablename__ = 'flowdetails'
|
|
|
|
# Member variables
|
|
state = Column(String)
|
|
|
|
# Relationships
|
|
parent_uuid = Column(String, ForeignKey('logbooks.uuid'))
|
|
atomdetails = relationship("AtomDetail",
|
|
single_parent=True,
|
|
backref=backref("flowdetails",
|
|
cascade="save-update, delete, "
|
|
"merge"))
|
|
|
|
|
|
class AtomDetail(BASE, ModelBase):
|
|
__tablename__ = 'atomdetails'
|
|
|
|
# Member variables
|
|
atom_type = Column(Enum(*logbook.ATOM_TYPES, name='atom_types'))
|
|
state = Column(String)
|
|
intention = Column(Enum(*states.INTENTIONS, name='intentions'))
|
|
results = Column(Json)
|
|
failure = Column(Json)
|
|
version = Column(Json)
|
|
|
|
# Relationships
|
|
parent_uuid = Column(String, ForeignKey('flowdetails.uuid'))
|