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

[Newell Jensen]

LP: #1761584 -- Create default storage pool 'maas' for virsh pods if no default storage pool is present.

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 4e40628eb9ed6d55628716c212d6e63f636b6421

review: Approve

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 467574a..e7925a0 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -431,6 +431,31 @@ class TestVirshSSH(MAASTestCase):
         value = conn.get_key_value(SAMPLE_NODEINFO, key)
         self.assertEquals(value, expected)
 
+    def test_create_storage_pool(self):
+        mock_run = self.patch(virsh.VirshSSH, 'run')
+        mock_run.return_value = ''
+        conn = virsh.VirshSSH()
+        conn.create_storage_pool()
+        self.assertThat(mock_run, MockCallsMatch(
+            call(['pool-define-as', 'maas', 'dir',
+                  '- - - -', '/var/lib/libvirt/maas-images']),
+            call(['pool-build', 'maas']),
+            call(['pool-start', 'maas']),
+            call(['pool-autostart', 'maas'])))
+
+    def test_create_storage_pool_writes_maaslog_on_error(self):
+        mock_maaslog = self.patch(virsh, 'maaslog')
+        mock_run = self.patch(virsh.VirshSSH, 'run')
+        error_msg = 'error: error message here'
+        mock_run.return_value = error_msg
+        conn = virsh.VirshSSH()
+        conn.create_storage_pool()
+        self.assertThat(mock_run, MockCalledOnceWith(
+            ['pool-define-as', 'maas', 'dir',
+             '- - - -', '/var/lib/libvirt/maas-images']))
+        self.assertThat(mock_maaslog.error, MockCalledOnceWith(
+            "Failed to create Pod storage pool: %s", error_msg))
+
     def test_list_machines(self):
         names = [factory.make_name('machine') for _ in range(3)]
         conn = self.configure_virshssh('\n'.join(names))
@@ -1472,8 +1497,10 @@ class TestVirshPodDriver(MAASTestCase):
         ]
         mock_login = self.patch(virsh.VirshSSH, 'login')
         mock_login.return_value = True
-        mock_run = self.patch(virsh.VirshSSH, 'run')
-        mock_run.return_value = SAMPLE_POOLLIST
+        mock_list_pools = self.patch(virsh.VirshSSH, 'list_pools')
+        mock_list_pools.side_effect = ([], ['default'], ['default'])
+        mock_create_storage_pool = self.patch(
+            virsh.VirshSSH, 'create_storage_pool')
         mock_get_pod_resources = self.patch(
             virsh.VirshSSH, 'get_pod_resources')
         mock_get_pod_hints = self.patch(
@@ -1484,6 +1511,7 @@ class TestVirshPodDriver(MAASTestCase):
         mock_list_machines.return_value = machines
 
         discovered_pod = yield driver.discover(system_id, context)
+        self.expectThat(mock_create_storage_pool, MockCalledOnceWith())
         self.expectThat(
             mock_get_pod_resources, MockCalledOnceWith())
         self.expectThat(
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 30a4955..537de91 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -289,6 +289,20 @@ class VirshSSH(pexpect.spawn):
         if value:
             return value.split()[0]
 
+    def create_storage_pool(self):
+        """Create a storage pool named `maas`."""
+        commands = [
+            ['pool-define-as', 'maas', 'dir',
+             '- - - -', '/var/lib/libvirt/maas-images'],
+            ['pool-build', 'maas'],
+            ['pool-start', 'maas'],
+            ['pool-autostart', 'maas']]
+        for command in commands:
+            output = self.run(command)
+            if output.startswith('error:'):
+                maaslog.error("Failed to create Pod storage pool: %s", output)
+                return None
+
     def list_machines(self):
         """Lists all VMs by name."""
         machines = self.run(['list', '--all', '--name'])
@@ -928,6 +942,11 @@ class VirshPodDriver(PodDriver):
         """
         conn = yield self.get_virsh_connection(context)
 
+        # Check that we have at least one storage pool.  If not, create it.
+        pools = yield deferToThread(conn.list_pools)
+        if not len(pools):
+            yield deferToThread(conn.create_storage_pool)
+
         # Check and set default storage pool.
         self.default_storage_pool = context.get('default_storage_pool')
         if self.default_storage_pool: