svn keywords

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

diff --git a/PLC/Methods/AddPCU.py b/PLC/Methods/AddPCU.py
index d311e37..9def186 100644 (file)
--- a/PLC/Methods/AddPCU.py
+++ b/PLC/Methods/AddPCU.py
@@ -1,12 +1,14 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.PCUs import PCU, PCUs
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.Sites import Site, Sites
 
 can_update = lambda (field, value): field in \
-             ['hostname', 'protocol',
+             ['ip', 'hostname', 'protocol',
               'username', 'password',
               'model', 'notes']
 
@@ -23,27 +25,23 @@ class AddPCU(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    update_fields = dict(filter(can_update, PCU.fields.items()))
+    pcu_fields = dict(filter(can_update, PCU.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Site.fields['site_id'],
               Site.fields['login_base']),
-        PCU.fields['ip'],
-        update_fields
+        pcu_fields
         ]
 
     returns = Parameter(int, 'New pcu_id (> 0) if successful')
     
-    event_type = 'Add'
-    object_type = 'PCU'
-    object_ids = []
 
-    def call(self, auth, site_id_or_login_base, ip, pcu_fields = {}):
+    def call(self, auth, site_id_or_login_base, pcu_fields):
         pcu_fields = dict(filter(can_update, pcu_fields.items()))
 
         # Get associated site details
-        sites = Sites(self.api, [site_id_or_login_base]).values()
+        sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
         site = sites[0]
@@ -54,8 +52,12 @@ class AddPCU(Method):
 
         pcu = PCU(self.api, pcu_fields)
         pcu['site_id'] = site['site_id']
-        pcu['ip'] = ip
         pcu.sync()
-       self.object_ids = [pcu['pcu_id']]       
+
+       # Logging variables
+       self.event_objects = {'Site': [site['site_id']],
+                             'PCU': [pcu['pcu_id']]}
+       self.message = 'PCU %d added site %s' % \
+               (pcu['pcu_id'], site['site_id'])
 
         return pcu['pcu_id']