openstack
/
nova
Code Issues Proposed changes

Merge "Wait for network-vif-plugged on resize revert"

This commit is contained in:
Zuul 2018-09-25 07:01:23 +00:00 committed by Gerrit Code Review
parent eb26f1b719 4817165fc5
commit 92efe59441
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -18698,7 +18698,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase, TraitsComparisonMixin):
vifs_already_plugged=None):
self.fake_create_domain_called = True
self.assertEqual(powered_on, power_on)
self.assertTrue(vifs_already_plugged)
self.assertFalse(vifs_already_plugged)
return mock.MagicMock()
def fake_enable_hairpin(self):

3
nova/virt/libvirt/driver.py
View File

@ -8499,8 +8499,7 @@ class LibvirtDriver(driver.ComputeDriver):
block_device_info=block_device_info)
self._create_domain_and_network(context, xml, instance, network_info,
block_device_info=block_device_info,
power_on=power_on,
vifs_already_plugged=True)
power_on=power_on)
if power_on:
timer = loopingcall.FixedIntervalLoopingCall(