From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 22 Mar 2010 11:56:23 +0000 (+0000)
Subject: cleanup
X-Git-Tag: tests-5.0-4~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a3630d61fae62ab1d32317f0cda33e3af6ae2b0d;p=tests.git

cleanup
---

diff --git a/system/LocalTestResources.sample.inria b/system/LocalTestResources.sample.inria
index c8d8b1f..9a02760 100644
--- a/system/LocalTestResources.sample.inria
+++ b/system/LocalTestResources.sample.inria
@@ -12,7 +12,7 @@ class OnelabTestResources (TestResources):
     
     # we use only one for now but who knows
     def plc_boxes (self):
-        return [ 'testbox-plc.onelab.eu' ]
+        return [ 'testbox.pl.sophia.inria.fr' ]
 
     def network_dict (self):
         return { 'interface_fields:gateway':'138.96.248.250',
@@ -24,23 +24,24 @@ class OnelabTestResources (TestResources):
                  }
 
     def nodes_ip_pool (self):
-        return [ ( 'vnode%02d.inria.fr'%i, 
+        return [ ( 'vnode%02d.pl.sophia.inria.fr'%i, 
                    '138.96.255.%d'%(230+i), 
                    '02:34:56:00:00:%02d'%i) for i in range(1,10) ]
     
     def qemus_ip_pool (self):
-        return [ ( 'testqemu%d.onelab.eu'%i, None, None) for i in range(1,4) ]
+        return [ ( 'qemu64-%d.pl.sophia.inria.fr'%i, None, None) for i in range(1,4) ]
 
     def max_qemus (self):
         return 3
 
+    # vplc01..vplc15
     def plcs_ip_pool (self):
-        return [  ( 'vplc%02d.inria.fr'%i, 
-                    '138.96.255.%d'%(200+i), 
+        return [  ( 'vplc%02d.pl.sophia.inria.fr'%i, 
+                    '138.96.112.%d'%(70+i), 
                     '02:34:56:00:ee:%02d'%i) for i in range(1,16) ]
 
     def max_plcs (self):
-        return 12
+        return 13
 
 
 local_resources = OnelabTestResources ()
diff --git a/system/config_default.py b/system/config_default.py
index 372a0c8..28f5e02 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -79,7 +79,7 @@ def sites (options,index):
                                'login_base':'main',
                                'abbreviated_name':'PLanettest',
                                'max_slices':100,
-                               'url':'http://testbox1.onelab.eu',
+                               'url':'http://testbox.onelab.eu',
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',