← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/prep-nodekey into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/prep-nodekey into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/prep-nodekey/+merge/111272

As per the migration plan.  Not particularly exciting, since I already took care of the main points — Meta class and ForeignKey references.

Just two things stick out slightly:

1. A comment with a migration announcement is strangely placed.  This is needed because “make lint” and “./utilities/format-new-and-modified-imports” disagree on the appropriate number of blank lines between the module's imports section and a leading comment.  No big deal: the comment will go away soon enough anyway.

2. We had neglected to add NodeCommissionResult to the __all__.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/prep-nodekey/+merge/111272
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/prep-nodekey into lp:maas.
=== modified file 'src/metadataserver/models/__init__.py'
--- src/metadataserver/models/__init__.py	2012-06-15 05:36:23 +0000
+++ src/metadataserver/models/__init__.py	2012-06-20 18:03:21 +0000
@@ -15,6 +15,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'NodeCommissionResult',
     'NodeKey',
     'NodeUserData',
     ]
@@ -42,6 +43,7 @@
 
 
 class NodeKeyManager(Manager):
+# Scheduled for model migration on 2012-07-02
     """Utility for the collection of NodeKeys.
 
     Each Node that needs to access the metadata service will have its own
@@ -117,6 +119,7 @@
         return self.get(key=key).node
 
 
+# Scheduled for model migration on 2012-07-02
 class NodeKey(CleanSave, Model):
     """Associate a Node with its OAuth (token) key.