MAAS

Merge lp:~blake-rouse/maas/fix-1584211 into lp:~maas-committers/maas/trunk

  1. fix-1584211
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 5041
Proposed branch: lp:~blake-rouse/maas/fix-1584211
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 57 lines (+14/-7)
2 files modified
src/provisioningserver/refresh/node_info_scripts.py (+5/-3)
src/provisioningserver/refresh/tests/test_node_info_scripts.py (+9/-4)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1584211
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+295484@code.launchpad.net

Commit message

Exclude RAM, floppy, and loopback devices from lsblk during commissioning.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
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 2016-05-12 19:07:37 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py 2016-05-23 14:16:04 +0000
@@ -228,10 +228,12 @@
228 return os.path.join(dev_disk_byid, link)228 return os.path.join(dev_disk_byid, link)
229 return None229 return None
230230
231 # Grab the block devices from lsblk.231 # Grab the block devices from lsblk. Excludes RAM devices
232 # (default for lsblk), floppy disks, and loopback devices.
232 blockdevs = []233 blockdevs = []
233 block_list = check_output(234 block_list = check_output((
234 ("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA"))235 "lsblk", "--exclude", "1,2,7", "-d", "-P",
236 "-o", "NAME,RO,RM,MODEL,ROTA"))
235 block_list = block_list.decode("utf-8")237 block_list = block_list.decode("utf-8")
236 for blockdev in block_list.splitlines():238 for blockdev in block_list.splitlines():
237 tokens = shlex.split(blockdev)239 tokens = shlex.split(blockdev)
238240
=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- src/provisioningserver/refresh/tests/test_node_info_scripts.py 2016-05-12 19:07:37 +0000
+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py 2016-05-23 14:16:04 +0000
@@ -287,8 +287,9 @@
287 check_output = self.patch(subprocess, "check_output")287 check_output = self.patch(subprocess, "check_output")
288 check_output.return_value = b""288 check_output.return_value = b""
289 self.call_gather_physical_block_devices()289 self.call_gather_physical_block_devices()
290 self.assertThat(check_output, MockCalledOnceWith(290 self.assertThat(check_output, MockCalledOnceWith((
291 ("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")))291 "lsblk", "--exclude", "1,2,7", "-d", "-P",
292 "-o", "NAME,RO,RM,MODEL,ROTA")))
292293
293 def test__returns_empty_list_when_no_disks(self):294 def test__returns_empty_list_when_no_disks(self):
294 check_output = self.patch(subprocess, "check_output")295 check_output = self.patch(subprocess, "check_output")
@@ -306,7 +307,9 @@
306 ]307 ]
307 self.call_gather_physical_block_devices()308 self.call_gather_physical_block_devices()
308 self.assertThat(check_output, MockCallsMatch(309 self.assertThat(check_output, MockCallsMatch(
309 call(("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")),310 call((
311 "lsblk", "--exclude", "1,2,7", "-d", "-P",
312 "-o", "NAME,RO,RM,MODEL,ROTA")),
310 call(("udevadm", "info", "-q", "all", "-n", name))))313 call(("udevadm", "info", "-q", "all", "-n", name))))
311314
312 def test__returns_empty_list_when_cdrom_only(self):315 def test__returns_empty_list_when_cdrom_only(self):
@@ -336,7 +339,9 @@
336 ]339 ]
337 self.call_gather_physical_block_devices()340 self.call_gather_physical_block_devices()
338 self.assertThat(check_output, MockCallsMatch(341 self.assertThat(check_output, MockCallsMatch(
339 call(("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")),342 call((
343 "lsblk", "--exclude", "1,2,7", "-d", "-P",
344 "-o", "NAME,RO,RM,MODEL,ROTA")),
340 call(("udevadm", "info", "-q", "all", "-n", name)),345 call(("udevadm", "info", "-q", "all", "-n", name)),
341 call(("sudo", "blockdev", "--getsize64", "/dev/%s" % name)),346 call(("sudo", "blockdev", "--getsize64", "/dev/%s" % name)),
342 call(("sudo", "blockdev", "--getbsz", "/dev/%s" % name))))347 call(("sudo", "blockdev", "--getbsz", "/dev/%s" % name))))