X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdateSite.py;h=ea461a0d2f4e2dc8a466e0ed18d033573a33e6d9;hb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;hp=d09a21bdd8e7f8b2157e198b3d50857ce3c2ba74;hpb=3ab53c5221664528325a0edc7ca40c57eb783428;p=plcapi.git

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index d09a21b..ea461a0 100644
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -4,17 +4,19 @@ from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
 
+related_fields = Site.related_fields.keys()
 can_update = lambda (field, value): field in \
              ['name', 'abbreviated_name', 'login_base',
               'is_public', 'latitude', 'longitude', 'url',
-              'max_slices', 'max_slivers']
+              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id'] + \
+              related_fields
 
 class UpdateSite(Method):
     """
     Updates a site. Only the fields specified in update_fields are
     updated, all other fields are left untouched.
 
-    PIs can only update sites they are a member of. Only admins can 
+    PIs can only update sites they are a member of. Only admins can
     update max_slices, max_slivers, and login_base.
 
     Returns 1 if successful, faults otherwise.
@@ -22,7 +24,7 @@ class UpdateSite(Method):
 
     roles = ['admin', 'pi']
 
-    site_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(filter(can_update, Site.fields.items() + Site.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -40,9 +42,10 @@ class UpdateSite(Method):
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
-
         site = sites[0]
-	PLCCheckLocalSite(site,"UpdateSite")
+
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local site"
 
         # Authenticated function
         assert self.caller is not None
@@ -55,10 +58,22 @@ class UpdateSite(Method):
 
             # Remove admin only fields
             for key in 'max_slices', 'max_slivers', 'login_base':
-                del site_fields[key]
+                if key in site_fields:
+                    del site_fields[key]
+
+        # Make requested associations
+        for field in related_fields:
+            if field in site_fields:
+                site.associate(auth, field, site_fields[field])
+                site_fields.pop(field)
 
         site.update(site_fields)
-	site.sync()
-	self.object_ids = [site['site_id']]
-	
-	return 1
+        site.update_last_updated(False)
+        site.sync()
+
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']]}
+        self.message = 'Site %d updated: %s' % \
+                (site['site_id'], ", ".join(site_fields.keys()))
+
+        return 1