updated

diff --git a/system/LocalTestResources.sample.inria b/system/LocalTestResources.sample.inria
index 9a02760..630f299 100644 (file)
--- a/system/LocalTestResources.sample.inria
+++ b/system/LocalTestResources.sample.inria
@@ -12,36 +12,37 @@ class OnelabTestResources (TestResources):
     
     # we use only one for now but who knows
     def plc_boxes (self):
-        return [ 'testbox.pl.sophia.inria.fr' ]
+        return [ 'testplc.pl.sophia.inria.fr' ]
 
     def network_dict (self):
-        return { 'interface_fields:gateway':'138.96.248.250',
-                 'interface_fields:network':'138.96.0.0',
-                 'interface_fields:broadcast':'138.96.255.255',
-                 'interface_fields:netmask':'255.255.0.0',
-                 'interface_fields:dns1': '138.96.0.10',
-                 'interface_fields:dns2': '138.96.0.11',
+        return { 'interface_fields:gateway':'138.96.112.250',
+                 'interface_fields:network':'138.96.112.0',
+                 'interface_fields:broadcast':'138.96.119.255',
+                 'interface_fields:netmask':'255.255.248.0',
+                 'interface_fields:dns1': '138.96.112.1',
+                 'interface_fields:dns2': '138.96.112.2',
                  }
 
     def nodes_ip_pool (self):
         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) ]
+                   '138.96.112.%d'%(110+i), 
+                   '02:34:56:00:00:%02d'%i) for i in range(1,8) ]
     
+    # 32bits : qemu32-[1-5] + 64bits : qemu64-[1-3]
     def qemus_ip_pool (self):
-        return [ ( 'qemu64-%d.pl.sophia.inria.fr'%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) ] + \
+               [ ( 'qemu32-%d.pl.sophia.inria.fr'%i, None, None) for i in range(1,6) ]
 
     def max_qemus (self):
-        return 3
+        return len(self.qemus_ip_pool())-2
 
-    # vplc01..vplc15
+    # 1 to 15
     def plcs_ip_pool (self):
-        return [  ( 'vplc%02d.pl.sophia.inria.fr'%i, 
-                    '138.96.112.%d'%(70+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 13
-
+        return len(self.plcs_ip_pool())-2
 
 local_resources = OnelabTestResources ()