- added class variables: event_type, object_type, object_ids (used by event logger)

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

diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py
index 5179464..a61fad6 100644 (file)
--- a/PLC/Methods/AddNode.py
+++ b/PLC/Methods/AddNode.py
@@ -6,12 +6,15 @@ from PLC.NodeGroups import NodeGroup, NodeGroups
 from PLC.Sites import Site, Sites
 from PLC.Auth import PasswordAuth
 
+can_update = lambda (field, value): field in \
+             ['boot_state', 'model', 'version']
+
 class AddNode(Method):
     """
-    Adds a new node. Any values specified in optional_vals are used,
+    Adds a new node. Any values specified in node_fields are used,
     otherwise defaults are used.
 
-    PIs and techs may only add nodes to their own sites. ins may
+    PIs and techs may only add nodes to their own sites. Admins may
     add nodes to any site.
 
     Returns the new node_id (> 0) if successful, faults otherwise.
@@ -19,8 +22,6 @@ class AddNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    can_update = lambda (field, value): field in \
-                 ['model', 'version']
     update_fields = dict(filter(can_update, Node.fields.items()))
 
     accepts = [
@@ -28,16 +29,18 @@ class AddNode(Method):
         Mixed(Site.fields['site_id'],
               Site.fields['login_base']),
         Node.fields['hostname'],
-        Node.fields['boot_state'],
         update_fields
         ]
 
     returns = Parameter(int, 'New node_id (> 0) if successful')
 
-    def call(self, auth, site_id_or_login_base, hostname, boot_state, optional_vals = {}):
-        if filter(lambda field: field not in self.update_fields, optional_vals):
-            raise PLCInvalidArgument, "Invalid fields specified"
+    event_type = 'Add'
+    object_type = 'Node'
+    object_ids = []
 
+    def call(self, auth, site_id_or_login_base, hostname, node_fields = {}):
+        node_fields = dict(filter(can_update, node_fields.items()))
+        
         # Get site information
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
@@ -57,10 +60,10 @@ class AddNode(Method):
             else:
                 assert self.caller['person_id'] in site['person_ids']
 
-        node = Node(self.api, optional_vals)
+        node = Node(self.api, node_fields)
         node['hostname'] = hostname
-        node['boot_state'] = boot_state
         node['site_id'] = site['site_id']
         node.sync()
+       self.object_ids = [node['node_id']]     
 
         return node['node_id']