x/python-ganttclient
Code Issues Proposed changes

Merge "Setup and teardown networks during migration"

Browse Source
This commit is contained in:
Jenkins
2012-03-07 01:45:33 +00:00
committed by Gerrit Code Review
parent 3033fcf2a8 19c7ea5608
commit 3de63c77e9
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/test_compute.py
View File

@@ -1387,6 +1387,10 @@ class ComputeTestCase(BaseTestCase):
'disk': None} 'disk': None}
}).AndRaise(rpc.common.RemoteError('', '', '')) }).AndRaise(rpc.common.RemoteError('', '', ''))
# mocks for rollback # mocks for rollback
rpc.call(c, 'network', {'method': 'setup_networks_on_host',
'args': {'instance_id': instance_id,
'host': self.compute.host,
'teardown': False}})
rpc.call(c, topic, {"method": "remove_volume_connection", rpc.call(c, topic, {"method": "remove_volume_connection",
"args": {'instance_id': instance_id, "args": {'instance_id': instance_id,
'volume_id': volume_id}}) 'volume_id': volume_id}})
@@ -1455,6 +1459,10 @@ class ComputeTestCase(BaseTestCase):
self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance') self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
self.compute.driver.unfilter_instance(i_ref, []) self.compute.driver.unfilter_instance(i_ref, [])
self.mox.StubOutWithMock(rpc, 'call') self.mox.StubOutWithMock(rpc, 'call')
rpc.call(c, 'network', {'method': 'setup_networks_on_host',
'args': {'instance_id': instance_id,
'host': self.compute.host,
'teardown': True}})
rpc.call(c, db.queue_get_for(c, FLAGS.compute_topic, dest), rpc.call(c, db.queue_get_for(c, FLAGS.compute_topic, dest),
{"method": "post_live_migration_at_destination", {"method": "post_live_migration_at_destination",
"args": {'instance_id': i_ref['id'], 'block_migration': False}}) "args": {'instance_id': i_ref['id'], 'block_migration': False}})

2
nova/tests/test_network.py
View File

@@ -838,7 +838,7 @@ class VlanNetworkTestCase(test.TestCase):
# Clean up the ip addresses # Clean up the ip addresses
self.network.disassociate_floating_ip(context1, float_addr) self.network.disassociate_floating_ip(context1, float_addr)
self.network.deallocate_floating_ip(context1, float_addr) self.network.deallocate_floating_ip(context1, float_addr)
self.network.deallocate_fixed_ip(context1, fix_addr) self.network.deallocate_fixed_ip(context1, fix_addr, 'fake')
db.floating_ip_destroy(context1.elevated(), float_addr) db.floating_ip_destroy(context1.elevated(), float_addr)
db.fixed_ip_disassociate(context1.elevated(), fix_addr) db.fixed_ip_disassociate(context1.elevated(), fix_addr)