diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-21 23:51:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-21 23:51:57 +0000 |
| commit | f7d4e1a1a0cc4b6d07d97b55c76a55d7d9cb6104 (patch) | |
| tree | 8a6291fffde1bd48d7a0cee41a3f1fc8006dc6dd /nova | |
| parent | 6caede461b787fe4efa95787651c365b257289da (diff) | |
| parent | 2ed1acbf784fdf58e5690283ef01f7f5aeb442fe (diff) | |
| download | nova-f7d4e1a1a0cc4b6d07d97b55c76a55d7d9cb6104.tar.gz nova-f7d4e1a1a0cc4b6d07d97b55c76a55d7d9cb6104.tar.xz nova-f7d4e1a1a0cc4b6d07d97b55c76a55d7d9cb6104.zip | |
Merge "Have compute_node_get() join 'service'"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 7128fada6..d15609de7 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -484,9 +484,10 @@ def service_update(context, service_id, values): def compute_node_get(context, compute_id, session=None): result = model_query(context, models.ComputeNode, session=session).\ - filter_by(id=compute_id).\ - options(joinedload('stats')).\ - first() + filter_by(id=compute_id).\ + options(joinedload('service')).\ + options(joinedload('stats')).\ + first() if not result: raise exception.ComputeHostNotFound(host=compute_id) @@ -497,18 +498,18 @@ def compute_node_get(context, compute_id, session=None): @require_admin_context def compute_node_get_all(context, session=None): return model_query(context, models.ComputeNode, session=session).\ - options(joinedload('service')).\ - options(joinedload('stats')).\ - all() + options(joinedload('service')).\ + options(joinedload('stats')).\ + all() @require_admin_context def compute_node_search_by_hypervisor(context, hypervisor_match): field = models.ComputeNode.hypervisor_hostname return model_query(context, models.ComputeNode).\ - options(joinedload('service')).\ - filter(field.like('%%%s%%' % hypervisor_match)).\ - all() + options(joinedload('service')).\ + filter(field.like('%%%s%%' % hypervisor_match)).\ + all() def _prep_stats_dict(values): |