expose buildname in options to avoid filename conflicts on host boxes

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index c916f84..f4a55dc 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -3,6 +3,7 @@ import xmlrpclib
 
 import utils
 from TestUser import TestUser
+from TestBox import TestBox
 
 class TestNode:
 
@@ -27,10 +28,15 @@ class TestNode:
         return TestNode.is_real_model (self.node_spec['node_fields']['model'])
 
     def host_box (self):
-        try:
-            return self.node_spec['host_box']
-        except:
-            return 'localhost'
+        if self.is_real ():
+            utils.header("WARNING : real nodes dont have a host box")
+            return None
+        else:
+            try:
+                return self.node_spec['host_box']
+            except:
+                utils.header("WARNING : qemu nodes need a host box")
+                return 'localhost'
 
     def create_node (self):
         ownername = self.node_spec['owner']
@@ -145,15 +151,8 @@ class TestNode:
         else:
             utils.header("TestNode.start_node : ignoring model %s"%model)
 
-    def get_host_in_hostbox(self,hostbox,test_site):
-        hosts=[]
-        for node_spec in test_site.site_spec['nodes']:
-            if (node_spec['host_box'] == hostbox):
-                hosts.append((node_spec['node_fields']['hostname'],node_spec['node_fields']['model']))
-        return hosts
-        
     def start_qemu (self, options):
-        utils.header("Starting Qemu nodes")
+        utils.header("Starting Qemu node")
         host_box=self.host_box()
         hostname=self.node_spec['node_fields']['hostname']
         path=options.path
@@ -163,16 +162,10 @@ class TestNode:
         self.test_plc.run_in_host("ssh root@%s ~/%s/%s/env-qemu start"%(host_box, path, dest_dir ))
         self.test_plc.run_in_host("ssh  root@%s DISPLAY=%s  ~/%s/start-qemu-node %s & "%( host_box, display, dest_dir, dest_dir))
         
-    def stop_qemu(self,node_spec):
-        try:
-            if self.is_qemu_model(node_spec['node_fields']['model']):
-                hostname=node_spec['node_fields']['hostname']
-                host_box=node_spec['host_box']
-                self.test_plc.run_in_host('ssh root@%s  killall qemu'%host_box)
-                utils.header('Stoping qemu emulation of %s on the host machine %s and Restoring the initial network'
-                             %(hostname,host_box))
-                self.test_plc.run_in_host("ssh root@%s ~/qemu-%s/env-qemu stop "%(host_box, hostname ))
-            return True
-        except Exception,e :
-            print str(e)
-            return False
+    def kill_qemu (self):
+        hostname = self.name()
+        # kill the right processes 
+        command="./qemu_kill.sh %s"%hostname
+        utils.header("Stopping qemu for host %s on box %s"%(hostname,self.host_box()))
+        TestBox(self.host_box()).run(command)
+        return True