← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~gz/maas/sample_cpu_count_memory into lp:maas

 

Martin Packman has proposed merging lp:~gz/maas/sample_cpu_count_memory into lp:maas.

Commit message:
Add cpu_count and memory values to nodes in sample data

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~gz/maas/sample_cpu_count_memory/+merge/128298
-- 
https://code.launchpad.net/~gz/maas/sample_cpu_count_memory/+merge/128298
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gz/maas/sample_cpu_count_memory into lp:maas.
=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2012-10-04 06:20:48 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2012-10-05 17:37:22 +0000
@@ -1,6 +1,7 @@
 - fields: {
     created: 2012-01-24, hostname: sun, architecture: i386,
     owner: null, status: 0, nodegroup: 1, tags: [30],
+    cpu_count: 16, memory: 16384,
     system_id: node-2666dd64-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:38.735954'}
   model: maasserver.node
@@ -8,6 +9,7 @@
 - fields: {
     created: 2012-01-24, hostname: moon, architecture: i386,
     owner: null, status: 2, nodegroup: 1, tags: [],
+    cpu_count: 1, memory: 512,
     system_id: node-29d7ad70-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:44.507777'}
   model: maasserver.node
@@ -15,6 +17,7 @@
 - fields: {
     created: 2012-01-24, hostname: mars, architecture: i386,
     owner: 106, status: 3, nodegroup: 1, tags: [31],
+    cpu_count: 2, memory: 2096,
     system_id: node-2d424b28-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:50.239704'}
   model: maasserver.node
@@ -22,6 +25,7 @@
 - fields: {
     created: 2012-01-24, hostname: jupiter, architecture: i386,
     owner: null, status: 0, nodegroup: 1, tags: [30, 31],
+    cpu_count: 4, memory: 8192,
     system_id: node-2fb4fec8-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:54.346832'}
   model: maasserver.node
@@ -29,6 +33,7 @@
 - fields: {
     created: 2012-01-24, hostname: saturn, architecture: i386,
     owner: 101, status: 3, nodegroup: 1, tags: [30, 31, 32],
+    cpu_count: 4, memory: 4096,
     system_id: node-33b55e28-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:53:01.060176'}
   model: maasserver.node