X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateSite.py;h=c9c40b7fe2fd921941db18109b2314ce940fa98a;hb=12d17e7f285289f67146404be7bfe8862daf731c;hp=09d7b139e11acefa313f1bcbfe7da4ec6d1bc809;hpb=7e7751b60ad5379a11bb78e571bad3df9f5eb02f;p=plcapi.git

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index 09d7b13..c9c40b7 100644
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -2,10 +2,10 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 can_update = lambda (field, value): field in \
-             ['name', 'abbreviated_name',
+             ['name', 'abbreviated_name', 'login_base',
               'is_public', 'latitude', 'longitude', 'url',
               'max_slices', 'max_slivers']
 
@@ -15,7 +15,7 @@ class UpdateSite(Method):
     updated, all other fields are left untouched.
 
     PIs can only update sites they are a member of. Only admins can 
-    update max_slices.
+    update max_slices, max_slivers, and login_base.
 
     Returns 1 if successful, faults otherwise.
     """
@@ -25,7 +25,7 @@ class UpdateSite(Method):
     site_fields = dict(filter(can_update, Site.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Site.fields['site_id'],
               Site.fields['login_base']),
         site_fields
@@ -40,8 +40,10 @@ class UpdateSite(Method):
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
+        site = sites[0]
 
-        site = sites.values()[0]
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local site"
 
         # Authenticated function
         assert self.caller is not None
@@ -52,10 +54,16 @@ class UpdateSite(Method):
             if site['site_id'] not in self.caller['site_ids']:
                 raise PLCPermissionDenied, "Not allowed to modify specified site"
 
-            if 'max_slices' or 'max_slivers' in site_fields:
-                raise PLCInvalidArgument, "Only admins can update max_slices and max_slivers"
+            # Remove admin only fields
+            for key in 'max_slices', 'max_slivers', 'login_base':
+                del site_fields[key]
 
         site.update(site_fields)
 	site.sync()
 	
+	# Logging variables
+	self.object_ids = [site['site_id']]
+	self.message = 'Site %d updated: %s' % \
+		(site['site_id'], ", ".join(site_fields.keys()))  	
+	
 	return 1