set svn:keywords property for proper keywords expansion

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

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index cbd359e..03b1e13 100644 (file)
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -7,7 +7,7 @@ from PLC.Auth import Auth
 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']
 
 class UpdateSite(Method):
     """
@@ -40,9 +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]
-       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,13 +56,15 @@ 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]
 
         site.update(site_fields)
+       site.update_last_updated(False)
        site.sync()
        
        # Logging variables
-       self.object_ids = [site['site_id']]
+       self.event_objects = {'Site': [site['site_id']]}
        self.message = 'Site %d updated: %s' % \
                (site['site_id'], ", ".join(site_fields.keys()))