openstack/senlin
Code Issues Proposed changes

Merge "Rename 'tags' to be 'metadata'"

Browse Source
This commit is contained in:
Jenkins
2015-05-06 08:40:49 +00:00
committed by Gerrit Code Review
parent 92ad1d8594 6b764d48c2
commit ea1dcc808c
43 changed files with 205 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
senlin/db/sqlalchemy/api.py
View File

@@ -827,7 +827,6 @@ def profile_get_all(context, limit=None, marker=None, sort_keys=None,
consts.PROFILE_CREATED_TIME: models.Profile.created_time.key,
consts.PROFILE_UPDATED_TIME: models.Profile.updated_time.key,
consts.PROFILE_DELETED_TIME: models.Profile.deleted_time.key,
consts.PROFILE_TAGS: models.Profile.tags.key,
}
keys = _get_sort_keys(sort_keys, sort_key_map)

8
senlin/db/sqlalchemy/migrate_repo/versions/001_first_version.py
View File

@@ -28,7 +28,7 @@ def upgrade(migrate_engine):
sqlalchemy.Column('context', types.Dict),
sqlalchemy.Column('spec', types.Dict),
sqlalchemy.Column('permission', sqlalchemy.String(32)),
sqlalchemy.Column('tags', types.Dict),
sqlalchemy.Column('meta_data', types.Dict),
sqlalchemy.Column('created_time', sqlalchemy.DateTime),
sqlalchemy.Column('updated_time', sqlalchemy.DateTime),
sqlalchemy.Column('deleted_time', sqlalchemy.DateTime),
@@ -60,7 +60,7 @@ def upgrade(migrate_engine):
sqlalchemy.Column('timeout', sqlalchemy.Integer),
sqlalchemy.Column('status', sqlalchemy.String(255)),
sqlalchemy.Column('status_reason', sqlalchemy.String(255)),
sqlalchemy.Column('tags', types.Dict),
sqlalchemy.Column('meta_data', types.Dict),
sqlalchemy.Column('data', types.Dict),
mysql_engine='InnoDB',
mysql_charset='utf8'
@@ -88,7 +88,7 @@ def upgrade(migrate_engine):
sqlalchemy.Column('deleted_time', sqlalchemy.DateTime),
sqlalchemy.Column('status', sqlalchemy.String(255)),
sqlalchemy.Column('status_reason', sqlalchemy.String(255)),
sqlalchemy.Column('tags', types.Dict),
sqlalchemy.Column('meta_data', types.Dict),
sqlalchemy.Column('data', types.Dict),
mysql_engine='InnoDB',
mysql_charset='utf8'
@@ -226,7 +226,7 @@ def upgrade(migrate_engine):
sqlalchemy.Column('action', sqlalchemy.String(36)),
sqlalchemy.Column('status', sqlalchemy.String(255)),
sqlalchemy.Column('status_reason', sqlalchemy.String(255)),
sqlalchemy.Column('tags', types.Dict),
sqlalchemy.Column('meta_data', types.Dict),
mysql_engine='InnoDB',
mysql_charset='utf8'
)

7
senlin/db/sqlalchemy/models.py
View File

@@ -111,7 +111,7 @@ class Cluster(BASE, SenlinBase, SoftDelete):
status = sqlalchemy.Column(sqlalchemy.String(255))
status_reason = sqlalchemy.Column(sqlalchemy.String(255))
tags = sqlalchemy.Column(types.Dict)
meta_data = sqlalchemy.Column(types.Dict)
data = sqlalchemy.Column(types.Dict)
@@ -141,7 +141,7 @@ class Node(BASE, SenlinBase, SoftDelete):
status = sqlalchemy.Column(sqlalchemy.String(255))
status_reason = sqlalchemy.Column(sqlalchemy.String(255))
tags = sqlalchemy.Column(types.Dict)
meta_data = sqlalchemy.Column(types.Dict)
data = sqlalchemy.Column(types.Dict)
@@ -227,7 +227,7 @@ class Profile(BASE, SenlinBase, SoftDelete):
context = sqlalchemy.Column(types.Dict)
spec = sqlalchemy.Column(types.Dict)
permission = sqlalchemy.Column(sqlalchemy.String(32))
tags = sqlalchemy.Column(types.Dict)
meta_data = sqlalchemy.Column(types.Dict)
created_time = sqlalchemy.Column(sqlalchemy.DateTime)
updated_time = sqlalchemy.Column(sqlalchemy.DateTime)
deleted_time = sqlalchemy.Column(sqlalchemy.DateTime)
@@ -320,3 +320,4 @@ class Event(BASE, SenlinBase, SoftDelete):
action = sqlalchemy.Column(sqlalchemy.String(36))
status = sqlalchemy.Column(sqlalchemy.String(255))
status_reason = sqlalchemy.Column(sqlalchemy.String(255))
meta_data = sqlalchemy.Column(types.Dict)