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 /nova/tests | |
| parent | 13937c028df30de8649685b471c5fbbcf634cedd (diff) | |
| parent | abda597d28b344584026732733bf9355e5a66f45 (diff) | |
Merge "Remove unused instance id-to-uuid function"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 3 | ||||
| -rw-r--r-- | nova/tests/fake_network.py | 7 |
2 files changed, 0 insertions, 10 deletions
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] |