simpler arg passing to the start-qemu-node script

diff --git a/system/TestNode.py b/system/TestNode.py
index 5d31e1c..b482d09 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -123,7 +123,6 @@ class TestNode:
             utils.header ("Using dir %s on %s"%(dest_dir,host_box))
             self.test_plc.run_in_host("ssh root@%s rm -rf %s"%(host_box, dest_dir))
             self.test_plc.run_in_host("ssh root@%s mkdir -p  %s"%(host_box, dest_dir))
-            self.test_plc.run_in_host("ssh root@%s touch  %s/%s.log "%(host_box, dest_dir,hostname))
             self.test_plc.run_in_host("scp -r %s/qemu-%s/* root@%s:%s"%(path,hostname,host_box,dest_dir))
 
     def create_boot_cd(self,path):
@@ -139,7 +138,7 @@ class TestNode:
             nodepath="%s/qemu-%s"%(path,hostname)
             self.test_plc.run_in_host("rm -rf %s"%nodepath)
             self.test_plc.run_in_host("mkdir -p %s"%nodepath)
-            template="%s/template-Qemu"%path
+            template="%s/template-qemu"%path
             self.test_plc.run_in_host("cp -r %s/* %s"%(template,nodepath))
             self.qemu_config(hostname, path)
         else:
@@ -174,7 +173,7 @@ class TestNode:
         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.log & "
-                                  %(host_string, dest_dir, dest_dir, dest_dir, hostname))
+                                  %(host_string, 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 222faa9..094cfdf 100755 (executable)
--- a/system/template-qemu/start-qemu-node
+++ b/system/template-qemu/start-qemu-node
@@ -13,7 +13,7 @@ fi
 
 #default Value
 SCRIPT=./qemu-ifup
-HDA=./FILENAME=hda_5.raw
+HDA=./hda_5.raw
 
 # qemu parameters
 RAM=520;
@@ -27,7 +27,7 @@ fi
 #Creating new HDA
 echo "Creating hard disk for Qemu install under $HDA"
 
-img=$(qemu-img create $FILENAME 10G)
+img=$(qemu-img create $HDA 10G)
 if [ -z "$img" ];then
        echo "Can't Create disk image..."
        exit 1