1
diff --git a/curtin/block/zfs.py b/curtin/block/zfs.py
2
index dce15c3..25751d3 100644
3
--- a/curtin/block/zfs.py
4
+++ b/curtin/block/zfs.py
5
@@ -281,4 +281,28 @@ def device_to_poolname(devname):
6
281
    if vdev_type == 'zfs_member' and label:
281
    if vdev_type == 'zfs_member' and label:
7
282
        return label
282
        return label
8
283
283
9
284
10
285
def get_zpool_from_config(cfg):
11
286
    """Parse a curtin storage config and return a list
12
287
       of zpools that were created.
13
288
    """
14
289
    if not cfg:
15
290
        return []
16
291
17
292
    if 'storage' not in cfg:
18
293
        return []
19
294
20
295
    zpools = []
21
296
    sconfig = cfg['storage']['config']
22
297
    for item in sconfig:
23
298
        if item['type'] == 'zpool':
24
299
            zpools.append(item['pool'])
25
300
        elif item['type'] == 'format':
26
301
            if item['fstype'] == 'zfsroot':
27
302
                # curtin.commands.blockmeta sets pool='rpool' for zfsroot
28
303
                zpools.append('rpool')
29
304
30
305
    return zpools
31
306
32
307
33
284
# vi: ts=4 expandtab syntax=python
308
# vi: ts=4 expandtab syntax=python
34
diff --git a/curtin/commands/install.py b/curtin/commands/install.py
35
index ad17508..a3471f6 100644
36
--- a/curtin/commands/install.py
37
+++ b/curtin/commands/install.py
38
@@ -11,7 +11,7 @@ import subprocess
39
11
import sys
11
import sys
40
12
import tempfile
12
import tempfile
41
13
13
43
14
from curtin.block import iscsi
14
from curtin.block import iscsi, zfs
44
15
from curtin import config
15
from curtin import config
45
16
from curtin import distro
16
from curtin import distro
46
17
from curtin import util
17
from curtin import util
47
@@ -505,6 +505,10 @@ def cmd_install(args):
48
505
            if iscsi.get_iscsi_disks_from_config(cfg):
505
            if iscsi.get_iscsi_disks_from_config(cfg):
49
506
                iscsi.restart_iscsi_service()
506
                iscsi.restart_iscsi_service()
50
507
507
51
508
            for pool in zfs.get_zpool_from_config(cfg):
52
509
                LOG.debug('Exporting ZFS zpool %s', pool)
53
510
                zfs.zpool_export(pool)
54
511
55
508
            shutil.rmtree(workingd.top)
512
            shutil.rmtree(workingd.top)
56
509
513
57
510
    apply_power_state(cfg.get('power_state'))
514
    apply_power_state(cfg.get('power_state'))
58
diff --git a/tests/unittests/test_block_zfs.py b/tests/unittests/test_block_zfs.py
59
index f45fde2..3508d4b 100644
60
--- a/tests/unittests/test_block_zfs.py
61
+++ b/tests/unittests/test_block_zfs.py
62
@@ -538,4 +538,30 @@ class TestZfsSupported(CiTestCase):
63
538
        self.assertEqual(1, m_assert_zfs.call_count)
538
        self.assertEqual(1, m_assert_zfs.call_count)
64
539
539
65
540
540
66
541
class TestZfsGetPoolFromConfig(CiTestCase):
67
542
68
543
    def test_get_zpool_from_config_returns_empty(self):
69
544
        """ get_zpool_from_config_returns_empty for invalid/empty configs."""
70
545
        configs = (None, {}, {'network': 'foobar'},
71
546
                   {'storage': {'config': []}})
72
547
        for cfg in configs:
73
548
            self.assertEqual([],
74
549
                             zfs.get_zpool_from_config(cfg))
75
550
76
551
    def test_get_zpool_from_config(self):
77
552
        """ get_zpool_from_config_returns pool names for each zpool in cfg."""
78
553
        expected_zpools = ['rpool1', 'rpool2']
79
554
        zpool_cfg = [{'type': 'zpool', 'pool': pool}
80
555
                     for pool in expected_zpools]
81
556
        sconfig = {'storage': {'config': zpool_cfg}}
82
557
        self.assertEqual(sorted(expected_zpools),
83
558
                         sorted(zfs.get_zpool_from_config(sconfig)))
84
559
85
560
    def test_get_zpool_from_config_zfsroot(self):
86
561
        """ get_zpool_from_config_returns injected pool name for zfsroot."""
87
562
        zpool_cfg = [{'type': 'format', 'fstype': 'zfsroot'}]
88
563
        sconfig = {'storage': {'config': zpool_cfg}}
89
564
        self.assertEqual(['rpool'], zfs.get_zpool_from_config(sconfig))
90
565
91
566
92
541
# vi: ts=4 expandtab syntax=python
567
# vi: ts=4 expandtab syntax=python
93
diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py
94
index a2fc316..a0e50e9 100644
95
--- a/tests/vmtests/test_zfsroot.py
96
+++ b/tests/vmtests/test_zfsroot.py
97
@@ -99,7 +99,6 @@ class DiscoTestZfsRoot(relbase.disco, TestZfsRootAbs):
98
99
    mem = 4096
99
    mem = 4096
99
100
100
100
101
101
101
102
@TestZfsRootAbs.skip_by_date("1838278", fixby="2019-10-01", install=False)
102
103
class EoanTestZfsRoot(relbase.eoan, TestZfsRootAbs):
102
class EoanTestZfsRoot(relbase.eoan, TestZfsRootAbs):
103
104
    __test__ = True
103
    __test__ = True
104
105
    mem = 4096
104
    mem = 4096
105
@@ -129,7 +128,6 @@ class DiscoTestZfsRootFsType(relbase.disco, TestZfsRootFsTypeAbs):
106
129
    mem = 4096
128
    mem = 4096
107
130
129
108
131
130
109
132
@TestZfsRootAbs.skip_by_date("1838278", fixby="2019-10-01", install=False)
110
133
class EoanTestZfsRootFsType(relbase.eoan, TestZfsRootFsTypeAbs):
131
class EoanTestZfsRootFsType(relbase.eoan, TestZfsRootFsTypeAbs):
111
134
    __test__ = True
132
    __test__ = True
112
135
    mem = 4096
133
    mem = 4096
Reviewer	Review Type	Date Requested	Status
Chad Smith		2019-09-17	Approve on 2019-10-07
Server Team CI bot	continuous-integration		Approve on 2019-09-27
Review via email: mp+372913@code.launchpad.net