X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestNode.py;h=23cc26a7f2fdf097bcd858e858e1d00747ecf30e;hb=b9d91cf02d38ebf49a9a1bdb0f603b865691df32;hp=13c1a16d29caa5e8dad5c440b88d4bed20e05631;hpb=2d879db75bed7f76fb868c566cbc2f4a8aba1c8c;p=tests.git

diff --git a/system/TestNode.py b/system/TestNode.py
index 13c1a16..23cc26a 100644
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -68,28 +68,28 @@ class TestNode:
                        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.
@@ -154,10 +154,14 @@ class TestNode:
         file.write('IP=%s\n'%ip)
         file.write('TARGET_ARCH=%s\n'%target_arch)
         file.close()
+        return True
 
+    def export_qemu (self):
         # if relevant, push the qemu area onto the host box
         if self.test_box().is_local():
             return True
+        utils.header ("Cleaning any former sequel of %s on %s"%(self.name(),self.host_box()))
+        self.test_box().run_in_buildname("rm -rf %s"%self.nodedir())
         utils.header ("Transferring configuration files for node %s onto %s"%(self.name(),self.host_box()))
         return self.test_box().copy(self.nodedir(),recursive=True)==0
             
@@ -168,6 +172,7 @@ class TestNode:
             self.start_qemu()
         else:
             utils.header("TestNode.start_node : %s model %s taken as real node"%(self.name(),model))
+        return True
 
     def start_qemu (self):
         options = self.test_plc.options
@@ -180,7 +185,7 @@ class TestNode:
 
     def list_qemu (self):
         utils.header("Listing qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
-        command="qemu-%s/qemu-kill-node -l %s"%(self.name(),self.name())
+        command="%s/qemu-kill-node -l %s"%(self.nodedir(),self.name())
         self.test_box().run_in_buildname(command)
         return True
 
@@ -189,7 +194,7 @@ class TestNode:
         test_box = self.test_box()
         # kill the right processes 
         utils.header("Stopping qemu for host %s on box %s"%(self.name(),self.test_box().hostname()))
-        command="qemu-%s/qemu-kill-node %s"%(self.name(),self.name())
+        command="%s/qemu-kill-node %s"%(self.nodedir(),self.name())
         self.test_box().run_in_buildname(command)
         return True
 
@@ -197,7 +202,7 @@ class TestNode:
         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):