diff options
| author | Dan Prince <dprince@redhat.com> | 2012-06-14 07:47:07 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-06-14 07:47:07 -0400 |
| commit | 81fef25e96b20f69f58044fa341b108edea67d93 (patch) | |
| tree | 5b417966a253f6c1bc5e7d2151d4843b394c924e | |
| parent | cd085d0ce74fc478c04f1f61c0e5c22d7aa6d208 (diff) | |
| download | nova-81fef25e96b20f69f58044fa341b108edea67d93.tar.gz nova-81fef25e96b20f69f58044fa341b108edea67d93.tar.xz nova-81fef25e96b20f69f58044fa341b108edea67d93.zip | |
Re-add private _compute_node_get call to sql api.
Re-adds a private _compute_node_get call to the sql api.
This call is in used by the compute manager.
Fixes LP Bug #1013061.
Change-Id: I28c578509ac70ac7bccede41c3210a46ae56e717
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index d0203f29e..d848d8c37 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -472,6 +472,16 @@ 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).\ + first() + + if not result: + raise exception.ComputeHostNotFound(host=compute_id) + + return result + @require_admin_context def compute_node_get_all(context, session=None): @@ -532,7 +542,7 @@ def compute_node_update(context, compute_id, values, auto_adjust): if auto_adjust: _adjust_compute_node_values_for_utilization(context, values, session) with session.begin(subtransactions=True): - compute_ref = compute_node_get(context, compute_id, session=session) + compute_ref = _compute_node_get(context, compute_id, session=session) compute_ref.update(values) compute_ref.save(session=session) |