larger IP-addresses pools for test infratructure

diff --git a/system/TestPlc.py b/system/TestPlc.py
index ba3c4b3..734ee7c 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -278,6 +278,8 @@ class TestPlc:
     # (*) the cleanup_tracker method stops all known vservers and removes the tracker file
 
     TRACKER_FILE=os.environ['HOME']+"/running-test-plcs"
+    # how many concurrent plcs are we keeping alive - adjust with the IP pool size
+    TRACKER_KEEP_VSERVERS = 12
 
     def record_tracker (self):
         try:
@@ -300,7 +302,8 @@ class TestPlc:
         print "Recorded %s in running plcs on host %s"%(self.vservername,self.test_ssh.hostname)
         return True
 
-    def free_tracker (self, keep_vservers=3):
+    def free_tracker (self, keep_vservers=None):
+        if not keep_vservers: keep_vservers=TestPlc.TRACKER_KEEP_VSERVERS
         try:
             lines=file(TestPlc.TRACKER_FILE).readlines()
         except:

diff --git a/system/config_1vservers.py b/system/config_1vservers.py
index 05036ad..7fa4ea2 100644 (file)
--- a/system/config_1vservers.py
+++ b/system/config_1vservers.py
@@ -7,7 +7,7 @@ from TestPool import TestPool
 #    ( 'vplc%02d.inria.fr'%i, '138.96.250.13%d'%i, '02:34:56:00:ee:%02d'%i) for i in range(1,10) ]
 # vplc09 is reserved for a fixed myplc - from 01 to 08
 onelab_plcs_pool = [ 
-    ( 'vplc%02d.inria.fr'%i, '138.96.250.13%d'%i, '02:34:56:00:ee:%02d'%i) for i in range(1,9) ]
+    ( 'vplc%02d.inria.fr'%i, '138.96.250.13%d'%i, '02:34:56:00:ee:%02d'%i) for i in range(1,21) ]
 
 def config (plcs,options):