MAAS

Merge lp:~jason-hobbs/maas/fix-memory-units into lp:~maas-committers/maas/trunk

  1. fix-memory-units
  2. Merge into trunk
Proposed by Jason Hobbs
Status: Merged
Approved by: Jason Hobbs
Approved revision: no longer in the source branch.
Merged at revision: 3401
Proposed branch: lp:~jason-hobbs/maas/fix-memory-units
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 107 lines (+9/-9)
7 files modified
src/maasserver/forms.py (+1/-1)
src/maasserver/models/node.py (+1/-1)
src/maasserver/node_constraint_filter_forms.py (+1/-1)
src/maasserver/templates/maasserver/node_view.html (+1/-1)
src/maasserver/templates/maasserver/nodes_listing.html (+2/-2)
src/maasserver/tests/test_node_constraint_filter_forms.py (+2/-2)
src/maasserver/views/tests/test_nodes.py (+1/-1)
To merge this branch: bzr merge lp:~jason-hobbs/maas/fix-memory-units
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+243873@code.launchpad.net

Commit message

Show correct units for memory (MiB, GiB).

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

I proposed this very change in Austin, but it got pooh poohed...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/forms.py'
2--- src/maasserver/forms.py 2014-12-03 14:21:53 +0000
3+++ src/maasserver/forms.py 2014-12-05 21:42:59 +0000
4@@ -633,7 +633,7 @@
5 cpu_count = forms.IntegerField(
6 required=False, initial=0, label="CPU Count")
7 memory = forms.IntegerField(
8- required=False, initial=0, label="Memory (MB)")
9+ required=False, initial=0, label="Memory (MiB)")
10 storage = forms.IntegerField(
11 required=False, initial=0, label="Disk space (MB)")
12
13
14=== modified file 'src/maasserver/models/node.py'
15--- src/maasserver/models/node.py 2014-12-04 14:36:34 +0000
16+++ src/maasserver/models/node.py 2014-12-05 21:42:59 +0000
17@@ -753,7 +753,7 @@
18 return NODE_STATUS_CHOICES_DICT[self.status]
19
20 def display_memory(self):
21- """Return memory in GB."""
22+ """Return memory in GiB."""
23 if self.memory < 1024:
24 return '%.1f' % (self.memory / 1024.0)
25 return '%d' % (self.memory / 1024)
26
27=== modified file 'src/maasserver/node_constraint_filter_forms.py'
28--- src/maasserver/node_constraint_filter_forms.py 2014-08-13 21:49:35 +0000
29+++ src/maasserver/node_constraint_filter_forms.py 2014-12-05 21:42:59 +0000
30@@ -188,7 +188,7 @@
31
32 mem = forms.FloatField(
33 label="Memory", required=False,
34- error_messages={'invalid': "Invalid memory: number of MB required."})
35+ error_messages={'invalid': "Invalid memory: number of MiB required."})
36
37 tags = UnconstrainedMultipleChoiceField(label="Tags", required=False)
38
39
40=== modified file 'src/maasserver/templates/maasserver/node_view.html'
41--- src/maasserver/templates/maasserver/node_view.html 2014-11-07 15:33:47 +0000
42+++ src/maasserver/templates/maasserver/node_view.html 2014-12-05 21:42:59 +0000
43@@ -168,7 +168,7 @@
44 <li class="block size3">
45 <h4>Memory</h4>
46 <span>
47- {{ node.memory }} MB
48+ {{ node.memory }} MiB
49 </span>
50 </li>
51 <li class="block size3 first">
52
53=== modified file 'src/maasserver/templates/maasserver/nodes_listing.html'
54--- src/maasserver/templates/maasserver/nodes_listing.html 2014-11-05 15:10:12 +0000
55+++ src/maasserver/templates/maasserver/nodes_listing.html 2014-12-05 21:42:59 +0000
56@@ -26,7 +26,7 @@
57 </th>
58 <th>
59 <a href="{{ sort_links.memory }}"
60- class="{{ sort_classes.memory }}">RAM (GB)</a>
61+ class="{{ sort_classes.memory }}">RAM (GiB)</a>
62 </th>
63 <th>
64 <a href="{{ sort_links.storage }}"
65@@ -50,7 +50,7 @@
66 <th>Status</th>
67 <th>Owner</th>
68 <th>Cores</th>
69- <th>RAM (GB)</th>
70+ <th>RAM (GiB)</th>
71 <th>Disk (GB)</th>
72 <th><acronym
73 title="Media Access Control addresses">MAC</acronym></th>
74
75=== modified file 'src/maasserver/tests/test_node_constraint_filter_forms.py'
76--- src/maasserver/tests/test_node_constraint_filter_forms.py 2014-11-25 13:06:05 +0000
77+++ src/maasserver/tests/test_node_constraint_filter_forms.py 2014-12-05 21:42:59 +0000
78@@ -244,7 +244,7 @@
79 def test_invalid_memory(self):
80 form = AcquireNodeForm(data={'mem': 'invalid'})
81 self.assertEquals(
82- (False, {'mem': ["Invalid memory: number of MB required."]}),
83+ (False, {'mem': ["Invalid memory: number of MiB required."]}),
84 (form.is_valid(), form.errors))
85
86 def test_networks_filters_by_name(self):
87@@ -639,7 +639,7 @@
88 self.assertEquals(
89 (False, {
90 'tags': ["No such tag(s): 'unknown'."],
91- 'mem': ["Invalid memory: number of MB required."],
92+ 'mem': ["Invalid memory: number of MiB required."],
93 }),
94 (form.is_valid(), form.errors))
95
96
97=== modified file 'src/maasserver/views/tests/test_nodes.py'
98--- src/maasserver/views/tests/test_nodes.py 2014-11-25 13:06:34 +0000
99+++ src/maasserver/views/tests/test_nodes.py 2014-12-05 21:42:59 +0000
100@@ -529,7 +529,7 @@
101 self.assertIn(node.hostname, content_text)
102 self.assertIn(node.display_status(), content_text)
103 self.assertIn(node.architecture, content_text)
104- self.assertIn('%d MB' % (node.memory,), content_text)
105+ self.assertIn('%d MiB' % (node.memory,), content_text)
106 self.assertIn('%d' % (node.cpu_count,), content_text)
107 self.assertIn(self.logged_in_user.username, content_text)
108