MAAS

Merge lp:~newell-jensen/maas/fix-1668731 into lp:~maas-committers/maas/trunk

  1. fix-1668731
  2. Merge into trunk
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: no longer in the source branch.
Merged at revision: 5768
Proposed branch: lp:~newell-jensen/maas/fix-1668731
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 24 lines (+2/-1)
2 files modified
src/provisioningserver/drivers/pod/rsd.py (+1/-1)
src/provisioningserver/drivers/pod/tests/test_rsd.py (+1/-0)
To merge this branch: bzr merge lp:~newell-jensen/maas/fix-1668731
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+318683@code.launchpad.net

Commit message

Intialize DiscoveredPod with local_disks set to zero.

Default is -1, and this was causing an issue with local_disks calculation for the Pod.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Unit test? Seems like they should have caught this issue. Or you should have at least adjusted a test.

review: Needs Fixing
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/drivers/pod/rsd.py'
2--- src/provisioningserver/drivers/pod/rsd.py 2017-02-28 18:24:04 +0000
3+++ src/provisioningserver/drivers/pod/rsd.py 2017-03-01 22:06:51 +0000
4@@ -377,7 +377,7 @@
5 """Get the POD resources."""
6 discovered_pod = DiscoveredPod(
7 architectures=[], cores=0, cpu_speed=0, memory=0,
8- local_storage=0, capabilities=[
9+ local_storage=0, local_disks=0, capabilities=[
10 Capabilities.COMPOSABLE, Capabilities.FIXED_LOCAL_STORAGE],
11 hints=DiscoveredPodHints(cores=0, cpu_speed=0, memory=0,
12 local_storage=0, local_disks=0))
13
14=== modified file 'src/provisioningserver/drivers/pod/tests/test_rsd.py'
15--- src/provisioningserver/drivers/pod/tests/test_rsd.py 2017-02-28 20:23:05 +0000
16+++ src/provisioningserver/drivers/pod/tests/test_rsd.py 2017-03-01 22:06:51 +0000
17@@ -991,6 +991,7 @@
18 self.assertEquals(2300, pod.cpu_speed)
19 self.assertEquals(7812 * 2, pod.memory)
20 self.assertEquals(119999999999.99997 * 2, pod.local_storage)
21+ self.assertEquals(2, pod.local_disks)
22 self.assertEquals(
23 [Capabilities.COMPOSABLE, Capabilities.FIXED_LOCAL_STORAGE],
24 pod.capabilities)