From f69c49cfff7ee2d68f83bd7c655e31f380dc2fea Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 26 Mar 2008 18:06:45 +0000
Subject: [PATCH] *Run qemu with qemu_system_x86-64 without the kqemu module.
 *Temporary skip the step check_tcp. *Temporary use only one node. *increase
 the standby time since we  temporary run without the accelerator patch

---
 system/TestMain.py                   |  5 +-
 system/config_onelab.py              | 68 ++++++++++++++--------------
 system/template-qemu/start-qemu-node |  4 +-
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/system/TestMain.py b/system/TestMain.py
index 40cef3c..35da164 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -22,11 +22,10 @@ class TestMain:
                      'sites', 'nodes', 'slices', 
                      'bootcd', 'nodegroups', 
                      'kill_all_qemus', 'start_nodes', 
-                     'standby_4', 'nodes_booted',
+                     'standby_10', 'nodes_booted',
                      'standby_6','nodes_ssh', 'check_slices','check_initscripts',
-                     'check_tcp',
                      'force_kill_qemus', ]
-    other_steps = [ 'stop_all_vservers','fresh_install', 'stop', 
+    other_steps = [ 'stop_all_vservers','fresh_install', 'stop','check_tcp', 
                     'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys',
                     'list_all_qemus', 'kill_qemus', 'stop_nodes' ,  
                     'db_dump' , 'db_restore',
diff --git a/system/config_onelab.py b/system/config_onelab.py
index a77b6a7..69b3f8c 100644
--- a/system/config_onelab.py
+++ b/system/config_onelab.py
@@ -25,22 +25,22 @@ def nodes():
                                  'mac' : '00:0b:cd:62:50:95',
                                  },
              },
-            {'node_fields': {'hostname': 'pluton.inria.fr',
-                             'model':'qemu/minhw', } ,
-             'host_box': 'testbox1.one-lab.org',
-             'owner' : 'pi',
-             'network_fields': { 'method':'static',
-                                 'type':'ipv4',
-                                 'ip':'138.96.250.151',
-                                 'gateway':'138.96.248.250',
-                                 'network':'138.96.0.0',
-                                 'broadcast':'138.96.255.255',
-                                 'netmask':'255.255.0.0',
-                                 'dns1': '138.96.0.10',
-                                 'dns2': '138.96.0.11',
-                                 'mac' : '00:08:02:33:4d:9e',
-                                 },
-             },
+            #{'node_fields': {'hostname': 'pluton.inria.fr',
+            #                 'model':'qemu/minhw', } ,
+            # 'host_box': 'testbox1.one-lab.org',
+            # 'owner' : 'pi',
+            # 'network_fields': { 'method':'static',
+            #                     'type':'ipv4',
+            #                     'ip':'138.96.250.151',
+            #                     'gateway':'138.96.248.250',
+            #                     'network':'138.96.0.0',
+            #                     'broadcast':'138.96.255.255',
+            #                     'netmask':'255.255.0.0',
+            #                     'dns1': '138.96.0.10',
+            #                     'dns2': '138.96.0.11',
+            #                     'mac' : '00:08:02:33:4d:9e',
+            #                     },
+            #},
             ]
     return nodes
 
@@ -181,23 +181,23 @@ def slices ():
 def all_slicenames ():
     return [ slice['slice_fields']['name'] for slice in slices()]
 
-def tcp_param():
-    param = [{ 'tcp_fields' :  {'peer_name' : 'server',
-                                'slice_name' :all_slicenames()[0],
-                                'server_name': all_nodenames()[0]
-                                },
-               
-               },
-             { 'tcp_fields':{'peer_name' : 'client',
-                             'slice_name' :all_slicenames()[1],
-                             'client_name': all_nodenames()[1],
-                             'peer_server' :  all_nodenames()[0],
-                             'server_port' : 22
-                             },
-               },
-             
-             ]
-    return param
+#def tcp_param():
+#    param = [{ 'tcp_fields' :  {'peer_name' : 'server',
+#                                'slice_name' :all_slicenames()[0],
+#                                'server_name': all_nodenames()[0]
+#                                },
+#               
+#               },
+#             { 'tcp_fields':{'peer_name' : 'client',
+#                             'slice_name' :all_slicenames()[1],
+#                             'client_name': all_nodenames()[1],
+#                             'peer_server' :  all_nodenames()[0],
+#                             'server_port' : 22
+#                             },
+#               },
+#             
+#             ]
+#    return param
 
 def plc () :
     return { 
@@ -223,7 +223,7 @@ def plc () :
         'keys' : keys(),
         'initscripts': initscripts(),
         'slices' : slices(),
-        'tcp_param' : tcp_param(),
+        #'tcp_param' : tcp_param(),
     }
 
 def config (plc_specs,options):
diff --git a/system/template-qemu/start-qemu-node b/system/template-qemu/start-qemu-node
index d3da9cf..ab23af1 100755
--- 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=./hda_5.raw
+HDA=hda_5.raw
 
 # qemu parameters
 RAM=520;
@@ -36,7 +36,7 @@ fi
 echo "New $HDA is created..."
 
 #Command for running the Qemu Emulator
-ARGS="-boot d -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM}  -net nic,macaddr=${MACADDR} -net $TAP -nographic -kernel-kqemu";
+ARGS="-boot d -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM}  -net nic,macaddr=${MACADDR} -net $TAP -nographic "
 echo "Running qemu $ARGS";
 qemu-system-x86_64 $ARGS
 
-- 
2.43.0