X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeTags.py;h=adbc16863836ffa791144998b4274142fcf73351;hb=5dc4edb45e7477a95ae7a7a3bb30662b9ba6bfff;hp=c27b887a34c3deb2cd0ad202c72f03aa279dc303;hpb=286cdfc25f6ef8fd3e0ed59a175bcf801b14038a;p=plcapi.git

diff --git a/PLC/NodeTags.py b/PLC/NodeTags.py
index c27b887..adbc168 100644
--- a/PLC/NodeTags.py
+++ b/PLC/NodeTags.py
@@ -1,9 +1,6 @@
-# $Id#
 #
 # Thierry Parmentelat - INRIA
 #
-# $Revision: 9423 $
-#
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
@@ -24,11 +21,10 @@ class NodeTag(Row):
         'node_id': Node.fields['node_id'],
         'hostname' : Node.fields['hostname'],
         'tag_type_id': TagType.fields['tag_type_id'],
-        'tagvalue': Parameter(str, "Node tag value"),
+        'value': Parameter(str, "Node tag value"),
         'tagname': TagType.fields['tagname'],
         'description': TagType.fields['description'],
         'category': TagType.fields['category'],
-        'min_role_id': TagType.fields['min_role_id'],
         }
 
 class NodeTags(Table):
@@ -44,14 +40,12 @@ class NodeTags(Table):
               ", ".join(self.columns)
 
         if node_tag_filter is not None:
-            if isinstance(node_tag_filter, (list, tuple, set)):
+            if isinstance(node_tag_filter, (list, tuple, set, int)):
                 node_tag_filter = Filter(NodeTag.fields, {'node_tag_id': node_tag_filter})
             elif isinstance(node_tag_filter, dict):
                 node_tag_filter = Filter(NodeTag.fields, node_tag_filter)
-            elif isinstance(node_tag_filter, int):
-                node_tag_filter = Filter(NodeTag.fields, {'node_tag_id': [node_tag_filter]})
             else:
-                raise PLCInvalidArgument, "Wrong node tag filter %r"%node_tag_filter
+                raise PLCInvalidArgument("Wrong node tag filter %r"%node_tag_filter)
             sql += " AND (%s) %s" % node_tag_filter.sql(api)