X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FSliceTags.py;h=2ba7a0187eccf3bf33ac53215d302a6d696a596f;hb=cbf8b264347629f692c36e22bbf35b00c609db1c;hp=a320e622efaf8c7f93eb1cf35524d4cbcfa1676b;hpb=00b458601d8f318b617b43d11cb4fdb93e89967c;p=plcapi.git diff --git a/PLC/SliceTags.py b/PLC/SliceTags.py index a320e62..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,12 +45,12 @@ class SliceTags(Table): ", ".join(self.columns) if slice_tag_filter is not None: - if isinstance(slice_tag_filter, (list, tuple, set, int, long)): + 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 + raise PLCInvalidArgument("Wrong slice tag filter %r"%slice_tag_filter) sql += " AND (%s) %s" % slice_tag_filter.sql(api) self.selectall(sql)