From 77495cfed17f12f225e11fbc10e0f8db516dadf2 Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Thu, 8 Mar 2012 21:56:56 +0000 Subject: Fix nova-manage backend_add with sr_uuid Fixes bug 950964 Remove FIXME in db.sm_backend_conf_get_by_sr Add first() to sm_backend_conf_get_by_sr query Change db/api.py:sm_backend_conf_get_by_sr to call correct impl method Have nova-manage generate an actuall sr_uuid instead of always 'None' Actually update backend values when specifying uuid Change-Id: I620da4563d8c936b5a072c4683ae145280104fc2 --- nova/db/api.py | 2 +- nova/db/sqlalchemy/api.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nova') diff --git a/nova/db/api.py b/nova/db/api.py index 9d4fae11e..6791c0de3 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1718,7 +1718,7 @@ def sm_backend_conf_get(context, sm_backend_conf_id): def sm_backend_conf_get_by_sr(context, sr_uuid): """Get a specific SM Backend Config.""" - return IMPL.sm_backend_conf_get(context, sr_uuid) + return IMPL.sm_backend_conf_get_by_sr(context, sr_uuid) def sm_backend_conf_get_all(context): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index e38f62b38..97fba1e00 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4214,9 +4214,9 @@ def sm_backend_conf_get(context, sm_backend_id): @require_admin_context def sm_backend_conf_get_by_sr(context, sr_uuid): session = get_session() - # FIXME(sirp): shouldn't this have a `first()` qualifier attached? return model_query(context, models.SMBackendConf, read_deleted="yes").\ - filter_by(sr_uuid=sr_uuid) + filter_by(sr_uuid=sr_uuid).\ + first() @require_admin_context -- cgit