diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-19 19:57:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-19 19:57:15 +0000 |
| commit | 276fded4972a357db40f7a72e1bf67d4f846a95a (patch) | |
| tree | e17bab5ee8bdbc1d7d58dfdddf2ee151eb0310e8 | |
| parent | b8bc88cafab17e88c07782fb09f945359171d155 (diff) | |
| parent | a468dcaf98f73eb9fe40b6cea0465f0c7ea3ff28 (diff) | |
| download | nova-276fded4972a357db40f7a72e1bf67d4f846a95a.tar.gz nova-276fded4972a357db40f7a72e1bf67d4f846a95a.tar.xz nova-276fded4972a357db40f7a72e1bf67d4f846a95a.zip | |
Merge "Add expected exception to aggregate_metadata_delete()"
| -rw-r--r-- | nova/conductor/manager.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index ab02117f5..92770cc84 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -118,6 +118,7 @@ class ConductorManager(manager.SchedulerDependentManager): metadata, set_delete) return jsonutils.to_primitive(new_metadata) + @rpc_common.client_exceptions(exception.AggregateMetadataNotFound) def aggregate_metadata_delete(self, context, aggregate, key): self.db.aggregate_metadata_delete(context.elevated(), aggregate['id'], key) |