- Change .py files to use 4-space indents and no hard tab characters.

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

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 001e0f9..a7fb5b9 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -1,4 +1,5 @@
 # $Id$
+# $URL$
 import re
 
 from PLC.Faults import *
@@ -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(),
@@ -48,6 +50,8 @@ class AddSlice(Method):
 
         [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
 
@@ -80,9 +84,9 @@ class AddSlice(Method):
                 "Site %s has reached (%d) its maximum allowable slice count (%d)"%(site['name'],
                                                                                    len(site['slice_ids']),
                                                                                    site['max_slices'])
-       if not site['enabled']:
-           raise PLCInvalidArgument, "Site %s is disabled and can cannot create slices" % (site['name'])
-        
+        if not site['enabled']:
+            raise PLCInvalidArgument, "Site %s is disabled and can cannot create slices" % (site['name'])
+
         slice = Slice(self.api, native)
         slice['creator_person_id'] = self.caller['person_id']
         slice['site_id'] = site['site_id']
@@ -98,7 +102,7 @@ class AddSlice(Method):
             else:
                 UpdateSliceTag(self.api).__call__(auth,slice_tags[0]['slice_tag_id'],value)
 
-       self.event_objects = {'Slice': [slice['slice_id']]}
+        self.event_objects = {'Slice': [slice['slice_id']]}
         self.message = "Slice %d created" % slice['slice_id']
 
         return slice['slice_id']