summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2012-12-18 07:16:27 -0800
committerDan Smith <danms@us.ibm.com>2012-12-19 08:14:50 -0800
commita468dcaf98f73eb9fe40b6cea0465f0c7ea3ff28 (patch)
tree029174e29e9bc374efa11880eece35082a7fd10b /nova
parent7f2ed0cc193febe0246604a74bf4b178af70dd1a (diff)
downloadnova-a468dcaf98f73eb9fe40b6cea0465f0c7ea3ff28.tar.gz
nova-a468dcaf98f73eb9fe40b6cea0465f0c7ea3ff28.tar.xz
nova-a468dcaf98f73eb9fe40b6cea0465f0c7ea3ff28.zip
Add expected exception to aggregate_metadata_delete()
This adds a missing client_exceptions() decorator to the conductor's aggregate_metadata_delete() method, which was missed due to the timing of when the patches landed. With this, all expected exceptions in conductor's current set of operations should be properly marked. Related to bp/no-db-compute-manager Change-Id: Ifa8cdcb1c7e93aeb95f5dc4fe2e294fe0165cdc5
Diffstat (limited to 'nova')
-rw-r--r--nova/conductor/manager.py1
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)