X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAddNode.py;h=e8d073ad8221510f745e9ff2fc7ec791d2d24de7;hb=28fe8179bbf9cef0ab89edb25b0563e54c9becf0;hp=7354dfe5961e01f3a009d997b80274ae50053e0b;hpb=91a1fbdf638839bb5b2ef2dfe1d3ab18e800ad49;p=plcapi.git diff --git a/PLC/Methods/AddNode.py b/PLC/Methods/AddNode.py index 7354dfe..e8d073a 100644 --- a/PLC/Methods/AddNode.py +++ b/PLC/Methods/AddNode.py @@ -1,12 +1,12 @@ # $Id$ from PLC.Faults import * +from PLC.Auth import Auth from PLC.Method import Method from PLC.Parameter import Parameter, Mixed from PLC.Table import Row -from PLC.Nodes import Node, Nodes -from PLC.NodeGroups import NodeGroup, NodeGroups + from PLC.Sites import Site, Sites -from PLC.Auth import Auth +from PLC.Nodes import Node, Nodes from PLC.TagTypes import TagTypes from PLC.NodeTags import NodeTags from PLC.Methods.AddNodeTag import AddNodeTag @@ -68,10 +68,6 @@ class AddNode(Method): node['site_id'] = site['site_id'] node.sync() - self.event_objects = {'Site': [site['site_id']], - 'Node': [node['node_id']]} - self.message = "Node %s created" % node['node_id'] - for (tagname,value) in tags.iteritems(): # the tagtype instance is assumed to exist, just check that if not TagTypes(self.api,{'tagname':tagname}): @@ -82,4 +78,8 @@ class AddNode(Method): else: UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value) + self.event_objects = {'Site': [site['site_id']], + 'Node': [node['node_id']]} + self.message = "Node %s created" % node['node_id'] + return node['node_id']