- added logging variable 'object_type'

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

diff --git a/PLC/Methods/AdmAddNode.py b/PLC/Methods/AdmAddNode.py
index 8026a8f..5ef210c 100644 (file)
--- a/PLC/Methods/AdmAddNode.py
+++ b/PLC/Methods/AdmAddNode.py
@@ -3,9 +3,12 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.Sites import Site, Sites
 from PLC.Parameter import Parameter, Mixed
 from PLC.Nodes import Node, Nodes
 from PLC.Sites import Site, Sites

-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth

 from PLC.Methods.AddNode import AddNode
 
 from PLC.Methods.AddNode import AddNode
 

+can_update = lambda (field, value): field in \
+             ['model', 'version']
+

 class AdmAddNode(AddNode):
     """
     Deprecated. See AddNode.
 class AdmAddNode(AddNode):
     """
     Deprecated. See AddNode.


@@ -13,15 +16,20 @@ class AdmAddNode(AddNode):
 
     status = "deprecated"
 
 
     status = "deprecated"
 

+    object_type = 'Node'
+
+    node_fields = dict(filter(can_update, Node.fields.items()))
+

     accepts = [
     accepts = [

-        PasswordAuth(),
-        Mixed(Site.fields['site_id'],
-              Site.fields['login_base']),
+        Auth(),
+        Site.fields['site_id'],

         Node.fields['hostname'],
         Node.fields['boot_state'],
         Node.fields['hostname'],
         Node.fields['boot_state'],

-        AddNode.update_fields
+        node_fields

         ]
 
         ]
 

-    def call(self, auth, site_id_or_login_base, hostname, boot_state, node_fields = {}):
+    def call(self, auth, site_id, hostname, boot_state, node_fields = {}):
+        node_fields['site_id'] = site_id
+        node_fields['hostname'] = hostname

         node_fields['boot_state'] = boot_state
         node_fields['boot_state'] = boot_state

-        return AddNode.call(self, auth, site_id_or_login_base, hostname, node_fields)
+        return AddNode.call(self, auth, node_fields)