MAAS

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

  1. lp1673724_improved
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 5841
Proposed branch: lp:~andreserl/maas/lp1673724_improved
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 43 lines (+4/-4)
2 files modified
src/provisioningserver/refresh/node_info_scripts.py (+1/-1)
src/provisioningserver/refresh/tests/test_node_info_scripts.py (+3/-3)
To merge this branch: bzr merge lp:~andreserl/maas/lp1673724_improved
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+320688@code.launchpad.net

Commit message

Filter lsblk by maj,min, which is the major,minor device number. This should ensure the first disk is always listed first (i.e. 'sda')

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- src/provisioningserver/refresh/node_info_scripts.py 2017-03-17 10:54:40 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py 2017-03-22 17:25:57 +0000
@@ -313,7 +313,7 @@
313 blockdevs = []313 blockdevs = []
314 block_list = check_output((314 block_list = check_output((
315 "lsblk", "--exclude", "1,2,7", "-d", "-P",315 "lsblk", "--exclude", "1,2,7", "-d", "-P",
316 "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME"))316 "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN"))
317 block_list = block_list.decode("utf-8")317 block_list = block_list.decode("utf-8")
318 for blockdev in block_list.splitlines():318 for blockdev in block_list.splitlines():
319 tokens = shlex.split(blockdev)319 tokens = shlex.split(blockdev)
320320
=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- src/provisioningserver/refresh/tests/test_node_info_scripts.py 2017-03-22 14:19:07 +0000
+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py 2017-03-22 17:25:57 +0000
@@ -399,7 +399,7 @@
399 self.call_gather_physical_block_devices()399 self.call_gather_physical_block_devices()
400 self.assertThat(check_output, MockCalledOnceWith((400 self.assertThat(check_output, MockCalledOnceWith((
401 "lsblk", "--exclude", "1,2,7", "-d", "-P",401 "lsblk", "--exclude", "1,2,7", "-d", "-P",
402 "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")))402 "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")))
403403
404 def test__returns_empty_list_when_no_disks(self):404 def test__returns_empty_list_when_no_disks(self):
405 check_output = self.patch(subprocess, "check_output")405 check_output = self.patch(subprocess, "check_output")
@@ -419,7 +419,7 @@
419 self.assertThat(check_output, MockCallsMatch(419 self.assertThat(check_output, MockCallsMatch(
420 call((420 call((
421 "lsblk", "--exclude", "1,2,7", "-d", "-P",421 "lsblk", "--exclude", "1,2,7", "-d", "-P",
422 "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")),422 "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")),
423 call(("udevadm", "info", "-q", "all", "-n", name))))423 call(("udevadm", "info", "-q", "all", "-n", name))))
424424
425 def test__returns_empty_list_when_cdrom_only(self):425 def test__returns_empty_list_when_cdrom_only(self):
@@ -451,7 +451,7 @@
451 self.assertThat(check_output, MockCallsMatch(451 self.assertThat(check_output, MockCallsMatch(
452 call((452 call((
453 "lsblk", "--exclude", "1,2,7", "-d", "-P",453 "lsblk", "--exclude", "1,2,7", "-d", "-P",
454 "-o", "NAME,RO,RM,MODEL,ROTA", "-x", "NAME")),454 "-o", "NAME,RO,RM,MODEL,ROTA,MAJ:MIN", "-x", "MAJ:MIN")),
455 call(("udevadm", "info", "-q", "all", "-n", name)),455 call(("udevadm", "info", "-q", "all", "-n", name)),
456 call(("sudo", "-n", "blockdev", "--getsize64", "/dev/%s" % name)),456 call(("sudo", "-n", "blockdev", "--getsize64", "/dev/%s" % name)),
457 call(("sudo", "-n", "blockdev", "--getbsz", "/dev/%s" % name))))457 call(("sudo", "-n", "blockdev", "--getbsz", "/dev/%s" % name))))