X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=e5635b102f336b87e50aa712433285fcb8651dec;hb=32aeae17fc2ba3cb2db416a660b58f9407d1a094;hp=2569d9a3249675017dc3d138504ce8f13a88a159;hpb=a7a46540507be5b741d5ac28130a2ff86acb7b34;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 2569d9a..e5635b1 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -18,14 +18,16 @@ class OnelabSubstrate (Substrate):
    def test_box_spec (self):
       return 'testmaster'
 
-   # the build boxes we use 
-   def build_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet', ]
+   # the experimental lxc-based build box
+   def build_lxc_boxes_spec (self):
+      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
-               ]  
+   # the lxc-capable box for PLCs
+   def plc_lxc_boxes_spec (self):
+      return [ 
+         ('gotan', 10),         # how many plcs max in this box 
+         ('deathvegas', 10),    
+         ]  
 
    # vplc01 to 40
    def vplc_ips (self):
@@ -33,14 +35,22 @@ class OnelabSubstrate (Substrate):
                   'unused')                     # MAC address 
                 for i in range(1,41) ] 
 
+# as of jan 2014 this is renumbered so that 1 is preferred
    def qemu_boxes_spec (self):
-      return [ # how many qemus max in this box
-         ('kvm64-1', 3), # 4 cores, 4Gb
+      return [ # (hostname, how many qemus max in this box)
+# speedball - old school but robust and a big disk
+         ('kvm64-1', 3), # 4 cores, 4Gb, 840 Gb
+# used to have kruder too, but it is broken/dead
+# dorfmeister
          ('kvm64-2', 3), # 4 cores, 4Gb
-         ('kvm64-3', 2), # 2 cores, 4Gb
-         ('kvm64-4', 3), # 4 cores, 8Gb
-         ('kvm64-5', 2), # 2 cores, 4Gb
-         ('kvm64-6', 2), # 2 cores, 4Gb
+# enfoui - can't seem to enter BIOS on that one
+         ('kvm64-3', 4), # 4 cores, 8Gb
+# estran - big mem but small disk
+         ('kvm64-4', 2), # 4 cores, 8Gb
+# lodos - rather old/small
+         ('kvm64-5', 1), # 2 cores, 4Gb
+# cyblok         
+         ('kvm64-6', 1), # 2 cores, 4Gb
          ]
 
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)
@@ -54,12 +64,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