launchpad-reviewers team mailing list archive

[John A Meinel <john@xxxxxxxxxxxxxxxxx>]

John A Meinel has proposed merging lp:~jameinel/maas/node-arch-cpu-mem into lp:maas.

Commit message:
Display Architecture, CPU count, and Memory on the Node view page.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jameinel/maas/node-arch-cpu-mem/+merge/127154
-- 
https://code.launchpad.net/~jameinel/maas/node-arch-cpu-mem/+merge/127154
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jameinel/maas/node-arch-cpu-mem into lp:maas.

=== modified file 'src/maasserver/templates/maasserver/node_view.html'
--- src/maasserver/templates/maasserver/node_view.html	2012-06-28 12:05:09 +0000
+++ src/maasserver/templates/maasserver/node_view.html	2012-09-30 13:19:34 +0000
@@ -56,6 +56,24 @@
           {{ node.display_status }}
       </span>
     </li>
+    <li class="block first size3">
+      <h4>Architecture</h4>
+      <span>
+          {{ node.architecture }}
+      </span>
+    </li>
+    <li class="block size3">
+      <h4>CPU Count</h4>
+      <span>
+          {{ node.cpu_count }}
+      </span>
+    </li>
+    <li class="block size3">
+      <h4>Memory</h4>
+      <span>
+          {{ node.memory }} MB
+      </span>
+    </li>
     {% if error_text %}
     <li class="block first">
       <h4>Error output</h4>

=== modified file 'src/maasserver/tests/test_views_nodes.py'
--- src/maasserver/tests/test_views_nodes.py	2012-09-27 02:37:18 +0000
+++ src/maasserver/tests/test_views_nodes.py	2012-09-30 13:19:34 +0000
@@ -105,6 +105,8 @@
         content_text = doc.cssselect('#content')[0].text_content()
         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(self.logged_in_user.username, content_text)
 
     def test_view_node_displays_node_info_no_owner(self):