launchpad-reviewers team mailing list archive

[Nick Veitch <nick.veitch@xxxxxxxxxxxxx>]

Nick Veitch has proposed merging lp:~evilnick/maas/1.2-backport-cli-help into lp:maas/1.2.

Commit message:
backport of additional maas-cli help 

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1070522 in MAAS: "maas-cli nodes new incomplete documentation"
  https://bugs.launchpad.net/maas/+bug/1070522

For more details, see:
https://code.launchpad.net/~evilnick/maas/1.2-backport-cli-help/+merge/133238

added help to maas-cli nodes new command
-- 
https://code.launchpad.net/~evilnick/maas/1.2-backport-cli-help/+merge/133238
Your team MAAS Maintainers is requested to review the proposed merge of lp:~evilnick/maas/1.2-backport-cli-help into lp:maas/1.2.

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-11-02 09:48:02 +0000
+++ src/maasserver/api.py	2012-11-07 13:23:22 +0000
@@ -742,6 +742,16 @@
 
         When a node has been added to MAAS by an admin MAAS user, it is
         ready for allocation to services running on the MAAS.
+        The minimum data required is:
+        architecture=<arch string> (e.g "i386/generic")
+        mac_address=<value>
+
+	:param architecture: A string containing the architecture type of 
+            the node.
+        :param mac_address: The MAC address of the node.
+        :param hostname: A hostname. If not given, one will be generated.
+        :param powertype: A power management type, if applicable (e.g.
+            "virsh", "ipmi").
         """
         node = create_node(request)
         if request.user.is_superuser: