← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jameinel/maas/sampledata-nodegroup into lp:maas

 

John A Meinel has proposed merging lp:~jameinel/maas/sampledata-nodegroup into lp:maas.

Commit message:
Fix 'make sampledata'. Nodegroups are now naturally keyed on UUID, but that isn't as convenient in the sample data vs just using the id primary key.
(1 vs 'adfd3977-f251-4f2c-8d61-745dbd690bfc')

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jameinel/maas/sampledata-nodegroup/+merge/127936

'make sample
-- 
https://code.launchpad.net/~jameinel/maas/sampledata-nodegroup/+merge/127936
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jameinel/maas/sampledata-nodegroup into lp:maas.
=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2012-10-02 17:25:03 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2012-10-04 06:23:38 +0000
@@ -1,34 +1,34 @@
 - fields: {
     created: 2012-01-24, hostname: sun, architecture: i386,
-    owner: null, status: 0, nodegroup: [master], tags: [30],
+    owner: null, status: 0, nodegroup: 1, tags: [30],
     system_id: node-2666dd64-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:38.735954'}
   model: maasserver.node
   pk: 15
 - fields: {
     created: 2012-01-24, hostname: moon, architecture: i386,
-    owner: null, status: 2, nodegroup: [master], tags: [],
+    owner: null, status: 2, nodegroup: 1, tags: [],
     system_id: node-29d7ad70-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:44.507777'}
   model: maasserver.node
   pk: 16
 - fields: {
     created: 2012-01-24, hostname: mars, architecture: i386,
-    owner: 106, status: 3, nodegroup: [master], tags: [31],
+    owner: 106, status: 3, nodegroup: 1, tags: [31],
     system_id: node-2d424b28-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:50.239704'}
   model: maasserver.node
   pk: 17
 - fields: {
     created: 2012-01-24, hostname: jupiter, architecture: i386,
-    owner: null, status: 0, nodegroup: [master], tags: [30, 31],
+    owner: null, status: 0, nodegroup: 1, tags: [30, 31],
     system_id: node-2fb4fec8-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:54.346832'}
   model: maasserver.node
   pk: 18
 - fields: {
     created: 2012-01-24, hostname: saturn, architecture: i386,
-    owner: 101, status: 3, nodegroup: [master], tags: [30, 31, 32],
+    owner: 101, status: 3, nodegroup: 1, tags: [30, 31, 32],
     system_id: node-33b55e28-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:53:01.060176'}
   model: maasserver.node