1
diff --git a/curtin/block/schemas.py b/curtin/block/schemas.py
2
index aa45d61..fc7e522 100644
3
--- a/curtin/block/schemas.py
4
+++ b/curtin/block/schemas.py
5
@@ -7,6 +7,8 @@ _path_nondev = r'(^/$|^(/[^/]+)+$)'
6
7
_fstypes = ['btrfs', 'ext2', 'ext3', 'ext4', 'fat', 'fat12', 'fat16', 'fat32',
7
_fstypes = ['btrfs', 'ext2', 'ext3', 'ext4', 'fat', 'fat12', 'fat16', 'fat32',
7
8
            'iso9660', 'vfat', 'jfs', 'ntfs', 'reiserfs', 'swap', 'xfs',
8
            'iso9660', 'vfat', 'jfs', 'ntfs', 'reiserfs', 'swap', 'xfs',
8
9
            'zfsroot']
9
            'zfsroot']
9
10
_ptables = ['dos', 'gpt', 'msdos', 'vtoc']
10
11
_ptable_unsupported = 'unsupported'
11
10
12
12
11
definitions = {
13
definitions = {
13
12
    'id': {'type': 'string'},
14
    'id': {'type': 'string'},
14
@@ -14,8 +16,7 @@ definitions = {
15
14
    'devices': {'type': 'array', 'items': {'$ref': '#/definitions/ref_id'}},
16
    'devices': {'type': 'array', 'items': {'$ref': '#/definitions/ref_id'}},
16
15
    'name': {'type': 'string'},
17
    'name': {'type': 'string'},
17
16
    'preserve': {'type': 'boolean'},
18
    'preserve': {'type': 'boolean'},
20
17
    'ptable': {'type': 'string', 'enum': ['dos', 'gpt', 'mac', 'msdos',
19
    'ptable': {'type': 'string', 'enum': _ptables + [_ptable_unsupported]},
19
18
                                          'vtoc']},
21
19
    'size': {'type': ['string', 'number'],
20
    'size': {'type': ['string', 'number'],
22
20
             'minimum': 1,
21
             'minimum': 1,
23
21
             'pattern': r'^([1-9]\d*(.\d+)?|\d+.\d+)(K|M|G|T)?B?'},
22
             'pattern': r'^([1-9]\d*(.\d+)?|\d+.\d+)(K|M|G|T)?B?'},
24
diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
25
index 37b93dd..6afb048 100644
26
--- a/curtin/commands/block_meta.py
27
+++ b/curtin/commands/block_meta.py
28
@@ -2,6 +2,7 @@
29
2
2
30
3
from collections import OrderedDict, namedtuple
3
from collections import OrderedDict, namedtuple
31
4
from curtin import (block, config, paths, util)
4
from curtin import (block, config, paths, util)
32
5
from curtin.block import schemas
33
5
from curtin.block import (bcache, clear_holders, dasd, iscsi, lvm, mdadm, mkfs,
6
from curtin.block import (bcache, clear_holders, dasd, iscsi, lvm, mdadm, mkfs,
34
6
                          zfs)
7
                          zfs)
35
7
from curtin import distro
8
from curtin import distro
36
@@ -32,6 +33,7 @@ SIMPLE = 'simple'
37
32
SIMPLE_BOOT = 'simple-boot'
33
SIMPLE_BOOT = 'simple-boot'
38
33
CUSTOM = 'custom'
34
CUSTOM = 'custom'
39
34
BCACHE_REGISTRATION_RETRY = [0.2] * 60
35
BCACHE_REGISTRATION_RETRY = [0.2] * 60
40
36
PTABLE_UNSUPPORTED = schemas._ptable_unsupported
41
35
37
42
36
CMD_ARGUMENTS = (
38
CMD_ARGUMENTS = (
43
37
    ((('-D', '--devices'),
39
    ((('-D', '--devices'),
44
@@ -536,7 +538,7 @@ def disk_handler(info, storage_config):
45
536
538
46
537
    if config.value_as_boolean(info.get('preserve')):
539
    if config.value_as_boolean(info.get('preserve')):
47
538
        # Handle preserve flag, verifying if ptable specified in config
540
        # Handle preserve flag, verifying if ptable specified in config
49
539
        if config.value_as_boolean(ptable):
541
        if config.value_as_boolean(ptable) and ptable != PTABLE_UNSUPPORTED:
50
540
            current_ptable = block.get_part_table_type(disk)
542
            current_ptable = block.get_part_table_type(disk)
51
541
            if not ((ptable in _dos_names and current_ptable in _dos_names) or
543
            if not ((ptable in _dos_names and current_ptable in _dos_names) or
52
542
                    (ptable == 'gpt' and current_ptable == 'gpt')):
544
                    (ptable == 'gpt' and current_ptable == 'gpt')):
53
diff --git a/curtin/storage_config.py b/curtin/storage_config.py
54
index 3bfa466..03cfb4e 100644
55
--- a/curtin/storage_config.py
56
+++ b/curtin/storage_config.py
57
@@ -743,7 +743,11 @@ class BlockdevParser(ProbertParser):
58
743
            entry.update(uniq_ids)
743
            entry.update(uniq_ids)
59
744
744
60
745
            if 'ID_PART_TABLE_TYPE' in blockdev_data:
745
            if 'ID_PART_TABLE_TYPE' in blockdev_data:
62
746
                entry['ptable'] = blockdev_data['ID_PART_TABLE_TYPE']
746
                ptype = blockdev_data['ID_PART_TABLE_TYPE']
63
747
                if ptype in schemas._ptables:
64
748
                    entry['ptable'] = ptype
65
749
                else:
66
750
                    entry['ptable'] = schemas._ptable_unsupported
67
747
            return entry
751
            return entry
68
748
752
69
749
        if entry['type'] == 'partition':
753
        if entry['type'] == 'partition':
70
diff --git a/tests/unittests/test_storage_config.py b/tests/unittests/test_storage_config.py
71
index 154a8b2..d4113ea 100644
72
--- a/tests/unittests/test_storage_config.py
73
+++ b/tests/unittests/test_storage_config.py
74
@@ -43,12 +43,11 @@ class TestStorageConfigSchema(CiTestCase):
75
43
        storage_config.validate_config(config)
43
        storage_config.validate_config(config)
76
44
44
77
45
    @skipUnlessJsonSchema()
45
    @skipUnlessJsonSchema()
79
46
    def test_disk_schema_accepts_mac_partition_table(self):
46
    def test_disk_schema_accepts_missing_ptable(self):
80
47
        disk = {
47
        disk = {
81
48
            "id": "disk-vdc",
48
            "id": "disk-vdc",
82
49
            "path": "/dev/vdc",
49
            "path": "/dev/vdc",
83
50
            "type": "disk",
50
            "type": "disk",
84
51
            "ptable": "mac",
85
52
        }
51
        }
86
53
        config = {'config': [disk], 'version': 1}
52
        config = {'config': [disk], 'version': 1}
87
54
        storage_config.validate_config(config)
53
        storage_config.validate_config(config)
88
@@ -385,6 +384,21 @@ class TestBlockdevParser(CiTestCase):
89
385
        self.assertDictEqual(expected_dict,
384
        self.assertDictEqual(expected_dict,
90
386
                             self.bdevp.asdict(blockdev))
385
                             self.bdevp.asdict(blockdev))
91
387
386
92
387
    def test_blockdev_asdict_disk_marks_unknown_ptable_as_unspported(self):
93
388
        blockdev = self.bdevp.blockdev_data['/dev/sda']
94
389
        expected_dict = {
95
390
            'id': 'disk-sda',
96
391
            'type': 'disk',
97
392
            'wwn': '0x3001438034e549a0',
98
393
            'serial': '33001438034e549a0',
99
394
            'ptable': 'unsupported',
100
395
            'path': '/dev/sda',
101
396
        }
102
397
        for invalid in ['mac', 'PMBR']:
103
398
            blockdev['ID_PART_TABLE_TYPE'] = invalid
104
399
            self.assertDictEqual(expected_dict,
105
400
                                 self.bdevp.asdict(blockdev))
106
401
107
388
    def test_blockdev_detects_multipath(self):
402
    def test_blockdev_detects_multipath(self):
108
389
        self.probe_data = _get_data('probert_storage_multipath.json')
403
        self.probe_data = _get_data('probert_storage_multipath.json')
109
390
        self.bdevp = BlockdevParser(self.probe_data)
404
        self.bdevp = BlockdevParser(self.probe_data)
Reviewer	Review Type	Date Requested	Status
Chad Smith			Approve on 2019-10-24
Server Team CI bot	continuous-integration		Approve on 2019-10-24
Dan Watkins (community)		2019-10-17	Approve on 2019-10-23
Dimitri John Ledkov (community)			Needs Fixing on 2019-10-22
Michael Hudson-Doyle		2019-10-17	Pending
Review via email: mp+374305@code.launchpad.net