revised type-checking on taggable classes - previous code would reject any tag

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

diff --git a/PLC/Methods/UpdateSlice.py b/PLC/Methods/UpdateSlice.py
index b58a106..333bac1 100644 (file)
--- a/PLC/Methods/UpdateSlice.py
+++ b/PLC/Methods/UpdateSlice.py
@@ -14,8 +14,7 @@ from PLC.SliceTags import SliceTags
 from PLC.Methods.AddSliceTag import AddSliceTag
 from PLC.Methods.UpdateSliceTag import UpdateSliceTag
 
-can_update = ['instantiation', 'url', 'description', 'max_nodes', 'expires'] + \
-    Slice.related_fields.keys()
+can_update = ['instantiation', 'url', 'description', 'max_nodes', 'expires'] 
 
 class UpdateSlice(Method):
     """
@@ -35,13 +34,16 @@ class UpdateSlice(Method):
 
     roles = ['admin', 'pi', 'user']
 
-    slice_fields = Row.accepted_fields(can_update, [Slice.fields,Slice.related_fields,Slice.tags])
+    accepted_fields = Row.accepted_fields(can_update, Slice.fields)
+    # xxx check the related_fields feature
+    accepted_fields.update(Slice.related_fields)
+    accepted_fields.update(Slice.tags)
 
     accepts = [
         Auth(),
         Mixed(Slice.fields['slice_id'],
               Slice.fields['name']),
-        slice_fields
+        accepted_fields
         ]
 
     returns = Parameter(int, '1 if successful')
@@ -50,9 +52,11 @@ class UpdateSlice(Method):
 
         # split provided fields 
         [native,related,tags,rejected] = Row.split_fields(slice_fields,[Slice.fields,Slice.related_fields,Slice.tags])
-
+        
+        # type checking
+        native = Row.check_fields (native, self.accepted_fields)
         if rejected:
-            raise PLCInvalidArgument, "Cannot update Node column(s) %r"%rejected
+            raise PLCInvalidArgument, "Cannot update Slice column(s) %r"%rejected
 
        slices = Slices(self.api, [slice_id_or_name])
         if not slices:
@@ -130,6 +134,11 @@ class UpdateSlice(Method):
         else:
             self.message='Slice %d updated'%slice['slice_id']
         if renewing:
-            self.message += ' renewed until %s'%time.strftime('%Y-%m-%d:%H:%M',localtime(slice['expires']))
+            # it appears that slice['expires'] may be either an int, or a formatted string
+            try:
+                expire_date=time.strftime('%Y-%m-%d:%H:%M',time.localtime(float(slice['expires'])))
+            except:
+                expire_date=slice['expires']
+            self.message += ' renewed until %s'%expire_date
 
         return 1