svn keywords

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

diff --git a/PLC/Methods/AddSiteAddress.py b/PLC/Methods/AddSiteAddress.py
index 4524996..7a93821 100644 (file)
--- a/PLC/Methods/AddSiteAddress.py
+++ b/PLC/Methods/AddSiteAddress.py
@@ -1,8 +1,10 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Addresses import Address, Addresses
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.Sites import Site, Sites
 
 can_update = lambda (field, value): field in \
@@ -24,7 +26,7 @@ class AddSiteAddress(Method):
     address_fields = dict(filter(can_update, Address.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Site.fields['site_id'],
               Site.fields['login_base']),
         address_fields
@@ -32,15 +34,11 @@ class AddSiteAddress(Method):
 
     returns = Parameter(int, 'New address_id (> 0) if successful')
 
-    event_type = 'Add'
-    object_type = 'Address'
-    object_ids = []
-
-    def call(self, auth, site_id_or_login_base, address_fields = {}):
+    def call(self, auth, site_id_or_login_base, address_fields):
         address_fields = dict(filter(can_update, address_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]
@@ -53,6 +51,10 @@ class AddSiteAddress(Method):
         address.sync(commit = False)
         site.add_address(address, commit = True)
 
-       self.object_ids = [site['site_id'], address['address_id']]
+       # Logging variables
+       self.event_objects = {'Site': [site['site_id']], 
+                             'Address': [address['address_id']]}
+       self.message = 'Address %d assigned to Site %d' % \
+               (address['address_id'], site['site_id'])
 
         return address['address_id']