openstack
/
nova
Code Issues Proposed changes

Merge "Remove instance_info_cache_delete() from conductor"

This commit is contained in:
Jenkins 2014-08-05 05:24:10 +00:00 committed by Gerrit Code Review
parent b2535ea3b1 9d334b2231
commit 4e332e468b
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/conductor/api.py
View File

@ -74,9 +74,6 @@ class LocalAPI(object):
return self._manager.instance_get_all_by_host(context, host, node,
None)
def instance_info_cache_delete(self, context, instance):
return self._manager.instance_info_cache_delete(context, instance)
def migration_get_in_progress_by_host_and_node(self, context, host, node):
return self._manager.migration_get_in_progress_by_host_and_node(
context, host, node)

3
nova/conductor/manager.py
View File

@ -241,9 +241,6 @@ class ConductorManager(manager.Manager):
result = self.db.instance_destroy(context, instance['uuid'])
return jsonutils.to_primitive(result)
def instance_info_cache_delete(self, context, instance):
self.db.instance_info_cache_delete(context, instance['uuid'])
def instance_fault_create(self, context, values):
result = self.db.instance_fault_create(context, values)
return jsonutils.to_primitive(result)

5
nova/conductor/rpcapi.py
View File

@ -221,11 +221,6 @@ class ConductorAPI(object):
return cctxt.call(context, 'block_device_mapping_get_all_by_instance',
instance=instance_p, legacy=legacy)
def instance_info_cache_delete(self, context, instance):
instance_p = jsonutils.to_primitive(instance)
cctxt = self.client.prepare()
cctxt.call(context, 'instance_info_cache_delete', instance=instance_p)
def vol_get_usage_by_time(self, context, start_time):
start_time_p = jsonutils.to_primitive(start_time)
cctxt = self.client.prepare()

7
nova/tests/conductor/test_conductor.py
View File

@ -186,13 +186,6 @@ class _BaseTestCase(object):
self.context, fake_inst, legacy=False)
self.assertEqual(result, 'fake-result')
def test_instance_info_cache_delete(self):
self.mox.StubOutWithMock(db, 'instance_info_cache_delete')
db.instance_info_cache_delete(self.context, 'fake-uuid')
self.mox.ReplayAll()
self.conductor.instance_info_cache_delete(self.context,
{'uuid': 'fake-uuid'})
def test_vol_usage_update(self):
self.mox.StubOutWithMock(db, 'vol_usage_update')
self.mox.StubOutWithMock(compute_utils, 'usage_volume_info')