launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/fixture-error into lp:maas.

Commit message:
Fix the dev fixture so that nodes have a null value for nodegroup.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/fixture-error/+merge/130120

This branch fixes the dev fixture: we can no longer rely on the fact that the master nodegroup exists when the dev fixture is loaded (we removed the call to the [now gone] command config_dhcp_master recently because right now, all the DHCP config is done via the API/CLI/UI).  This change sets the nodegroup of the nodes to null so that when the application is started, the call to start_up will in turn call ensure_master which will: create a master nodegroup and attache the existing nodes to that nodegroup (that behavior is part of the upgrade story).
-- 
https://code.launchpad.net/~rvb/maas/fixture-error/+merge/130120
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/fixture-error into lp:maas.

=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2012-10-08 10:40:20 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2012-10-17 13:54:38 +0000
@@ -1,6 +1,6 @@
 - fields: {
     created: 2012-01-24, hostname: sun, architecture: 'i386/generic',
-    owner: null, status: 0, nodegroup: 1, tags: [30],
+    owner: null, status: 0, nodegroup: null, tags: [30],
     cpu_count: 16, memory: 16384,
     system_id: node-2666dd64-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:38.735954'}
@@ -8,7 +8,7 @@
   pk: 15
 - fields: {
     created: 2012-01-24, hostname: moon, architecture: 'i386/generic',
-    owner: null, status: 2, nodegroup: 1, tags: [],
+    owner: null, status: 2, nodegroup: null, tags: [],
     cpu_count: 1, memory: 512,
     system_id: node-29d7ad70-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:44.507777'}
@@ -16,7 +16,7 @@
   pk: 16
 - fields: {
     created: 2012-01-24, hostname: mars, architecture: 'i386/generic',
-    owner: 106, status: 3, nodegroup: 1, tags: [31],
+    owner: 106, status: 3, nodegroup: null, tags: [31],
     cpu_count: 2, memory: 2096,
     system_id: node-2d424b28-4671-11e1-93b8-00225f89f211,
     updated: !!timestamp '2012-01-24 10:52:50.239704'}
@@ -24,7 +24,7 @@
   pk: 17
 - fields: {
     created: 2012-01-24, hostname: jupiter, architecture: 'i386/generic',
-    owner: null, status: 0, nodegroup: 1, tags: [30, 31],
+    owner: null, status: 0, nodegroup: null, 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'}
@@ -32,7 +32,7 @@
   pk: 18
 - fields: {
     created: 2012-01-24, hostname: saturn, architecture: 'i386/generic',
-    owner: 101, status: 3, nodegroup: 1, tags: [30, 31, 32],
+    owner: 101, status: 3, nodegroup: null, 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'}