*some cosmetic in Starting qemu node in local or remote host

[tests.git] / system / TestNode.py

diff --git a/system/TestNode.py b/system/TestNode.py
index 9a0eb59..935994e 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -130,7 +130,7 @@ class TestNode:
         model=self.node_spec['node_fields']['model']
         node_spec=self.node_spec
         hostname=node_spec['node_fields']['hostname']
-        encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '')
+        encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '', ['serial'])
         if (encoded == ''):
             raise Exception, 'boot.iso not found'
 
@@ -167,20 +167,18 @@ class TestNode:
         host_box=self.host_box()
         hostname=self.node_spec['node_fields']['hostname']
         path=options.path
-        display=options.display
         dest_dir=self.buildname()+"/qemu-%s"%(hostname)
         utils.header('Starting qemu for node %s and Redirect logs to /%s/%s.log '
                      %(hostname, dest_dir, hostname))
-        if (not  self.is_local(host_box)):
-            self.test_plc.run_in_host("ssh root@%s ~/%s/env-qemu start >> ~/%s/%s.log "
-                                      %(host_box,  dest_dir, dest_dir, hostname ))
-            self.test_plc.run_in_host("ssh  root@%s DISPLAY=%s  ~/%s/start-qemu-node %s >> ~/%s/%s.log & "
-                                      %( host_box, display, dest_dir, dest_dir, dest_dir, hostname))
+        if (not self.is_local(host_box)):
+            host_string="ssh root@",host_box
         else:
-            self.test_plc.run_in_host(" ~/%s/env-qemu start >> ~/%s/%s.log "
-                                      %(dest_dir, dest_dir, hostname ))
-            self.test_plc.run_in_host(" DISPLAY=%s  ~/%s/start-qemu-node %s >> ~/%s/%s.log & "
-                                      %(display, dest_dir, dest_dir, dest_dir, hostname))
+            host_string=""
+        
+        self.test_plc.run_in_host(" %s ~/%s/env-qemu start >> ~/%s/%s.log "
+                                  %(host_string,  dest_dir, dest_dir, hostname ))
+        self.test_plc.run_in_host(" %s ~/%s/start-qemu-node %s >> ~/%s/%s.log & "
+                                  %(host_string, dest_dir, dest_dir, dest_dir, hostname))
 
     def kill_qemu (self):
         hostname = self.name()