Merge ~techreed/curtin:storage_eud into curtin:master

[Reed Slaby]

Allow EUI-64 formatted WWNs for disks and accept NVMe partition naming

Added WWNs matching the EUI-64 format (e.g. eui.0011223344556677) to the list of valid WWNs in the DISK schema definition.

Altered storage parser to allow partitions named like /dev/nvmeXnXpX. These were previously discarded since the naming scheme does not match traditional HDD/SSD drives.

This branch is the result of installer issues that were encountered while attempting to install Ubuntu Server 18.04.3 LTS on a Samsung 960 EVO M.2 NVMe drive.

The initial issue was that the EUI-64 identifier for the disk was not accepted by curtin as a valid WWN format. After adding this format to the DISK schema and restarting subiquity, curtin recognized the disk and I was able to complete the installation successfully.

While going back to verify that the commit to schemas.py was still working following the initial installation, I encountered a separate issue with curtin's partition parsing.

Since NVMe drives are named like '/dev/nvme0n1' and their partitions are named like '/dev/nvme0n1p1', using lstrip() to get the partition number results in 'p1' instead of '1'. This failed the naming check, the partitions were skipped, and the installer failed because asdict "Couldn't find partition entry in table".

3af744f... by Reed Slaby <email address hidden> on 2019-08-18

Restore detection of partition numbers greater than 9

[Ryan Harper (raharper)]

Hi Reed,

Thanks for the fix! To contribute to curtin, you must sign the Canonical Contributor License Agreement (CLA) [1].

If you have already signed it as an individual, your Launchpad user will be listed in the contributor-agreement-canonical launchpad group [2]. Unfortunately there is no easy way to check if an organization or company you are doing work for has signed. If you are unsure or have questions, email <email address hidden> or ping powersj in #curtin channel via freenode.

For information on how to sign, please see the HACKING document [3]. This links to the cloud-init information but the process is the same for the curtin project.

Thanks again, and please feel free to reach out with any questions.

–
[1] http://www.canonical.com/contributors
[2] https://launchpad.net/~contributor-agreement-canonical/+members
[3] http://cloudinit.readthedocs.io/en/latest/topics/hacking.html

[Ryan Harper (raharper)]

review: Needs Fixing

[Reed Slaby (techreed)]

Hi Ryan,

Thanks for taking a look, and for your patience.

Looks like I made a bit of a mess out of this with the resubmit, sorry. I've implemented your suggestions in my branch, but they're showing up in the second proposal.

[Ryan Harper (raharper)]

No problem. You don't need to resubmit, only update the git branch and push to your launchpad remote.

Unmerged commits

3af744f... by Reed Slaby <email address hidden> on 2019-08-18

Restore detection of partition numbers greater than 9

6efeaf4... by Reed Slaby <email address hidden> on 2019-08-18

Accept NVMe partition naming format: nvmeXnXpX

3af210f... by Reed Slaby <email address hidden> on 2019-08-18

Add disks that use EUI-64 identifier to pass validation

diff --git a/curtin/block/schemas.py b/curtin/block/schemas.py
index fb7507d..b26cabc 100644
--- a/curtin/block/schemas.py
+++ b/curtin/block/schemas.py
@@ -135,6 +135,7 @@ DISK = {
             'type': 'string',
             'oneOf': [
                 {'pattern': r'^0x(\d|[a-zA-Z])+'},
+                {'pattern': r'^eud\.(\d|[a-zA-Z])+'},
                 {'pattern': r'^nvme\.(\d|[a-zA-Z]-)+'}],
         },
         'grub_device': {
diff --git a/curtin/storage_config.py b/curtin/storage_config.py
index 7278669..a50e7c5 100644
--- a/curtin/storage_config.py
+++ b/curtin/storage_config.py
@@ -683,7 +683,7 @@ class BlockdevParser(ProbertParser):
                 part = None
                 for pentry in ptable['partitions']:
                     node = pentry['node']
-                    if node.lstrip(parent_devname) == attrs['partition']:
+                    if node.lstrip(parent_devname).lstrip('p') == attrs['partition']:
                         part = pentry
                         break