curtin-dev team mailing list archive

[Michael Hudson-Doyle <mp+448842@xxxxxxxxxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:extract-partuuid into curtin:master.

Commit message:
storage_config: include partition uuids for gpt partitions



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/448842
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:extract-partuuid into curtin:master.

diff --git a/curtin/storage_config.py b/curtin/storage_config.py
index 329183a..d5092dd 100644
--- a/curtin/storage_config.py
+++ b/curtin/storage_config.py
@@ -802,6 +802,11 @@ class BlockdevParser(ProbertParser):
             if ptable:
                 entry['size'] *= 512
 
+            if blockdev_data.get('ID_PART_TABLE_TYPE') == 'gpt':
+                part_uuid = blockdev_data.get('ID_PART_ENTRY_UUID')
+                if part_uuid is not None:
+                    entry['uuid'] = part_uuid
+
             ptype = blockdev_data.get('ID_PART_ENTRY_TYPE')
             if ptype is not None:
                 entry['partition_type'] = ptype
diff --git a/tests/unittests/test_storage_config.py b/tests/unittests/test_storage_config.py
index 724757b..b032bf4 100644
--- a/tests/unittests/test_storage_config.py
+++ b/tests/unittests/test_storage_config.py
@@ -351,6 +351,7 @@ class TestBlockdevParser(CiTestCase):
             'size': 499122176,
             'flag': 'linux',
             'partition_type': '0fc63daf-8483-4772-8e79-3d69d8477de4',
+            'uuid': '6347e694-3680-481f-b3b9-f13090855467',
         }
         self.assertDictEqual(expected_dict,
                              self.bdevp.asdict(blockdev))