support user created conf_files for slices

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

diff --git a/PLC/Methods/UpdateConfFile.py b/PLC/Methods/UpdateConfFile.py
index 6fd0e2a..a76e353 100644 (file)
--- a/PLC/Methods/UpdateConfFile.py
+++ b/PLC/Methods/UpdateConfFile.py
@@ -5,7 +5,7 @@ from PLC.ConfFiles import ConfFile, ConfFiles
 from PLC.Auth import Auth
 
 can_update = lambda (field, value): field not in \
-             ['conf_file_id', 'node_ids', 'nodegroup_ids']
+             ['conf_file_id', 'node_ids', 'nodegroup_ids', 'creator_id', 'last_modified_by_id']
 
 class UpdateConfFile(Method):
     """
@@ -15,7 +15,7 @@ class UpdateConfFile(Method):
     Returns 1 if successful, faults otherwise.
     """
 
-    roles = ['admin']
+    roles = ['admin', 'pi', 'user']
 
     conf_file_fields = dict(filter(can_update, ConfFile.fields.items()))
 
@@ -31,11 +31,19 @@ class UpdateConfFile(Method):
         conf_file_fields = dict(filter(can_update, conf_file_fields.items()))
 
         conf_files = ConfFiles(self.api, [conf_file_id])
+
         if not conf_files:
             raise PLCInvalidArgument, "No such configuration file"
-
-        conf_file = conf_files[0]
-        conf_file.update(conf_file_fields)
+        
+       conf_file = conf_files[0]
+       
+       if 'admin' not in self.caller['roles']:
+           if conf_file['site_id'] not in self.caller['site_ids']:
+               raise PLCPermissionDenied, "Not allowed to update that conf file"
+        
+       conf_file.update(conf_file_fields)
+       conf_file['last_modified_by_id'] = self.caller['person_id']
+       conf_file.update_last_modified(commit = False)
         conf_file.sync()
        self.event_objects = {'ConfFile': [conf_file['conf_file_id']]}