Merge "Wait for network-vif-plugged on resize revert" into stable/rocky

openstack · Dec 8, 2018 · 4a12c9c · 4a12c9c
2 parents 8dacfd3 + b35b812
commit 4a12c9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py
@@ -18763,7 +18763,7 @@ def fake_create_domain(context, xml, instance, network_info,
                                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():

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
@@ -8493,8 +8493,7 @@ def finish_revert_migration(self, context, instance, network_info,
                                   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(