diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-23 20:56:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-23 20:56:48 +0000 |
| commit | 6293c0b1dcf3dbc489d8e335941313a96846eb07 (patch) | |
| tree | b96945661e98a8d1679771de366f4d88bb54e90e | |
| parent | 13937c028df30de8649685b471c5fbbcf634cedd (diff) | |
| parent | abda597d28b344584026732733bf9355e5a66f45 (diff) | |
| download | nova-6293c0b1dcf3dbc489d8e335941313a96846eb07.tar.gz nova-6293c0b1dcf3dbc489d8e335941313a96846eb07.tar.xz nova-6293c0b1dcf3dbc489d8e335941313a96846eb07.zip | |
Merge "Remove unused instance id-to-uuid function"
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 12 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 3 | ||||
| -rw-r--r-- | nova/tests/fake_network.py | 7 |
4 files changed, 0 insertions, 27 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 9a84cff18..b80e88705 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -687,11 +687,6 @@ def instance_remove_security_group(context, instance_id, security_group_id): security_group_id) -def instance_get_id_to_uuid_mapping(context, ids): - """Return a dictionary containing 'ID: UUID' given the ids""" - return IMPL.instance_get_id_to_uuid_mapping(context, ids) - - ################### diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index d15609de7..913c5e04e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1812,18 +1812,6 @@ def instance_remove_security_group(context, instance_uuid, security_group_id): 'updated_at': literal_column('updated_at')}) -@require_context -def instance_get_id_to_uuid_mapping(context, ids): - session = get_session() - instances = session.query(models.Instance).\ - filter(models.Instance.id.in_(ids)).\ - all() - mapping = {} - for instance in instances: - mapping[instance['id']] = instance['uuid'] - return mapping - - ################### diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 79ef9beaf..c28d2bd2f 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3476,9 +3476,6 @@ class ComputeAPITestCase(BaseTestCase): self.stubs.Set(self.compute_api.network_api, 'get_instance_uuids_by_ip_filter', network_manager.get_instance_uuids_by_ip_filter) - self.stubs.Set(network_manager.db, - 'instance_get_id_to_uuid_mapping', - db.instance_get_id_to_uuid_mapping) instance1 = self._create_fake_instance({ 'display_name': 'woot', diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 88e091f00..580768d9d 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -135,13 +135,6 @@ class FakeNetworkManager(network_manager.NetworkManager): def virtual_interface_get_all(self, context): return self.vifs - def instance_get_id_to_uuid_mapping(self, context, ids): - # NOTE(jkoelker): This is just here until we can rely on UUIDs - mapping = {} - for id in ids: - mapping[id] = str(utils.gen_uuid()) - return mapping - def fixed_ips_by_virtual_interface(self, context, vif_id): return [ip for ip in self.fixed_ips if ip['virtual_interface_id'] == vif_id] |