Merge lp:~blake-rouse/maas/fix-1401349-1.7 into lp:maas/1.7

[Blake Rouse]

Fix node_view to use display_memory and adjust units to GiB.

[Blake Rouse (blake-rouse)]

Self-approving backport.

review: Approve

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2014-12-10 16:29:13 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2014-12-11 14:59:00 +0000
@@ -139,7 +139,7 @@
     <li class="block size3">
       <h4>Memory</h4>
       <span>
-          <span data-field="memory">{{ node.memory }}</span> MB
+          <span data-field="memory">{{ node.display_memory }}</span> GiB
       </span>
     </li>
     <li class="block size3 first">

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-12-10 18:04:44 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-12-11 14:59:00 +0000
@@ -567,7 +567,7 @@
         self.assertIn(node.hostname, content_text)
         self.assertIn(node.display_status(), content_text)
         self.assertIn(node.architecture, content_text)
-        self.assertIn('%d MB' % (node.memory,), content_text)
+        self.assertIn('%s GiB' % (node.display_memory(),), content_text)
         self.assertIn('%d' % (node.cpu_count,), content_text)
         self.assertIn(self.logged_in_user.username, content_text)