X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddSiteAddress.py;h=551480548644ef9a3c8f260bdedd9321ff6d6bb2;hb=2f77e84cea805ce9f44a471aab3ebaf2cee8d1a9;hp=662250cfc7d5bc5c19108cabbfcd60d63c5782e7;hpb=f8e0c71d96dce99eff25e5bb6bdf941468e897a2;p=plcapi.git

diff --git a/PLC/Methods/AddSiteAddress.py b/PLC/Methods/AddSiteAddress.py
index 662250c..5514805 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 \
@@ -21,26 +21,22 @@ class AddSiteAddress(Method):
 
     roles = ['admin', 'pi']
 
-    update_fields = dict(filter(can_update, Address.fields.items()))
+    address_fields = dict(filter(can_update, Address.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Site.fields['site_id'],
               Site.fields['login_base']),
-        update_fields
+        address_fields
         ]
 
     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]
@@ -50,8 +46,13 @@ class AddSiteAddress(Method):
                 raise PLCPermissionDenied, "Address must be associated with one of your sites"
 
         address = Address(self.api, address_fields)
-        address['site_id'] = site['site_id']
-        address.sync()
-	self.object_ids = [address['address_id']]
+        address.sync(commit = False)
+        site.add_address(address, commit = True)
+
+        # 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']