Merge lp:~ewanmellor/nova/lp653534 into lp:~hudson-openstack/nova/trunk

[Ewan Mellor]

Bug #653534: NameError on session_get in sqlalchemy.api.service_update

Fix function call: session_get was meant to be service_get.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Soren Hansen (soren)]

lgtm, too. In the future, though, please set the commit message and/or description. Can't merge stuff without it. For single-commit deltas like this, just copy the commit message from the top commit.

review: Approve

[Ewan Mellor (ewanmellor)]

On Sun, Oct 03, 2010 at 08:44:44PM +0100, Soren Hansen wrote:

> Review: Approve
> lgtm, too. In the future, though, please set the commit message and/or description. Can't merge stuff without it. For single-commit deltas like this, just copy the commit message from the top commit.

Will do. I assumed that Launchpad did that for us, since the fields are
both marked optional and it seemed the obvious thing to do. Maybe I'll
make a Launchpad feature request.

[Jay Pipes (jaypipes)]

It's actually not Launchpad, but Tarmac, which we use to automate the merge process. And Monty is working on that specific ability.

As for this patch, I'm wondering how on Earth such a normal part of Nova's functionality failed? Why wasn't there a test case that tested for this? Can we please add a test for this?

Thanks!
jay

review: Needs Fixing

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2010-10-01 09:28:31 +0000
+++ nova/db/sqlalchemy/api.py	2010-10-02 12:05:56 +0000
@@ -240,7 +240,7 @@
 def service_update(context, service_id, values):
     session = get_session()
     with session.begin():
-        service_ref = session_get(context, service_id, session=session)
+        service_ref = service_get(context, service_id, session=session)
         for (key, value) in values.iteritems():
             service_ref[key] = value
         service_ref.save(session=session)