← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/maas-nodekey-bug into lp:maas

 

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-nodekey-bug/+merge/96528

This branch removes the tokens and the consumers (they are autogenerated when Nodes/Users are created) in the sampledata.  They had ids 1 & 2 and thus caused a conflict with then auto-generated tokens.
-- 
https://code.launchpad.net/~rvb/maas/maas-nodekey-bug/+merge/96528
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-nodekey-bug into lp:maas.
=== modified file 'src/maasserver/fixtures/dev_fixture.yaml'
--- src/maasserver/fixtures/dev_fixture.yaml	2012-02-24 17:37:01 +0000
+++ src/maasserver/fixtures/dev_fixture.yaml	2012-03-08 08:54:18 +0000
@@ -132,21 +132,3 @@
     username: test
   model: auth.user
   pk: 106
-- fields: {description: '', key: RfGASHsLT6XwuRunC6, name: MaaS consumer, secret: '', status: accepted,
-    user: 101}
-  model: piston.consumer
-  pk: 1
-- fields: {description: '', key: JcaW54bSSN66wj5M3d, name: MaaS consumer, secret: '', status: accepted,
-    user: 105}
-  model: piston.consumer
-  pk: 2
-- fields: {callback: null, callback_confirmed: false, consumer: 1, is_approved: true,
-    key: EswkkXrcungmh4wjgN, secret: Z7xkk6LBjfsEDnXpL93ksTRWn9jMBXDg, timestamp: 1328622205,
-    token_type: 2, user: 101, verifier: ''}
-  model: piston.token
-  pk: 1
-- fields: {callback: null, callback_confirmed: false, consumer: 1, is_approved: true,
-    key: e6jDkAJzAP7SZnpkQq, secret: mkWmXM62Xv6p73sF8uZNdu6kpLcdktpp, timestamp: 1328622494,
-    token_type: 2, user: 105, verifier: ''}
-  model: piston.token
-  pk: 2