This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index 0e570f2..c2dfefc 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']
 
 class UpdateSite(Method):
     """
@@ -33,6 +33,8 @@ class UpdateSite(Method):
 
     returns = Parameter(int, '1 if successful')
 
+    object_type = 'Site'
+
     def call(self, auth, site_id_or_login_base, site_fields):
         site_fields = dict(filter(can_update, site_fields.items()))
 
@@ -40,9 +42,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
 
@@ -58,6 +62,10 @@ class UpdateSite(Method):
 
         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