X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=12287c564f88fff4af65250544a8cc38ae9aa116;hb=747f86c2060b7d3b627d655fc0ffdafda4e58298;hp=60086493dae27f7b1454e3fa896ff6dd23eafa9d;hpb=043b3c4c448ea1b32dca1f9a12e2b812e2036af6;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 6008649..12287c5 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -18,23 +18,18 @@ class OnelabSubstrate (Substrate):
    def test_box_spec (self):
       return 'testmaster'
 
-   # the build boxes we use 
-   def build_vs_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet' ]
-
    # the experimental lxc-based build box
    def build_lxc_boxes_spec (self):
-      return [ 'warhol' ]
-
-   # the vs-capable box for PLCs
-   def plc_vs_boxes_spec (self):
-      return [ ]
+# velvet needs attention
+#      return [ 'liquid', 'reed', 'velvet' ]
+      return [ 'liquid', 'reed', 'buzzcocks' ]
 
    # the lxc-capable box for PLCs
    def plc_lxc_boxes_spec (self):
       return [ 
-#         ('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
@@ -44,16 +39,29 @@ class OnelabSubstrate (Substrate):
                 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
-# this one is down         ('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