X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FNodeTags.py;h=4949e8cc02500a298e28a26951b92024611a256e;hb=57fc659826a046c91d050f8be40a9c80ec7ca9d4;hp=6577c91a59be974c01dc1ad1a905a6fd431da095;hpb=7ba889dd89500f8c0695ef21bfda28291bb4f9da;p=plcapi.git

diff --git a/PLC/NodeTags.py b/PLC/NodeTags.py
index 6577c91..4949e8c 100644
--- a/PLC/NodeTags.py
+++ b/PLC/NodeTags.py
@@ -7,7 +7,8 @@ from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
 from PLC.Table import Row, Table
-from PLC.NodeTagTypes import NodeTagType, NodeTagTypes
+from PLC.Nodes import Node, Nodes
+from PLC.TagTypes import TagType, TagTypes
 
 class NodeTag(Row):
     """
@@ -19,15 +20,14 @@ class NodeTag(Row):
     primary_key = 'node_tag_id'
     fields = {
         'node_tag_id': Parameter(int, "Node tag identifier"),
-        'node_id': Parameter(int, "Node identifier"),
-        'node_tag_type_id': NodeTagType.fields['node_tag_type_id'],
-        'name': NodeTagType.fields['name'],
-        'description': NodeTagType.fields['description'],
-        'category': NodeTagType.fields['category'],
-        'min_role_id': NodeTagType.fields['min_role_id'],
-        'value': Parameter(str, "Node tag value"),
-	### relations
-	
+        'node_id': Node.fields['node_id'],
+        'hostname' : Node.fields['hostname'],
+        'tag_type_id': TagType.fields['tag_type_id'],
+        'tagvalue': 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):