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

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 4580
Proposed branch: lp:~blake-rouse/maas/fix-1584211-1.9
Merge into: lp:maas/1.9
Diff against target: 57 lines (+14/-7)
2 files modified
src/metadataserver/models/commissioningscript.py (+5/-3)
src/metadataserver/models/tests/test_commissioningscript.py (+9/-4)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1584211-1.9
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+295722@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
Blake Rouse (blake-rouse) wrote :

Self-approving backport.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (4.8 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages
Get:1 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en [384 kB]
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en [7,227 B]
Get:3 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en [3,699 B]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [189 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Translation-...

Read more...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (4.7 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/r...

Read more...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.3 MiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse amd64 Packages
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1023.6 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [275 kB]
Get:3 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,352 B]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [156 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,939 B]
Get:6 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [768 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [360 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.2 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse amd64 Packages
Get:10 http://security.ubuntu.com trusty-security InRelease [65.9 kB]
Get:11 http://security.ubuntu.com trusty-security/main Sources [115 kB]
Get:12 http://security.ubuntu.com trusty-security/universe Sources [36.9 kB]
Get:13 http://security.ubuntu.com trusty-security/main amd64 Packages [481 kB]
Get:14 http://security.ubuntu.com trusty-security/universe amd64 Packages [129 kB]
Fetched 2,493 kB in 5s (466 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.4 MiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [65.9 kB]
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [115 kB]
Get:4 http://security.ubuntu.com trusty-security/universe Sources [36.9 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [275 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [480 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,352 B]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [156 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,939 B]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [768 kB]
Get:11 http://security.ubuntu.com trusty-security/universe amd64 Packages [129 kB]
Get:12 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:13 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [360 kB]
Get:14 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.2 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse amd64 Packages
Fetched 2,493 kB in 1s (1,608 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     ...

Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1024.0 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1584211-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://security.ubuntu.com trusty-security InRelease [65.9 kB]
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [65.9 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [115 kB]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [275 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [36.9 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [480 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,352 B]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [156 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,939 B]
Get:10 http://security.ubuntu.com trusty-security/universe amd64 Packages [129 kB]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [768 kB]
Get:12 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:13 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [360 kB]
Get:14 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.2 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty/multiverse amd64 Packages
Fetched 2,492 kB in 1s (1,757 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/metadataserver/models/commissioningscript.py'
2--- src/metadataserver/models/commissioningscript.py 2016-05-10 21:35:14 +0000
3+++ src/metadataserver/models/commissioningscript.py 2016-05-25 14:33:49 +0000
4@@ -457,10 +457,12 @@
5 return os.path.join(dev_disk_byid, link)
6 return None
7
8- # Grab the block devices from lsblk.
9+ # Grab the block devices from lsblk. Excludes RAM devices
10+ # (default for lsblk), floppy disks, and loopback devices.
11 blockdevs = []
12- block_list = check_output(
13- ("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA"))
14+ block_list = check_output((
15+ "lsblk", "--exclude", "1,2,7", "-d", "-P",
16+ "-o", "NAME,RO,RM,MODEL,ROTA"))
17 for blockdev in block_list.splitlines():
18 tokens = shlex.split(blockdev)
19 current_block = {}
20
21=== modified file 'src/metadataserver/models/tests/test_commissioningscript.py'
22--- src/metadataserver/models/tests/test_commissioningscript.py 2016-05-10 21:35:14 +0000
23+++ src/metadataserver/models/tests/test_commissioningscript.py 2016-05-25 14:33:49 +0000
24@@ -684,8 +684,9 @@
25 check_output = self.patch(subprocess, "check_output")
26 check_output.return_value = ""
27 self.call_gather_physical_block_devices()
28- self.assertThat(check_output, MockCalledOnceWith(
29- ("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")))
30+ self.assertThat(check_output, MockCalledOnceWith((
31+ "lsblk", "--exclude", "1,2,7", "-d", "-P",
32+ "-o", "NAME,RO,RM,MODEL,ROTA")))
33
34 def test__returns_empty_list_when_no_disks(self):
35 check_output = self.patch(subprocess, "check_output")
36@@ -703,7 +704,9 @@
37 ]
38 self.call_gather_physical_block_devices()
39 self.assertThat(check_output, MockCallsMatch(
40- call(("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")),
41+ call((
42+ "lsblk", "--exclude", "1,2,7", "-d", "-P",
43+ "-o", "NAME,RO,RM,MODEL,ROTA")),
44 call(("udevadm", "info", "-q", "all", "-n", name))))
45
46 def test__returns_empty_list_when_cdrom_only(self):
47@@ -733,7 +736,9 @@
48 ]
49 self.call_gather_physical_block_devices()
50 self.assertThat(check_output, MockCallsMatch(
51- call(("lsblk", "-d", "-P", "-o", "NAME,RO,RM,MODEL,ROTA")),
52+ call((
53+ "lsblk", "--exclude", "1,2,7", "-d", "-P",
54+ "-o", "NAME,RO,RM,MODEL,ROTA")),
55 call(("udevadm", "info", "-q", "all", "-n", name)),
56 call(("blockdev", "--getsize64", "/dev/%s" % name)),
57 call(("blockdev", "--getbsz", "/dev/%s" % name))))

Subscribers

People subscribed via source and target branches