X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=e102692f757a5cd99bf182f71d18e483ef46c4d3;hb=4297f83e55247a16c587d1aae4205f198d17fd69;hp=76ac30ec356dce08af7b51f44d06ca693c1e708f;hpb=45571868d086f2247eab2990c3fdd2c58d256ab4;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 76ac30e..e102692 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2010 INRIA 
 #
@@ -18,45 +18,53 @@ 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 vs-capable box for PLCs
-   def plc_vs_boxes_spec (self):
-      return [ 
-#         ('warhol', 35),  # how many plcs max in this box
-         ]  
+   # the experimental lxc-based build box
+   def build_lxc_boxes_spec (self):
+# liquid only used for the last f18 build      
+      return [ 'buzzcocks', 'liquid' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
       return [ 
-# gotan has fsck issues and is being reinstalled under f20
-#         ('gotan', 10),         # how many plcs max in this box 
-         ('deathvegas', 10),    
+# gotan looks in bad shape and I can't use its drac from the US
+#         ('gotan', 20),         # how many plcs max in this box 
+         ('deathvegas', 12),    
          ]  
 
    # vplc01 to 40
    def vplc_ips (self):
-      return [  ( 'vplc%02d'%i,                 # DNS name
+      return [  ( 'vplc{:02d}'.format(i),       # DNS name
                   'unused')                     # MAC address 
                 for i in range(1,41) ] 
 
    def qemu_boxes_spec (self):
-      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
+      return [ # (hostname, how many qemus max in this box)
+         ('boxtops', 12),
          ]
 
+# these boxes are going on a well deserved retirement
+# as of jan 2014 this is renumbered so that 1 is preferred
+# speedball (1) - old school but robust and a big disk
+#         ('speedball', 2), # 4 cores, 4Gb, 840 Gb
+# used to have kruder too, but it is broken/dead
+# dorfmeister (2)
+#         ('dorfmeister', 2), # 4 cores, 4Gb
+# enfoui - L119 as it won't work well under the KVM in L102A
+# use F10 to enter BIOS setup
+# nodes spawned in this box won't get network connectivity
+#         ('enfoui', 4), # 4 cores, 8Gb
+# estran (4) - big mem but small disk
+# take it out because it takes much of the load and then gets full..
+#         ('estran', 2), # 4 cores, 8Gb
+# lodos (5) - rather old/small
+#         ('lodos', 1), # 2 cores, 4Gb
+# cyblok (6)        
+#         ('cyblok', 1), # 2 cores, 4Gb
+
    # the nodes pool has a MAC address as user-data (3rd elt in tuple)
    def vnode_ips (self):
-      return [ ( 'vnode%02d'%i,                 # DNS name               
-                 '02:34:56:00:00:%02d'%i)       # MAC address
+      return [ ( 'vnode{:02d}'.format(i),            # DNS name               
+                 '02:34:56:00:00:{:02d}'.format(i))  # MAC address
                for i in range(1,21) ] 
    
    # local network settings