X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=ab51bb72cea45177f22e640bed606807902dabf9;hb=585cd891bd7506b0479203242eba16235c88dcf4;hp=e6f57841e888a1dc4666f3a13e98d12350a7f049;hpb=9742acaa6321bf117af7ed10a87d0ce2687087b4;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index e6f5784..ab51bb7 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -78,21 +78,20 @@ class TestNode: # populate network interfaces - others if self.node_spec.has_key('extra_interfaces'): for interface in self.node_spec['extra_interfaces']: - server.AddInterface(userauth,self.name(), - interface['interface_fields']) + server.AddInterface(userauth,self.name(), interface['interface_fields']) if interface.has_key('settings'): for (attribute,value) in interface['settings'].iteritems(): # locate node network - nn = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0] - nnid=nn['interface_id'] + interface = server.GetInterfaces(userauth,{'ip':interface['interface_fields']['ip']})[0] + interface_id=interface['interface_id'] # locate or create node network attribute type try: - nnst = server.GetTagTypes(userauth,{'name':attribute})[0] + interface_tagtype = server.GetTagTypes(userauth,{'name':attribute})[0] except: - nnst = server.AddTagType(rootauth,{'category':'test', - 'tagname':attribute}) + interface_tagtype = server.AddTagType(rootauth,{'category':'test', + 'tagname':attribute}) # attach value - server.AddInterfaceSetting(userauth,nnid,attribute,value) + server.AddInterfaceTag(userauth,interface_id,attribute,value) def delete_node (self): # uses the right auth as far as poss.