From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 19 Feb 2008 10:26:28 +0000 (+0000)
Subject: Giving up with the display mode for emulating Qemu nodes, now Qemu nodes run on seria... 
X-Git-Tag: tests-4.2-4~230
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=66e1e329d0ca0199c69855f114d3839fc6456260;p=tests.git

Giving up with the display mode for emulating Qemu nodes, now Qemu nodes run on serial mode
---

diff --git a/system/TestNode.py b/system/TestNode.py
index 9a0eb59..58983db 100644
--- 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,19 @@ 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))
+            self.test_plc.run_in_host("ssh  root@%s   ~/%s/start-qemu-node %s >> ~/%s/%s.log & "
+                                      %( host_box, dest_dir, dest_dir, dest_dir, hostname))
         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))
+            self.test_plc.run_in_host(" ~/%s/start-qemu-node %s >> ~/%s/%s.log & "
+                                      %(dest_dir, dest_dir, dest_dir, hostname))
 
     def kill_qemu (self):
         hostname = self.name()
diff --git a/system/template-Qemu/start-qemu-node b/system/template-Qemu/start-qemu-node
index 92ae5aa..adbe6c2 100755
--- a/system/template-Qemu/start-qemu-node
+++ b/system/template-Qemu/start-qemu-node
@@ -37,7 +37,7 @@ shift $(($# - 1))
 echo "New $HDA is created..."
 
 #Command for running the Qemu Emulator
-ARGS="-boot d -cdrom ${CDROM_IMG} -hda ${HDA} -m ${RAM}  -net nic,macaddr=${MACADDR} -net $TAP ";
+ARGS="-boot d -cdrom ${CDROM_IMG} -hda ${HDA} -m ${RAM}  -net nic,macaddr=${MACADDR} -net $TAP -nographic";
 echo "Executing qemu $ARGS";
 qemu $ARGS