From 255a363f78ffd193a4915169d44b85dfeb2c9579 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 10 Nov 2011 15:58:17 -0500 Subject: Converting metadata calls to use instance objects Related to blueprint internal-uuids Change-Id: Ic21bffbdb538fb8c1bdd1d729982e2da0a56bdf8 --- nova/api/openstack/server_metadata.py | 9 ++++++--- nova/compute/api.py | 29 ++++++++++------------------- nova/tests/test_compute.py | 26 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 22 deletions(-) (limited to 'nova') diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py index d764075b7..215621546 100644 --- a/nova/api/openstack/server_metadata.py +++ b/nova/api/openstack/server_metadata.py @@ -33,7 +33,8 @@ class Controller(object): def _get_metadata(self, context, server_id): try: - meta = self.compute_api.get_instance_metadata(context, server_id) + server = self.compute_api.get(context, server_id) + meta = self.compute_api.get_instance_metadata(context, server) except exception.InstanceNotFound: msg = _('Server does not exist') raise exc.HTTPNotFound(explanation=msg) @@ -107,8 +108,9 @@ class Controller(object): def _update_instance_metadata(self, context, server_id, metadata, delete=False): try: + server = self.compute_api.get(context, server_id) return self.compute_api.update_instance_metadata(context, - server_id, + server, metadata, delete) @@ -147,7 +149,8 @@ class Controller(object): raise exc.HTTPNotFound(explanation=msg) try: - self.compute_api.delete_instance_metadata(context, server_id, id) + server = self.compute_api.get(context, server_id) + self.compute_api.delete_instance_metadata(context, server, id) except exception.InstanceNotFound: msg = _('Server does not exist') raise exc.HTTPNotFound(explanation=msg) diff --git a/nova/compute/api.py b/nova/compute/api.py index 03d5933b0..4ddbb86c5 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1230,8 +1230,8 @@ class API(base.Base): migration_ref = self.db.migration_get_by_instance_and_status(context, instance['uuid'], 'finished') if not migration_ref: - raise exception.MigrationNotFoundByStatus(instance_id=instance_id, - status='finished') + raise exception.MigrationNotFoundByStatus( + instance_id=instance['id'], status='finished') self.update(context, instance['id'], @@ -1563,24 +1563,16 @@ class API(base.Base): floating_address=address, fixed_address=fixed_ip_addrs[0]) - def _get_native_instance_id(self, context, instance_id): - """If an instance id is a UUID, convert it to a native ID.""" - if utils.is_uuid_like(instance_id): - instance_id = self.get(context, instance_id)['id'] - return instance_id - - def get_instance_metadata(self, context, instance_id): + def get_instance_metadata(self, context, instance): """Get all metadata associated with an instance.""" - instance_id = self._get_native_instance_id(context, instance_id) - rv = self.db.instance_metadata_get(context, instance_id) + rv = self.db.instance_metadata_get(context, instance['id']) return dict(rv.iteritems()) - def delete_instance_metadata(self, context, instance_id, key): + def delete_instance_metadata(self, context, instance, key): """Delete the given metadata item from an instance.""" - instance_id = self._get_native_instance_id(context, instance_id) - self.db.instance_metadata_delete(context, instance_id, key) + self.db.instance_metadata_delete(context, instance['id'], key) - def update_instance_metadata(self, context, instance_id, + def update_instance_metadata(self, context, instance, metadata, delete=False): """Updates or creates instance metadata. @@ -1588,14 +1580,13 @@ class API(base.Base): `metadata` argument will be deleted. """ - instance_id = self._get_native_instance_id(context, instance_id) - if delete: _metadata = metadata else: - _metadata = self.get_instance_metadata(context, instance_id) + _metadata = self.get_instance_metadata(context, instance) _metadata.update(metadata) self._check_metadata_properties_quota(context, _metadata) - self.db.instance_metadata_update(context, instance_id, _metadata, True) + self.db.instance_metadata_update(context, instance['id'], + _metadata, True) return _metadata diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 2b124b6fc..360a2e2b6 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1584,6 +1584,32 @@ class ComputeAPITestCase(BaseTestCase): db.instance_destroy(c, instance_id3) db.instance_destroy(c, instance_id4) + def test_instance_metadata(self): + """Test searching instances by state""" + _context = context.get_admin_context() + instance_id = self._create_instance({'metadata': {'key1': 'value1'}}) + instance = self.compute_api.get(_context, instance_id) + + metadata = self.compute_api.get_instance_metadata(_context, instance) + self.assertEqual(metadata, {'key1': 'value1'}) + + self.compute_api.update_instance_metadata(_context, instance, + {'key2': 'value2'}) + metadata = self.compute_api.get_instance_metadata(_context, instance) + self.assertEqual(metadata, {'key1': 'value1', 'key2': 'value2'}) + + new_metadata = {'key2': 'bah', 'key3': 'value3'} + self.compute_api.update_instance_metadata(_context, instance, + new_metadata, delete=True) + metadata = self.compute_api.get_instance_metadata(_context, instance) + self.assertEqual(metadata, new_metadata) + + self.compute_api.delete_instance_metadata(_context, instance, 'key2') + metadata = self.compute_api.get_instance_metadata(_context, instance) + self.assertEqual(metadata, {'key3': 'value3'}) + + db.instance_destroy(_context, instance_id) + @staticmethod def _parse_db_block_device_mapping(bdm_ref): attr_list = ('delete_on_termination', 'device_name', 'no_device', -- cgit