diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-09 11:10:14 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-09 11:10:14 -0400 |
| commit | d72e36d63b1aefe7731d5c832c2b2fa52227407c (patch) | |
| tree | 2563f056dd646ee1826c58bfe40700e7f1cdc8c8 /nova | |
| parent | ed4a3b33647d3cbf5b1733596c1e180078e23cb0 (diff) | |
| download | nova-d72e36d63b1aefe7731d5c832c2b2fa52227407c.tar.gz nova-d72e36d63b1aefe7731d5c832c2b2fa52227407c.tar.xz nova-d72e36d63b1aefe7731d5c832c2b2fa52227407c.zip | |
making usage of 'delete' argument more clear
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/server_metadata.py | 9 | ||||
| -rw-r--r-- | nova/compute/api.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py index 97a43fccf..2b235f79a 100644 --- a/nova/api/openstack/server_metadata.py +++ b/nova/api/openstack/server_metadata.py @@ -60,7 +60,7 @@ class Controller(object): new_metadata = self._update_instance_metadata(context, server_id, metadata, - False) + delete=False) return {'metadata': new_metadata} @@ -82,7 +82,10 @@ class Controller(object): raise exc.HTTPBadRequest(explanation=expl) context = req.environ['nova.context'] - self._update_instance_metadata(context, server_id, meta_item, False) + self._update_instance_metadata(context, + server_id, + meta_item, + delete=False) return {'meta': meta_item} @@ -97,7 +100,7 @@ class Controller(object): new_metadata = self._update_instance_metadata(context, server_id, metadata, - True) + delete=True) return {'metadata': new_metadata} diff --git a/nova/compute/api.py b/nova/compute/api.py index 867f6ce99..aaff8b370 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1183,14 +1183,12 @@ class API(base.Base): `metadata` argument will be deleted. """ - if not delete: + if delete: + _metadata = metadata + else: _metadata = self.get_instance_metadata(context, instance_id) _metadata.update(metadata) - else: - _metadata = metadata self._check_metadata_properties_quota(context, _metadata) - self.db.instance_metadata_update(context, instance_id, _metadata, True) - return _metadata |