diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-28 20:16:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-28 20:16:59 +0000 |
| commit | 05aaea1e1c104579c9d324fb767d18f021fb9496 (patch) | |
| tree | 22bd811555c80e7f6c97c536673edfd89e430545 | |
| parent | d99752b50dfd10ae290e41565fc2035f3e7d85b2 (diff) | |
| parent | edc568fcd8b7dd3b7457dc8426d30051706af12b (diff) | |
Merge "Remove duplicate options(joinedload) from aggregates db code"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index f26d67cac..b888d2628 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4228,7 +4228,7 @@ def aggregate_create(context, values, metadata=None): values['name'], session=session, read_deleted='no') - aggregate = query.options(joinedload('_metadata')).first() + aggregate = query.first() if not aggregate: aggregate = models.Aggregate() aggregate.update(values) @@ -4250,7 +4250,7 @@ def aggregate_get(context, aggregate_id): models.Aggregate, models.Aggregate.id, aggregate_id) - aggregate = query.options(joinedload('_metadata')).first() + aggregate = query.first() if not aggregate: raise exception.AggregateNotFound(aggregate_id=aggregate_id) @@ -4304,8 +4304,7 @@ def aggregate_update(context, aggregate_id, values): models.Aggregate, models.Aggregate.id, aggregate_id, - session=session). - options(joinedload('_metadata')).first()) + session=session).first()) if aggregate: if "availability_zone" in values: |