Merge "XenAPI: Create linux bridge in dest host during live migration"
This commit is contained in:
commit
96e07267fe
@ -3476,7 +3476,8 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
|
||||
self.assertTrue(result)
|
||||
pre.assert_called_with("ctx", "inst", "bdi", "nw", "di", "data")
|
||||
|
||||
def test_post_live_migration_at_destination(self):
|
||||
@mock.patch.object(vmops.VMOps, '_post_start_actions')
|
||||
def test_post_live_migration_at_destination(self, mock_post_action):
|
||||
# ensure method is present
|
||||
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
|
||||
self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
|
||||
@ -3520,6 +3521,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
|
||||
self.assertEqual(fake_fw.call_count, 3)
|
||||
self.assertTrue(fake_get_vm_opaque_ref.called)
|
||||
self.assertTrue(fake_strip_base_mirror_from_vdis.called)
|
||||
mock_post_action.assert_called_once_with(fake_instance)
|
||||
|
||||
def test_check_can_live_migrate_destination_with_block_migration(self):
|
||||
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
|
||||
|
@ -2469,6 +2469,9 @@ class VMOps(object):
|
||||
# applied security groups, however this requires changes to XenServer
|
||||
self._prepare_instance_filter(instance, network_info)
|
||||
self.firewall_driver.apply_instance_filter(instance, network_info)
|
||||
|
||||
# hook linux bridge and ovs bridge at destination
|
||||
self._post_start_actions(instance)
|
||||
vm_utils.create_kernel_and_ramdisk(context, self._session, instance,
|
||||
instance['name'])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user