diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-01 13:03:57 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-01 13:03:57 +0200 |
| commit | 7e020e743c138d542e957c24ea53c1ca7fbc757c (patch) | |
| tree | c9a23dc6e62188e5923b0f817b7d19754fa29ca1 | |
| parent | b40696640b13e0974a29c23240f7faa79ad00912 (diff) | |
| download | nova-7e020e743c138d542e957c24ea53c1ca7fbc757c.tar.gz nova-7e020e743c138d542e957c24ea53c1ca7fbc757c.tar.xz nova-7e020e743c138d542e957c24ea53c1ca7fbc757c.zip | |
Address a few comments from Todd.
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 8 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 703936002..eb4eee782 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -640,11 +640,6 @@ def project_get(context, id): return IMPL.project_get(context, id) -#def project_get_by_uid(context, uid): -# """Get project by uid""" -# return IMPL.project_get_by_uid(context, uid) -# - def project_create(context, values): """Create a new project""" return IMPL.project_create(context, values) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index bd5c285d8..5cd2d6d51 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1000,14 +1000,6 @@ def project_get(context, id): return result -def project_get_by_uid(context, uid): - session = get_session() - return session.query(models.Project - ).filter_by(uid=uid - ).filter_by(deleted=_deleted(context) - ).first() - - def project_get_all(context): session = get_session() return session.query(models.Project diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index b247eb416..92a68ab68 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -104,7 +104,7 @@ class NovaBase(object): session.flush() except IntegrityError, e: if str(e).endswith('is not unique'): - raise Exception.Duplicate(str(e)) + raise exception.Duplicate(str(e)) else: raise |