openstack
/
nova
Code Issues Proposed changes

Merge "hyperv: make sure to plug OVS VIFs after resize/migrate" into stable/ocata

This commit is contained in:
Jenkins 2017-03-06 05:30:21 +00:00 committed by Gerrit Code Review
parent 9c37aa6810 14440efb22
commit ee36daec8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/hyperv/test_migrationops.py
View File

@ -446,7 +446,7 @@ class MigrationOpsTestCase(test_base.HyperVBaseTestCase):
mock_instance.name, get_image_vm_gen.return_value,
block_device_info)
self._migrationops._vmops.power_on.assert_called_once_with(
mock_instance)
mock_instance, network_info=mock.sentinel.network_info)
def test_finish_migration(self):
self._check_finish_migration(disk_type=constants.DISK)

2
nova/virt/hyperv/migrationops.py
View File

@ -298,7 +298,7 @@ class MigrationOps(object):
self._check_and_attach_config_drive(instance, vm_gen)
self._vmops.set_boot_order(instance_name, vm_gen, block_device_info)
if power_on:
self._vmops.power_on(instance)
self._vmops.power_on(instance, network_info=network_info)
def _check_ephemeral_disks(self, instance, ephemerals,
resize_instance=False):