can set expires upon slice creation

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

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 3e2a89c..73f6847 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -1,4 +1,5 @@
 # $Id$
+# $URL$
 import re
 
 from PLC.Faults import *
@@ -14,7 +15,7 @@ from PLC.SliceTags import SliceTags
 from PLC.Methods.AddSliceTag import AddSliceTag
 from PLC.Methods.UpdateSliceTag import UpdateSliceTag
 
-can_update = ['name', 'instantiation', 'url', 'description', 'max_nodes']
+can_update = ['name', 'instantiation', 'url', 'description', 'max_nodes', 'expires']
 
 class AddSlice(Method):
     """
@@ -35,7 +36,8 @@ class AddSlice(Method):
 
     roles = ['admin', 'pi']
 
-    accepted_fields = Row.accepted_fields(can_update, [Slice.fields,Slice.tags])
+    accepted_fields = Row.accepted_fields(can_update, Slice.fields)
+    accepted_fields.update(Slice.tags)
 
     accepts = [
         Auth(),
@@ -46,10 +48,10 @@ class AddSlice(Method):
 
     def call(self, auth, slice_fields):
 
-        slice_fields = Row.check_fields (slice_fields, self.accepted_fields)
-
         [native,tags,rejected]=Row.split_fields(slice_fields,[Slice.fields,Slice.tags])
 
+        # type checking
+        native = Row.check_fields (native, self.accepted_fields)
         if rejected:
             raise PLCInvalidArgument, "Cannot add Slice with column(s) %r"%rejected