X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=9181ce25ecfcf29cfa72fd0c4f7dab170f9caa12;hb=d060f3ec02bcdcb8ba326051cd13f2e00e651dbf;hp=836d1d12af002349259e971b7ff841ab1aa7d715;hpb=45b0232844776ccdbb83f2cf231c02ca607d553d;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 836d1d1..9181ce2 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python -u
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2010 INRIA 
 #
@@ -15,30 +15,46 @@ from Substrate import Substrate
 # domain name .pl.sophia.inria.fr is implicit on our network
 class OnelabSubstrate (Substrate):
 
-   # the build boxes we use 
-   def build_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet', ]
+   def test_box_spec (self):
+      return 'testmaster'
+
+   # 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', 20),         # how many plcs max in this box 
+# deathvegas is used at least temporarily for 'real' VMs
+#         ('deathvegas', 10),    
+         ]  
 
-   # vplc01 to 15
+   # vplc01 to 40
    def vplc_ips (self):
       return [  ( 'vplc%02d'%i,                 # DNS name
-#                  '02:34:56:00:ee:%02d'%i)     # MAC address 
                   'unused')                     # MAC address 
-                for i in range(1,21) ] 
+                for i in range(1,41) ] 
 
+# as of jan 2014 this is renumbered so that 1 is preferred
    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 [ # (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
+# enfoui - this HP box behaves weird at boot-time
+# we don't get to see much of the boot process
+# use F10 to enter BIOS setup
+# nodes spawned in this box won't get network connectivity
+#         ('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)
@@ -52,12 +68,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