Merge lp:~andreserl/maas/lp1665143 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

[lp:~andreserl/maas/lp1665143]

5758. By Andres Rodriguez on 2017-02-27

Make updates

Unmerged revisions

5758. By Andres Rodriguez on 2017-02-27

Make updates

5757. By Andres Rodriguez on 2017-02-27

Make updates

5756. By Andres Rodriguez on 2017-02-22

Work around issue when discovering nvme

=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- src/provisioningserver/refresh/node_info_scripts.py	2017-02-27 14:19:44 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py	2017-02-27 21:08:38 +0000
@@ -359,11 +359,17 @@
 
     def _path_to_idpath(path):
         """Searches dev_disk_byid for a device symlinked to /dev/[path]"""
+        shortest = None
         if os.path.exists(dev_disk_byid):
             for link in os.listdir(dev_disk_byid):
                 if os.path.exists(path) and os.path.samefile(
                         os.path.join(dev_disk_byid, link), path):
-                    return os.path.join(dev_disk_byid, link)
+                    if shortest is None:
+                        shortest = link
+                    elif len(link) < len(shortest):
+                        shortest = link
+            if shortest:
+                return os.path.join(dev_disk_byid, shortest)
         return None
 
     # Grab the block devices from lsblk. Excludes RAM devices