Merge "libvirt: Acquire TCP ports for console during live migration"

diff --cc nova/tests/unit/virt/libvirt/test_driver.py
index b6c5e58d69b36ff9b9c5e092afab7ae0b76b8abf,856340ae109e6255ffbc9f3fe4e164ab56f289f1..034aa0d8e683c89ca3ea83f9253ca8921c0c0e4f
--- 1/nova/tests/unit/virt/libvirt/test_driver.py
--- 2/nova/tests/unit/virt/libvirt/test_driver.py
+++ b/nova/tests/unit/virt/libvirt/test_driver.py
@@@ -3628,15 -3623,17 +3631,18 @@@ class LibvirtConnTestCase(test.NoDBTest
                  return_value=1)
      @mock.patch.object(libvirt_driver.libvirt_utils, 'get_arch',)
      def test_create_serial_console_devices_based_on_arch(self, mock_get_arch,
-                                            mock_get_port_number,
-                                            mock_acquire_port):
+                                                          mock_get_port_number,
+                                                          mock_acquire_port,
+                                                          mock_ports,
+                                                          mock_guest):
          self.flags(enabled=True, group='serial_console')
          drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
+         instance = objects.Instance(**self.test_instance)
  
 -        expected = {arch.X86_64: vconfig.LibvirtConfigGuestSerial,
 -                    arch.S390: vconfig.LibvirtConfigGuestConsole,
 -                    arch.S390X: vconfig.LibvirtConfigGuestConsole}
 +        expected = {
 +          fields.Architecture.X86_64: vconfig.LibvirtConfigGuestSerial,
 +          fields.Architecture.S390: vconfig.LibvirtConfigGuestConsole,
 +          fields.Architecture.S390X: vconfig.LibvirtConfigGuestConsole}
  
          caps = drvr._host.get_capabilities()
  
@@@ -3654,11 -3655,9 +3664,11 @@@
      @mock.patch('nova.virt.hardware.get_number_of_serial_ports',
                  return_value=4)
      @mock.patch.object(libvirt_driver.libvirt_utils, 'get_arch',
 -                       side_effect=[arch.X86_64, arch.S390, arch.S390X])
 +                       side_effect=[fields.Architecture.X86_64,
 +                                    fields.Architecture.S390,
 +                                    fields.Architecture.S390X])
      def test_create_serial_console_devices_with_limit_exceeded_based_on_arch(
-             self, mock_get_arch, mock_get_port_number):
+             self, mock_get_arch, mock_get_port_number, mock_ports, mock_guest):
          self.flags(enabled=True, group='serial_console')
          self.flags(virt_type="qemu", group='libvirt')
          flavor = 'fake_flavor'

diff --cc nova/virt/libvirt/driver.py
Simple merge