svn keywords

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

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index 276d47f..b59894f 100644 (file)
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -1,13 +1,17 @@
+# $Id$
+# $URL$
 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 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):
     """
@@ -22,7 +26,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 +44,11 @@ class UpdateSite(Method):
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
-
         site = sites[0]
 
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local site"
+
         # Authenticated function
         assert self.caller is not None
 
@@ -54,9 +60,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.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