diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-21 18:50:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-21 18:50:35 +0000 |
| commit | 05f9961f40cedfd4435fc3ab8240a41e87754f43 (patch) | |
| tree | 5d5c8dfeede51d8b434d020a030a9720fad32e42 /nova/compute | |
| parent | 96e72e7295909cbe2ddb835283f68168cef883c1 (diff) | |
| parent | ff8d3d95d43212b786e97769fda89628a1724880 (diff) | |
Merge "Implements sending notification on metadata change"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 39b43594a..3453dfabe 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1742,6 +1742,8 @@ class API(base.Base): def delete_instance_metadata(self, context, instance, key): """Delete the given metadata item from an instance.""" self.db.instance_metadata_delete(context, instance['uuid'], key) + instance['metadata'] = {} + notifications.send_update(context, instance, instance) self.compute_rpcapi.change_instance_metadata(context, instance=instance, diff={key: ['-']}) @@ -1764,8 +1766,10 @@ class API(base.Base): _metadata.update(metadata) self._check_metadata_properties_quota(context, _metadata) - self.db.instance_metadata_update(context, instance['uuid'], + metadata = self.db.instance_metadata_update(context, instance['uuid'], _metadata, True) + instance['metadata'] = metadata + notifications.send_update(context, instance, instance) diff = utils.diff_dict(orig, _metadata) self.compute_rpcapi.change_instance_metadata(context, instance=instance, |