merge from head - 1.21

[plcapi.git] / PLC / Methods / BootUpdateNode.py

diff --git a/PLC/Methods/BootUpdateNode.py b/PLC/Methods/BootUpdateNode.py
index e612bdf..5c1762a 100644 (file)
--- a/PLC/Methods/BootUpdateNode.py
+++ b/PLC/Methods/BootUpdateNode.py
@@ -17,6 +17,8 @@ class BootUpdateNode(Method):
     Returns 1 if updated successfully.
     """
 
+    roles = ['node']
+
     nodenetwork_fields = dict(filter(can_update, NodeNetwork.fields.items()))
 
     accepts = [
@@ -25,8 +27,11 @@ class BootUpdateNode(Method):
          'primary_network': nodenetwork_fields,
          'ssh_host_key': Node.fields['ssh_rsa_key']}
         ]
+
     returns = Parameter(int, '1 if successful')
 
+    object_type = 'Node'
+
     def call(self, auth, node_fields):
         # Update node state
         if node_fields.has_key('boot_state'):
@@ -43,7 +48,7 @@ class BootUpdateNode(Method):
             if primary_network['nodenetwork_id'] not in self.caller['nodenetwork_ids']:
                 raise PLCInvalidArgument, "Node network not associated with calling node"
 
-            nodenetworks = NodeNetworks(self.api, [primary_network['nodenetwork_id']]).values()
+            nodenetworks = NodeNetworks(self.api, [primary_network['nodenetwork_id']])
             if not nodenetworks:
                 raise PLCInvalidArgument, "No such node network"
             nodenetwork = nodenetworks[0]
@@ -56,5 +61,6 @@ class BootUpdateNode(Method):
             nodenetwork.sync(commit = False)
 
         self.caller.sync(commit = True)
+       self.message = "Node updated: %s" % ", ".join(node_fields.keys())
 
         return 1