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

[Newell Jensen]

LP: #1858201 -- Round down to the nearest MiB for zfs storage pools for virsh.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: ffff4578dd123e76111d50f0b0c00f59924cc5c1

review: Approve

[Adam Collard (adam-collard)]

review: Approve

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 00f19ce..eaec7ae 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -1,10 +1,11 @@
-# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.drivers.pod.virsh`."""
 
 __all__ = []
 
+from math import floor
 import os
 import random
 from textwrap import dedent
@@ -1589,6 +1590,37 @@ class TestVirshSSH(MAASTestCase):
         self.assertEqual(pool, used_pool)
         self.assertIsNotNone(volume_name)
 
+    def test_create_local_volume_makes_call_returns_pool_and_volume_zfs(self):
+        conn = self.configure_virshssh("")
+        pool = factory.make_name("pool")
+        self.patch(virsh.VirshSSH, "get_usable_pool").return_value = (
+            "zfs",
+            pool,
+        )
+        mock_run = self.patch(virsh.VirshSSH, "run")
+        disk = RequestedMachineBlockDevice(
+            size=random.randint(1000, 2000), tags=[]
+        )
+        used_pool, volume_name = conn.create_local_volume(disk)
+        size = int(floor(disk.size / 2 ** 20)) * 2 ** 20
+        self.assertThat(
+            mock_run,
+            MockCalledOnceWith(
+                [
+                    "vol-create-as",
+                    used_pool,
+                    volume_name,
+                    str(size),
+                    "--allocation",
+                    "0",
+                    "--format",
+                    "raw",
+                ]
+            ),
+        )
+        self.assertEqual(pool, used_pool)
+        self.assertIsNotNone(volume_name)
+
     def test_delete_local_volume(self):
         conn = self.configure_virshssh("")
         pool = factory.make_name("pool")
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index c6ca0da..e5e41f5 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Virsh pod driver."""
@@ -6,6 +6,7 @@
 __all__ = ["probe_virsh_and_enlist", "VirshPodDriver"]
 
 from collections import namedtuple
+from math import floor
 import os
 import string
 from tempfile import NamedTemporaryFile
@@ -921,6 +922,23 @@ class VirshSSH(pexpect.spawn):
                     "raw",
                 ]
             )
+        elif usable_pool_type == "zfs":
+            # LP: #1858201
+            # Round down to the nearest MiB for zfs.
+            # See bug comments for more details.
+            size = int(floor(disk.size / 2 ** 20)) * 2 ** 20
+            self.run(
+                [
+                    "vol-create-as",
+                    usable_pool,
+                    volume,
+                    str(size),
+                    "--allocation",
+                    "0",
+                    "--format",
+                    "raw",
+                ]
+            )
         else:
             self.run(
                 [