X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddSiteAddress.py;h=a3a4eff6219589a40e9dbe5c0bff635dbf033ba1;hb=79b13a156ba2d2a39114201afc46d4c2c7d6da0a;hp=7baf7714024da5b18c8c0f74b2c42ec2e06639ec;hpb=7e7751b60ad5379a11bb78e571bad3df9f5eb02f;p=plcapi.git

diff --git a/PLC/Methods/AddSiteAddress.py b/PLC/Methods/AddSiteAddress.py
index 7baf771..a3a4eff 100644
--- a/PLC/Methods/AddSiteAddress.py
+++ b/PLC/Methods/AddSiteAddress.py
@@ -2,7 +2,7 @@ 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 +24,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 +32,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):
         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 +49,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']