use more qemu boxes

diff --git a/system/Trackers.py b/system/Trackers.py
index dbe4abf..6a15aa5 100644 (file)
--- a/system/Trackers.py
+++ b/system/Trackers.py
@@ -91,7 +91,7 @@ class TrackerQemu (Tracker):
 
     DEFAULT_FILENAME=os.environ['HOME']+"/tracker-qemus"
     # how many concurrent plcs are we keeping alive - adjust with the IP pool size
-    DEFAULT_MAX_INSTANCES = 1
+    DEFAULT_MAX_INSTANCES = 2
 
     def __init__ (self,options,filename=None,instances=0):
         if not filename: filename=TrackerQemu.DEFAULT_FILENAME

diff --git a/system/config_1testbox.py b/system/config_1testqemus.py
similarity index 95%
rename from system/config_1testbox.py
rename to system/config_1testqemus.py
index 5c10410..9ec075d 100644 (file)
--- a/system/config_1testbox.py
+++ b/system/config_1testqemus.py
@@ -3,8 +3,7 @@ import sys
 from TestMapper import TestMapper
 from TestPool import TestPoolQemu
 
-# testbox1-2 for the trunk, 3 for 4.2
-onelab_qemus_pool = [ ( 'testqemu%d.onelab.eu'%i, None, None) for i in range(1,3) ]
+onelab_qemus_pool = [ ( 'testqemu%d.onelab.eu'%i, None, None) for i in range(1,4) ]
     
 def config (plcs, options):
 

diff --git a/system/config_1vservers.py b/system/config_1vplcs.py
similarity index 100%
rename from system/config_1vservers.py
rename to system/config_1vplcs.py

diff --git a/system/config_default.py b/system/config_default.py
index 1329670..e6d73dd 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -6,9 +6,6 @@ import TestPlc
 
 def config (plc_specs, options):
 
-#    for step in ['main','1testbox','1nodes','1vservers']:
-#        module=__import__(
-
     import config_main
     plcs = config_main.config([],options)
     if options.verbose:
@@ -16,10 +13,10 @@ def config (plc_specs, options):
         for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
         print '========================================'
 
-    import config_1testbox
-    plcs = config_1testbox.config (plcs,options)
+    import config_1testqemus
+    plcs = config_1testqemus.config (plcs,options)
     if options.verbose:
-        print '======================================== AFTER testbox'
+        print '======================================== AFTER testqemus'
         for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
         print '========================================'
 
@@ -30,8 +27,8 @@ def config (plc_specs, options):
         for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)
         print '========================================'
 
-    import config_1vservers
-    plcs = config_1vservers.config (plcs,options)
+    import config_1vplcs
+    plcs = config_1vplcs.config (plcs,options)
     if options.verbose:
         print '======================================== AFTER vservers'
         for plc in plcs: TestPlc.TestPlc.display_mapping_plc(plc)