X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=7e822fdbfce4db4a4c6f2517ac96ff3c0c1eb4d9;hb=070ac7cd04e9258f40fba3757c809388f60bdb55;hp=5c2104e1dc8fa2fff0e61c86378b1e49a8ec78d6;hpb=3549c67fec2b59d3c60c920031b9839eb75504a1;p=tests.git diff --git a/system/TestNode.py b/system/TestNode.py index 5c2104e..7e822fd 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -70,26 +70,26 @@ class TestNode: # create as reinstall to avoid user confirmation server.UpdateNode(userauth, self.name(), {'boot_state':'rins'}) # populate network interfaces - primary - server.AddNodeNetwork(userauth,self.name(), + server.AddInterface(userauth,self.name(), self.node_spec['network_fields']) # populate network interfaces - others if self.node_spec.has_key('extra_interfaces'): for interface in self.node_spec['extra_interfaces']: - server.AddNodeNetwork(userauth,self.name(), + server.AddInterface(userauth,self.name(), interface['network_fields']) if interface.has_key('settings'): for (attribute,value) in interface['settings'].iteritems(): # locate node network - nn = server.GetNodeNetworks(userauth,{'ip':interface['network_fields']['ip']})[0] + nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0] nnid=nn['nodenetwork_id'] # locate or create node network attribute type try: - nnst = server.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0] + nnst = server.GetInterfaceSettingTypes(userauth,{'name':attribute})[0] except: - nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test', + nnst = server.AddInterfaceSettingType(rootauth,{'category':'test', 'name':attribute}) # attach value - server.AddNodeNetworkSetting(userauth,nnid,attribute,value) + server.AddInterfaceSetting(userauth,nnid,attribute,value) def delete_node (self): # uses the right auth as far as poss.