Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/UpdateSlice.py b/PLC/Methods/UpdateSlice.py
index a9d6cb2..901ecbc 100644 (file)
--- a/PLC/Methods/UpdateSlice.py
+++ b/PLC/Methods/UpdateSlice.py
@@ -7,8 +7,11 @@ from PLC.Slices import Slice, Slices
 from PLC.Auth import Auth
 from PLC.Sites import Site, Sites
 
+related_fields = Slice.related_fields.keys() 
 can_update = lambda (field, value): field in \
-             ['instantiation', 'url', 'description', 'max_nodes', 'expires']
+             ['instantiation', 'url', 'description', 'max_nodes', 'expires'] + \
+            related_fields
+
 
 class UpdateSlice(Method):
     """
@@ -28,7 +31,7 @@ class UpdateSlice(Method):
 
     roles = ['admin', 'pi', 'user']
 
-    slice_fields = dict(filter(can_update, Slice.fields.items()))
+    slice_fields = dict(filter(can_update, Slice.fields.items() + Slice.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -41,12 +44,15 @@ class UpdateSlice(Method):
 
     def call(self, auth, slice_id_or_name, slice_fields):
         slice_fields = dict(filter(can_update, slice_fields.items()))
-
-        slices = Slices(self.api, [slice_id_or_name])
+        
+       slices = Slices(self.api, [slice_id_or_name])
         if not slices:
             raise PLCInvalidArgument, "No such slice"
         slice = slices[0]
 
+        if slice['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local slice"
+
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] in slice['person_ids']:
                 pass
@@ -71,19 +77,31 @@ class UpdateSlice(Method):
             if 'admin' not in self.caller['roles'] and slice_fields['expires'] > max_expires:
                 raise PLCInvalidArgument, "Cannot renew a slice beyond 8 weeks from now"
 
+           # XXX Make this a configurable policy
+            if slice['description'] is None or not slice['description'].strip():
+               if 'description' not in slice_fields or slice_fields['description'] is None or \
+                  not slice_fields['description'].strip():
+                    raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL"  
+               
+           if slice['url'] is None or not slice['url'].strip():
+               if 'url' not in slice_fields or slice_fields['url'] is None or \
+                  not slice_fields['url'].strip():
+                    raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL"
+           
         if 'max_nodes' in slice_fields and slice_fields['max_nodes'] != slice['max_nodes']:
             if 'admin' not in self.caller['roles'] and \
                'pi' not in self.caller['roles']:
                 raise PLCInvalidArgument, "Only admins and PIs may update max_nodes"
 
-        slice.update(slice_fields)
-
-        # XXX Make this a configurable policy
-        if slice['description'] is None or not slice['description'].strip() or \
-           slice['url'] is None or not slice['url'].strip():
-            raise PLCInvalidArgument, "Cannot renew a slice with an empty description or URL"
+       # Make requested associations
+       for field in related_fields:
+           if field in slice_fields:
+               slice.associate(auth, field, slice_fields[field])
+               slice_fields.pop(field)
 
+       slice.update(slice_fields)
         slice.sync()
-       self.object_ids = [slice['slice_id']]
+
+       self.event_objects = {'Slice': [slice['slice_id']]}
 
         return 1