Merge ~newell-jensen/maas:lp1785755 into maas:master

[Newell Jensen]

LP: #1785755 - Add the serial number of the disk to the VM XML.

Example output from this branch when creating a VM:

    <disk type='file' device='disk'>
      <driver name='qemu' type='raw'/>
      <source file='/var/lib/libvirt/images/099e1d17-9f6b-46e2-b4b6-07fc2814cdc5'/>
      <backingStore/>
      <target dev='vda' bus='virtio'/>
      <serial>099e1d17-9f6b-46e2-b4b6-07fc2814cdc5</serial>
      <alias name='virtio-disk0'/>
      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
    </disk>

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1785755 lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8a2d84b33e400f574edcdf7bef5abf3d0abbb8c1

review: Approve

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index d3141d1..ff616c7 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -5,6 +5,7 @@
 
 __all__ = []
 
+import os
 import random
 from textwrap import dedent
 from unittest.mock import (
@@ -1208,7 +1209,8 @@ class TestVirshSSH(MAASTestCase):
         domain = factory.make_name('domain')
         pool = factory.make_name('pool')
         volume_name = factory.make_name('volume')
-        volume_path = factory.make_name('path')
+        volume_path = factory.make_name('/some/path/to_vol_serial')
+        serial = os.path.basename(volume_path)
         device_name = factory.make_name('device')
         mock_run = self.patch(virsh.VirshSSH, "run")
         self.patch(
@@ -1216,7 +1218,8 @@ class TestVirshSSH(MAASTestCase):
         conn.attach_local_volume(domain, pool, volume_name, device_name)
         self.assertThat(mock_run, MockCalledOnceWith([
             'attach-disk', domain, volume_path, device_name,
-            '--targetbus', 'virtio', '--sourcetype', 'file', '--config']))
+            '--targetbus', 'virtio', '--sourcetype',
+            'file', '--config', '--serial', serial]))
 
     def test_get_networks_list(self):
         networks = [
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index dff69a5..f04fb9c 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -9,6 +9,7 @@ __all__ = [
     ]
 
 from collections import namedtuple
+import os
 import string
 from tempfile import NamedTemporaryFile
 from textwrap import dedent
@@ -845,9 +846,11 @@ class VirshSSH(pexpect.spawn):
     def attach_local_volume(self, domain, pool, volume, device):
         """Attach `volume` in `pool` to `domain` as `device`."""
         vol_path = self.get_volume_path(pool, volume)
+        serial = os.path.basename(vol_path)
         self.run([
             'attach-disk', domain, vol_path, device,
-            '--targetbus', 'virtio', '--sourcetype', 'file', '--config'])
+            '--targetbus', 'virtio', '--sourcetype',
+            'file', '--config', '--serial', serial])
 
     def get_network_list(self):
         """Return the list of available networks."""