x/rack
Code Issues Proposed changes

Add some columns to processes table

Browse Source 
add columns for rack proxy.
This commit is contained in:
takehirokaneko
2014-07-10 11:22:38 +09:00
parent f1018a5758
commit 4e54c8b876
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rack/db/sqlalchemy/api.py
View File

@@ -539,9 +539,9 @@ def process_get_all(context, gid, filters={}):
if 'status' in filters:
query = query.filter_by(status=filters['status'])
if 'glance_image_id' in filters:
query = query.filter_by(is_default=filters['glance_image_id'])
query = query.filter_by(glance_image_id=filters['glance_image_id'])
if 'nova_flavor_id' in filters:
query = query.filter_by(is_default=filters['nova_flavor_id'])
query = query.filter_by(nova_flavor_id=filters['nova_flavor_id'])
if 'keypair_id' in filters:
query = query.filter_by(keypair_id=filters['keypair_id'])
if 'securitygroup_id' in filters:
@@ -552,6 +552,10 @@ def process_get_all(context, gid, filters={}):
query = query.filter(
models.Process.networks.any(
network_id=filters["network_id"]))
if 'is_proxy' in filters:
query = query.filter_by(is_proxy=filters['is_proxy'])
if 'app_status' in filters:
query = query.filter_by(app_status=filters['app_status'])
process_refs = query.all()
return [_get_process_dict(process_ref) for process_ref in process_refs]

7
rack/db/sqlalchemy/migrate_repo/versions/006_Add_processes_table.py
View File

@@ -13,7 +13,7 @@
# limitations under the License.
from migrate import ForeignKeyConstraint
from sqlalchemy import Column, MetaData, Table
from sqlalchemy import DateTime, Integer, String
from sqlalchemy import Boolean, DateTime, Integer, String
from rack.openstack.common.gettextutils import _
from rack.openstack.common import log as logging
@@ -39,6 +39,11 @@ processes = Table('processes', meta,
Column('project_id', String(length=255), nullable=False),
Column('display_name', String(length=255), nullable=False),
Column('status', String(length=255), nullable=False),
Column('app_status', String(length=255)),
Column('is_proxy', Boolean),
Column('shm_endpoint', String(length=255)),
Column('ipc_endpoint', String(length=255)),
Column('fs_endpoint', String(length=255)),
mysql_engine='InnoDB',
mysql_charset='utf8'
)