self.test_site.site_spec['site_fields']['login_base'],
self.node_spec['node_fields'])
# create as reinstall to avoid user confirmation
- server.UpdateNode(userauth, self.name(), {'boot_state':'rins'})
+ server.UpdateNode(userauth, self.name(), {'boot_state':'reinstall'})
# 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]
- nnid=nn['nodenetwork_id']
+ nn = server.GetInterfaces(userauth,{'ip':interface['network_fields']['ip']})[0]
+ nnid=nn['interface_id']
# locate or create node network attribute type
try:
- nnst = server.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0]
+ nnst = server.GetTagTypes(userauth,{'name':attribute})[0]
except:
- nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test',
- 'name':attribute})
+ nnst = server.AddTagType(rootauth,{'category':'test',
+ 'tagname':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.
if not self.is_qemu():
return True
remote_log="%s/qemu.log"%self.nodedir()
- local_log="logs/%s-qemu.log"%self.name()
+ local_log="logs/node.qemu.%s.log"%self.name()
self.test_box().test_ssh.fetch(remote_log,local_log)
def clear_known_hosts (self):