X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceTags.py;h=2ba7a0187eccf3bf33ac53215d302a6d696a596f;hb=b56805d9306204eb657ce284b8df6dc23d7fd812;hp=11adfd609f7cf29a3296cf226ce270adcb13f3d8;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git

diff --git a/PLC/SliceTags.py b/PLC/SliceTags.py
index 11adfd6..2ba7a01 100644
--- a/PLC/SliceTags.py
+++ b/PLC/SliceTags.py
@@ -1,5 +1,6 @@
-# $Id$
-# $URL$
+#
+# Thierry Parmentelat - INRIA
+#
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
@@ -28,7 +29,6 @@ class SliceTag(Row):
         'tagname': TagType.fields['tagname'],
         'description': TagType.fields['description'],
         'category': TagType.fields['category'],
-        'min_role_id': TagType.fields['min_role_id'],
         'value': Parameter(str, "Slice attribute value"),
         }
 
@@ -45,10 +45,12 @@ class SliceTags(Table):
               ", ".join(self.columns)
 
         if slice_tag_filter is not None:
-            if isinstance(slice_tag_filter, (list, tuple, set)):
+            if isinstance(slice_tag_filter, (list, tuple, set, int)):
                 slice_tag_filter = Filter(SliceTag.fields, {'slice_tag_id': slice_tag_filter})
             elif isinstance(slice_tag_filter, dict):
                 slice_tag_filter = Filter(SliceTag.fields, slice_tag_filter)
+            else:
+                raise PLCInvalidArgument("Wrong slice tag filter %r"%slice_tag_filter)
             sql += " AND (%s) %s" % slice_tag_filter.sql(api)
 
         self.selectall(sql)