X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=b9f81d53f008baae9648895a419c7c4596150e9e;hb=5da61dd790ffdd3d66dc43e902a32630a4df2dde;hp=db34eee1fa438c0616996288f45f01f53318c9d0;hpb=006bbaa2dfa475fbd06712a652afb3a2dc277236;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index db34eee..b9f81d5 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -15,29 +15,40 @@ from Substrate import Substrate
 # domain name .pl.sophia.inria.fr is implicit on our network
 class OnelabSubstrate (Substrate):
 
+   def test_box_spec (self):
+      return 'testmaster'
+
    # the build boxes we use 
    def build_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet', ]
+      return [ 'liquid', 'reed', 'velvet' ]
 
    # the vs-capable box for PLCs
-   def plc_boxes_spec (self):
-      return [ ('vs64-1', 20),  # how many plcs max in this box
+   def plc_vs_boxes_spec (self):
+      return [ ('warhol', 35),  # how many plcs max in this box
                ]  
 
-   # vplc01 to 15
+   # the lxc-capable box for PLCs
+   def plc_lxc_boxes_spec (self):
+      return [ 
+         ('gotan', 30),         # how many plcs max in this box 
+         ('deathvegas', 30),    
+         ]  
+
+   # vplc01 to 40
    def vplc_ips (self):
       return [  ( 'vplc%02d'%i,                 # DNS name
                   'unused')                     # MAC address 
-                for i in range(1,21) ] 
+                for i in range(1,41) ] 
 
    def qemu_boxes_spec (self):
-      return [
-         ('kvm64-1', 3), # how many plcs max in this box
-         ('kvm64-2', 3),
-         ('kvm64-3', 3),
-         ('kvm64-4', 3),
-         ('kvm64-5', 3),
-         ('kvm64-6', 3),
+      return [ # how many qemus max in this box
+# enfoui runs f18 - also can't seem to enter BIOS on that one
+         ('kvm64-6', 4), # 4 cores, 8Gb
+         ('kvm64-1', 3), # 4 cores, 4Gb
+         ('kvm64-2', 3), # 4 cores, 4Gb
+         ('kvm64-4', 2), # 4 cores, 8Gb
+         ('kvm64-3', 1), # 2 cores, 4Gb
+         ('kvm64-5', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)
@@ -51,12 +62,15 @@ class OnelabSubstrate (Substrate):
       return 'pl.sophia.inria.fr'
 
    def network_settings (self):
-      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',
+      return { 'interface_fields:gateway':      '138.96.112.250',
+               'route_fields:next_hop':         '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',
+               'node_fields_nint:dns':          '138.96.112.1,138.96.112.2',
+               'ipaddress_fields:netmask':      '255.255.248.0',
                }
 
 # the hostname for the testmaster - in case we'd like to run this remotely