svn keywords

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

diff --git a/PLC/Methods/AddNodeGroup.py b/PLC/Methods/AddNodeGroup.py
index e22b9a3..88210c1 100644 (file)
--- a/PLC/Methods/AddNodeGroup.py
+++ b/PLC/Methods/AddNodeGroup.py
@@ -1,10 +1,12 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
 from PLC.NodeGroups import NodeGroup, NodeGroups
-from PLC.NodeTagTypes import NodeTagType, NodeTagTypes
+from PLC.TagTypes import TagType, TagTypes
 from PLC.NodeTags import NodeTag, NodeTags
 
 can_update = lambda (field, value): field in NodeGroup.fields.keys() and field != NodeGroup.primary_field
@@ -24,24 +26,24 @@ class AddNodeGroup(Method):
     accepts = [
         Auth(),
         NodeGroup.fields['groupname'],
-        Mixed(NodeTagType.fields['node_tag_type_id'],
-              NodeTagType.fields['tagname']),
-        NodeTag.fields['tagvalue'],
+        Mixed(TagType.fields['tag_type_id'],
+              TagType.fields['tagname']),
+        NodeTag.fields['value'],
         ]
 
     returns = Parameter(int, 'New nodegroup_id (> 0) if successful')
 
 
-    def call(self, auth, groupname, node_tag_type_id_or_tagname, tagvalue):
+    def call(self, auth, groupname, tag_type_id_or_tagname, value):
         # locate tag type
-        tag_types = NodeTagTypes (self.api,[node_tag_type_id_or_tagname])
+        tag_types = TagTypes (self.api,[tag_type_id_or_tagname])
         if not(tag_types):
-            raise PLCInvalidArgument, "No such tag type %r"%node_tag_type_id_or_tagname
+            raise PLCInvalidArgument, "No such tag type %r"%tag_type_id_or_tagname
         tag_type=tag_types[0]
 
         nodegroup_fields = { 'groupname' : groupname,
-                             'node_tag_type_id' : tag_type['node_tag_type_id'],
-                             'tagvalue' : tagvalue }
+                             'tag_type_id' : tag_type['tag_type_id'],
+                             'value' : value }
         nodegroup = NodeGroup(self.api, nodegroup_fields)
         nodegroup.sync()